[llvm] r207717 - DebugInfo: Omit DW_AT_artificial on DW_TAG_formal_parameters in DW_TAG_inlined_subroutines.
David Blaikie
dblaikie at gmail.com
Wed Apr 30 15:41:34 PDT 2014
Author: dblaikie
Date: Wed Apr 30 17:41:33 2014
New Revision: 207717
URL: http://llvm.org/viewvc/llvm-project?rev=207717&view=rev
Log:
DebugInfo: Omit DW_AT_artificial on DW_TAG_formal_parameters in DW_TAG_inlined_subroutines.
They just don't need to be there - they're inherited from the abstract
definition. In theory I would like them to be inherited from the
declaration, but the DWARF standard doesn't quite say that... we can
probably do it anyway but I'm less confident about that so I'll leave it
for a separate commit.
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h
llvm/trunk/test/DebugInfo/X86/inline-member-function.ll
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=207717&r1=207716&r2=207717&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Wed Apr 30 17:41:33 2014
@@ -509,6 +509,21 @@ DwarfDebug::constructInlinedScopeDIE(Dwa
return ScopeDIE;
}
+static std::unique_ptr<DIE> constructVariableDIE(DwarfCompileUnit &TheCU,
+ DbgVariable &DV,
+ const LexicalScope &Scope,
+ DIE *&ObjectPointer) {
+ AbstractOrInlined AOI = AOI_None;
+ if (Scope.isAbstractScope())
+ AOI = AOI_Abstract;
+ else if (Scope.getInlinedAt())
+ AOI = AOI_Inlined;
+ auto Var = TheCU.constructVariableDIE(DV, AOI);
+ if (DV.isObjectPointer())
+ ObjectPointer = Var.get();
+ return Var;
+}
+
DIE *DwarfDebug::createScopeChildrenDIE(
DwarfCompileUnit &TheCU, LexicalScope *Scope,
SmallVectorImpl<std::unique_ptr<DIE>> &Children) {
@@ -517,12 +532,9 @@ DIE *DwarfDebug::createScopeChildrenDIE(
// Collect arguments for current function.
if (LScopes.isCurrentFunctionScope(Scope)) {
for (DbgVariable *ArgDV : CurrentFnArguments)
- if (ArgDV) {
+ if (ArgDV)
Children.push_back(
- TheCU.constructVariableDIE(*ArgDV, Scope->isAbstractScope()));
- if (ArgDV->isObjectPointer())
- ObjectPointer = Children.back().get();
- }
+ constructVariableDIE(TheCU, *ArgDV, *Scope, ObjectPointer));
// If this is a variadic function, add an unspecified parameter.
DISubprogram SP(Scope->getScopeNode());
@@ -535,12 +547,9 @@ DIE *DwarfDebug::createScopeChildrenDIE(
}
// Collect lexical scope children first.
- for (DbgVariable *DV : ScopeVariables.lookup(Scope)) {
- Children.push_back(
- TheCU.constructVariableDIE(*DV, Scope->isAbstractScope()));
- if (DV->isObjectPointer())
- ObjectPointer = Children.back().get();
- }
+ for (DbgVariable *DV : ScopeVariables.lookup(Scope))
+ Children.push_back(constructVariableDIE(TheCU, *DV, *Scope, ObjectPointer));
+
for (LexicalScope *LS : Scope->getChildren())
if (std::unique_ptr<DIE> Nested = constructScopeDIE(TheCU, LS))
Children.push_back(std::move(Nested));
@@ -897,7 +906,7 @@ void DwarfDebug::collectDeadVariables()
if (!DV.isVariable())
continue;
DbgVariable NewVar(DV, nullptr, this);
- SPDIE->addChild(SPCU->constructVariableDIE(NewVar, false));
+ SPDIE->addChild(SPCU->constructVariableDIE(NewVar));
}
}
}
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=207717&r1=207716&r2=207717&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Wed Apr 30 17:41:33 2014
@@ -1807,14 +1807,15 @@ void DwarfUnit::constructContainingTypeD
/// constructVariableDIE - Construct a DIE for the given DbgVariable.
std::unique_ptr<DIE> DwarfUnit::constructVariableDIE(DbgVariable &DV,
- bool isScopeAbstract) {
- auto D = constructVariableDIEImpl(DV, isScopeAbstract);
+ AbstractOrInlined AbsIn) {
+ auto D = constructVariableDIEImpl(DV, AbsIn);
DV.setDIE(*D);
return D;
}
-std::unique_ptr<DIE> DwarfUnit::constructVariableDIEImpl(const DbgVariable &DV,
- bool isScopeAbstract) {
+std::unique_ptr<DIE>
+DwarfUnit::constructVariableDIEImpl(const DbgVariable &DV,
+ AbstractOrInlined AbsIn) {
StringRef Name = DV.getName();
// Define variable debug information entry.
@@ -1830,10 +1831,10 @@ std::unique_ptr<DIE> DwarfUnit::construc
addType(*VariableDie, DV.getType());
}
- if (DV.isArtificial())
+ if (AbsIn != AOI_Inlined && DV.isArtificial())
addFlag(*VariableDie, dwarf::DW_AT_artificial);
- if (isScopeAbstract)
+ if (AbsIn == AOI_Abstract)
return VariableDie;
// Add variable address.
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h?rev=207717&r1=207716&r2=207717&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h Wed Apr 30 17:41:33 2014
@@ -61,6 +61,8 @@ public:
void addRange(RangeSpan Range) { Ranges.push_back(Range); }
};
+enum AbstractOrInlined { AOI_None, AOI_Inlined, AOI_Abstract };
+
//===----------------------------------------------------------------------===//
/// Unit - This dwarf writer support class manages information associated
/// with a source file.
@@ -413,7 +415,7 @@ public:
/// constructVariableDIE - Construct a DIE for the given DbgVariable.
std::unique_ptr<DIE> constructVariableDIE(DbgVariable &DV,
- bool isScopeAbstract);
+ AbstractOrInlined AbsIn = AOI_None);
/// constructSubprogramArguments - Construct function argument DIEs.
DIE *constructSubprogramArguments(DIE &Buffer, DIArray Args);
@@ -451,7 +453,7 @@ private:
/// \brief Construct a DIE for the given DbgVariable without initializing the
/// DbgVariable's DIE reference.
std::unique_ptr<DIE> constructVariableDIEImpl(const DbgVariable &DV,
- bool isScopeAbstract);
+ AbstractOrInlined AbsIn);
/// constructTypeDIE - Construct basic type die from DIBasicType.
void constructTypeDIE(DIE &Buffer, DIBasicType BTy);
Modified: llvm/trunk/test/DebugInfo/X86/inline-member-function.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/inline-member-function.ll?rev=207717&r1=207716&r2=207717&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/inline-member-function.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/inline-member-function.ll Wed Apr 30 17:41:33 2014
@@ -18,6 +18,8 @@
; CHECK-NEXT: DW_AT_abstract_origin {{.*}}{[[ABSTRACT_ORIGIN:0x[0-9a-e]*]]}
; CHECK-NOT: NULL
; CHECK-NOT: DW_AT_object_pointer
+; CHECK: DW_TAG_formal_parameter
+; CHECK-NOT: DW_AT_artificial
; CHECK: DW_TAG
; But make sure we emit DW_AT_object_pointer on the declaration.
More information about the llvm-commits
mailing list