[PATCH] D40156: Fix recursive attribute fetching in DWARFDie
Phabricator via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 27 14:13:08 PST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL319104: Fixed the ability to recursively get an attribute value from a DWARFDie. (authored by gclayton).
Changed prior to commit:
https://reviews.llvm.org/D40156?vs=123264&id=124467#toc
Repository:
rL LLVM
https://reviews.llvm.org/D40156
Files:
llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp
llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
Index: llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp
===================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp
@@ -306,17 +306,16 @@
DWARFDie::findRecursively(ArrayRef<dwarf::Attribute> Attrs) const {
if (!isValid())
return None;
- auto Die = *this;
- if (auto Value = Die.find(Attrs))
- return Value;
- if (auto D = Die.getAttributeValueAsReferencedDie(DW_AT_abstract_origin))
- Die = D;
- if (auto Value = Die.find(Attrs))
- return Value;
- if (auto D = Die.getAttributeValueAsReferencedDie(DW_AT_specification))
- Die = D;
- if (auto Value = Die.find(Attrs))
+ if (auto Value = find(Attrs))
return Value;
+ if (auto Die = getAttributeValueAsReferencedDie(DW_AT_abstract_origin)) {
+ if (auto Value = Die.findRecursively(Attrs))
+ return Value;
+ }
+ if (auto Die = getAttributeValueAsReferencedDie(DW_AT_specification)) {
+ if (auto Value = Die.findRecursively(Attrs))
+ return Value;
+ }
return None;
}
Index: llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
===================================================================
--- llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
+++ llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
@@ -1287,12 +1287,16 @@
auto CUDie = CU.getUnitDIE();
auto FuncSpecDie = CUDie.addChild(DW_TAG_subprogram);
auto FuncAbsDie = CUDie.addChild(DW_TAG_subprogram);
+ // Put the linkage name in a second abstract origin DIE to ensure we
+ // recurse through more than just one DIE when looking for attributes.
+ auto FuncAbsDie2 = CUDie.addChild(DW_TAG_subprogram);
auto FuncDie = CUDie.addChild(DW_TAG_subprogram);
auto VarAbsDie = CUDie.addChild(DW_TAG_variable);
auto VarDie = CUDie.addChild(DW_TAG_variable);
FuncSpecDie.addAttribute(DW_AT_name, DW_FORM_strp, SpecDieName);
- FuncAbsDie.addAttribute(DW_AT_linkage_name, DW_FORM_strp, SpecLinkageName);
+ FuncAbsDie2.addAttribute(DW_AT_linkage_name, DW_FORM_strp, SpecLinkageName);
FuncAbsDie.addAttribute(DW_AT_specification, DW_FORM_ref4, FuncSpecDie);
+ FuncAbsDie.addAttribute(DW_AT_abstract_origin, DW_FORM_ref4, FuncAbsDie2);
FuncDie.addAttribute(DW_AT_abstract_origin, DW_FORM_ref4, FuncAbsDie);
VarAbsDie.addAttribute(DW_AT_name, DW_FORM_strp, AbsDieName);
VarDie.addAttribute(DW_AT_abstract_origin, DW_FORM_ref4, VarAbsDie);
@@ -1314,7 +1318,8 @@
auto FuncSpecDie = CUDie.getFirstChild();
auto FuncAbsDie = FuncSpecDie.getSibling();
- auto FuncDie = FuncAbsDie.getSibling();
+ auto FuncAbsDie2 = FuncAbsDie.getSibling();
+ auto FuncDie = FuncAbsDie2.getSibling();
auto VarAbsDie = FuncDie.getSibling();
auto VarDie = VarAbsDie.getSibling();
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40156.124467.patch
Type: text/x-patch
Size: 2823 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171127/0a754cdb/attachment.bin>
More information about the llvm-commits
mailing list