From: Igor Kudrin Date: Tue, 16 Jul 2019 06:53:06 +0000 (+0000) Subject: [DWARF] Simplify DWARFAttribute. NFC. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d29649567daa79bf5f1c21d97f37ed3057c53839;p=llvm [DWARF] Simplify DWARFAttribute. NFC. The first argument in the constructor was ignored, and the remaining arguments were always passed as their defaults. Differential Revision: https://reviews.llvm.org/D64407 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@366188 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/DebugInfo/DWARF/DWARFAttribute.h b/include/llvm/DebugInfo/DWARF/DWARFAttribute.h index 96e622ccc03..c8ad19ad6bf 100644 --- a/include/llvm/DebugInfo/DWARF/DWARFAttribute.h +++ b/include/llvm/DebugInfo/DWARF/DWARFAttribute.h @@ -27,13 +27,10 @@ struct DWARFAttribute { /// The debug info/types section byte size of the data for this attribute. uint32_t ByteSize = 0; /// The attribute enumeration of this attribute. - dwarf::Attribute Attr; + dwarf::Attribute Attr = dwarf::Attribute(0); /// The form and value for this attribute. DWARFFormValue Value; - DWARFAttribute(uint32_t O, dwarf::Attribute A = dwarf::Attribute(0), - dwarf::Form F = dwarf::Form(0)) : Attr(A), Value(F) {} - bool isValid() const { return Offset != 0 && Attr != dwarf::Attribute(0); } @@ -45,13 +42,6 @@ struct DWARFAttribute { /// Identifies DWARF attributes that may contain a reference to a /// DWARF expression. static bool mayHaveLocationDescription(dwarf::Attribute Attr); - - void clear() { - Offset = 0; - ByteSize = 0; - Attr = dwarf::Attribute(0); - Value = DWARFFormValue(); - } }; } // end namespace llvm diff --git a/lib/DebugInfo/DWARF/DWARFDie.cpp b/lib/DebugInfo/DWARF/DWARFDie.cpp index 62128429836..d638dc4239f 100644 --- a/lib/DebugInfo/DWARF/DWARFDie.cpp +++ b/lib/DebugInfo/DWARF/DWARFDie.cpp @@ -663,7 +663,7 @@ iterator_range DWARFDie::attributes() const { } DWARFDie::attribute_iterator::attribute_iterator(DWARFDie D, bool End) - : Die(D), AttrValue(0), Index(0) { + : Die(D), Index(0) { auto AbbrDecl = Die.getAbbreviationDeclarationPtr(); assert(AbbrDecl && "Must have abbreviation declaration"); if (End) { @@ -693,7 +693,7 @@ void DWARFDie::attribute_iterator::updateForIndex( AttrValue.ByteSize = ParseOffset - AttrValue.Offset; } else { assert(Index == NumAttrs && "Indexes should be [0, NumAttrs) only"); - AttrValue.clear(); + AttrValue = {}; } }