Now finally rename DIERef to DIE

first doing DIE->RawDIE

Author: peadar

dwarf.cc

@@ -25,16 +25,16 @@ using std::string;
 
 namespace Dwarf {
 
-class DIE {
- DIE() = delete;
- DIE(const DIE &) = delete;
+class RawDIE {
+ RawDIE() = delete;
+ RawDIE(const RawDIE &) = delete;
  void readValue(DWARFReader &, Form form, Value &value, const Unit *);
  Entries children;
  const Abbreviation *type;
  std::vector<Value> values;
 public:
- DIE(DWARFReader &, size_t, Unit *);
- ~DIE();
+ RawDIE(DWARFReader &, size_t, Unit *);
+ ~RawDIE();
  friend class Attribute;
  friend class DIERef;
  friend class DIEAttributes;
@@ -247,6 +247,7 @@ Unit::name() const
  assert(entries.begin() != entries.end());
  for (const auto &top : topLevelDIEs())
  return top.name();
+ return "";
 }
 
 Unit::~Unit() = default;
@@ -514,7 +515,7 @@ Attribute::operator std::string() const
 }
 
 void
-DIE::readValue(DWARFReader &r, Form form, Value &value, const Unit *unit)
+RawDIE::readValue(DWARFReader &r, Form form, Value &value, const Unit *unit)
 {
  switch (form) {
 
@@ -640,7 +641,7 @@ DIE::readValue(DWARFReader &r, Form form, Value &value, const Unit *unit)
  }
 }
 
-DIE::~DIE()
+RawDIE::~RawDIE()
 {
  int i = 0;
  for (auto form : type->forms) {
@@ -681,7 +682,7 @@ Unit::getLines()
  return nullptr;
 }
 
-DIE::DIE(DWARFReader &r, size_t abbrev, Unit *unit)
+RawDIE::RawDIE(DWARFReader &r, size_t abbrev, Unit *unit)
  : type(&unit->abbreviations.find(abbrev)->second)
  , values(type->forms.size())
 {

libpstack/dwarf.h

@@ -17,7 +17,7 @@ namespace Dwarf {
 enum HasChildren { DW_CHILDREN_yes = 1, DW_CHILDREN_no = 0 };
 
 class Attribute;
-class DIE;
+class RawDIE;
 class ExpressionStack;
 class Info;
 class LineInfo;
@@ -27,7 +27,7 @@ struct CFI;
 struct Unit;
 
 // The DWARF Unit's allEntries map contains the underlying data for the tree.
-typedef std::list<DIE> Entries;
+typedef std::list<RawDIE> Entries;
 
 #define DWARF_TAG(a,b) a = b,
 enum Tag {
@@ -184,8 +184,8 @@ struct DIEAttributes {
 
 struct DIERef {
  const Unit *unit;
- const DIE *die;
- DIERef(const Unit *unit, const DIE *die) : unit(unit), die(die) {}
+ const RawDIE *die;
+ DIERef(const Unit *unit, const RawDIE *die) : unit(unit), die(die) {}
  DIERef() : unit(nullptr) {}
  operator bool() const { return unit != nullptr; }
  bool hasChildren() const;
@@ -281,7 +281,7 @@ class Unit {
  Unit(const Unit &) = delete;
  std::unique_ptr<LineInfo> lines;
  Entries entries;
- std::map<off_t, DIE *> allEntries;
+ std::map<off_t, RawDIE *> allEntries;
 public:
  DIERefList topLevelDIEs() const { return DIERefList(this, entries); }
  DIERef offsetToDIE(size_t offset) const;