Commit 00efeae3 authored by Raphael Isemann's avatar Raphael Isemann
Browse files

[lldb][NFC] Simplify Materializer/Dematerializer constructors

parent a31a61da

lldb/include/lldb/Expression/Materializer.h

+7 −9
Original line number Diff line number Diff line
@@ -22,14 +22,12 @@ namespace lldb_private { 


class Materializer {

public:

  Materializer();

  Materializer() = default;

  ~Materializer();



  class Dematerializer {

  public:

    Dematerializer()

        : m_materializer(nullptr), m_map(nullptr),

          m_process_address(LLDB_INVALID_ADDRESS) {}

    Dematerializer() = default;



    ~Dematerializer() { Wipe(); }
@@ -56,11 +54,11 @@ public: 
      }

    }



    Materializer *m_materializer;

    Materializer *m_materializer = nullptr;

    lldb::ThreadWP m_thread_wp;

    StackID m_stack_id;

    IRMemoryMap *m_map;

    lldb::addr_t m_process_address;

    IRMemoryMap *m_map = nullptr;

    lldb::addr_t m_process_address = LLDB_INVALID_ADDRESS;

  };



  typedef std::shared_ptr<Dematerializer> DematerializerSP;
@@ -128,8 +126,8 @@ private: 


  DematerializerWP m_dematerializer_wp;

  EntityVector m_entities;

  uint32_t m_current_offset;

  uint32_t m_struct_alignment;

  uint32_t m_current_offset = 0;

  uint32_t m_struct_alignment = 8;

};



} // namespace lldb_private

lldb/source/Expression/Materializer.cpp

+0 −3
Original line number Diff line number Diff line
@@ -1332,9 +1332,6 @@ uint32_t Materializer::AddRegister(const RegisterInfo &register_info, 
  return ret;

}



Materializer::Materializer()

    : m_dematerializer_wp(), m_current_offset(0), m_struct_alignment(8) {}



Materializer::~Materializer() {

  DematerializerSP dematerializer_sp = m_dematerializer_wp.lock();