From 68a61f4116f446bcdc0402daaaef520aeba30065 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Sun, 2 Aug 2015 20:48:47 +0000 Subject: [PATCH] DwarfLinker: Use DIEValueList instead of DIE, NFC Use `DIEValueList` as a pointer to either `DIEBlock` or `DIELoc` instead of `DIE`, since soon they won't inherit from the latter. llvm-svn: 243857 --- tools/dsymutil/DwarfLinker.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp index 484c86aa5df..68618bc3371 100644 --- a/tools/dsymutil/DwarfLinker.cpp +++ b/tools/dsymutil/DwarfLinker.cpp @@ -2323,7 +2323,7 @@ unsigned DwarfLinker::cloneDieReferenceAttribute( unsigned DwarfLinker::cloneBlockAttribute(DIE &Die, AttributeSpec AttrSpec, const DWARFFormValue &Val, unsigned AttrSize) { - DIE *Attr; + DIEValueList *Attr; DIEValue Value; DIELoc *Loc = nullptr; DIEBlock *Block = nullptr; @@ -2335,7 +2335,8 @@ unsigned DwarfLinker::cloneBlockAttribute(DIE &Die, AttributeSpec AttrSpec, Block = new (DIEAlloc) DIEBlock; DIEBlocks.push_back(Block); } - Attr = Loc ? static_cast(Loc) : static_cast(Block); + Attr = Loc ? static_cast(Loc) + : static_cast(Block); if (Loc) Value = DIEValue(dwarf::Attribute(AttrSpec.Attr),