From 19a8b90763995b18552ea9841e3b2be9bf3a96ac Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Wed, 4 Jun 2014 01:30:59 +0000 Subject: DebugInfo: Partial revert r209984 due to more cases where abstract DbgVariables do not have associated DIEs. Along with a test case to demonstrate that due to inlining order there are cases where abstract variable DIEs are not constructed since the abstract subprogram was built due to a previous inlining that optimized away those variables. This produces incorrect debug info (the 'missing' abstract variable causes the inlined instance of that variable to be emitted with a full description (name, line, file) rather than referencing the abstract origin), but this commit at least ensures that it doesn't crash... llvm-svn: 210143 --- llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'llvm/lib/CodeGen') diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp index fddc7fa137f..2325ab8444e 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -1781,7 +1781,11 @@ std::unique_ptr DwarfUnit::constructVariableDIEImpl(const DbgVariable &DV, // Define variable debug information entry. auto VariableDie = make_unique(DV.getTag()); - if (DbgVariable *AbsVar = DV.getAbstractVariable()) + DbgVariable *AbsVar = DV.getAbstractVariable(); + // FIXME: any missing abstract variable missing a DIE will result in incorrect + // DWARF. More details in test/DebugInfo/missing-abstract-variable.ll for an + // example of why this is happening. + if (AbsVar && AbsVar->getDIE()) addDIEEntry(*VariableDie, dwarf::DW_AT_abstract_origin, *AbsVar->getDIE()); else { if (!Name.empty()) -- cgit v1.2.3