[llvm] r212203 - Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
Duncan P. N. Exon Smith
dexonsmith at apple.com
Thu Jul 3 13:37:33 PDT 2014
Hi David,
Aditya is working on a reproduction. Hopefully you'll have it soon.
In the meantime, this has gummed up our internal buildbots. Any chance
you'd revert proactively?
-- dpnes
> On 2014-Jul-03, at 12:06, David Blaikie <dblaikie at gmail.com> wrote:
>
> Do you have a test case by chance?
>
> On Jul 2, 2014 10:52 PM, "Bob Wilson" <bob.wilson at apple.com> wrote:
> This seems to be breaking a Release+Asserts build of clang with LTO on Darwin:
>
> Assertion failed: (FnScope->getScopeNode() == DI->second), function beginFunction, file /Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.apple-clang-RA_master/clang/src/lib/CodeGen/AsmPrinter/DwarfDebug.cpp, line 1508.
>
>
> > On Jul 2, 2014, at 11:31 AM, David Blaikie <dblaikie at gmail.com> wrote:
> >
> > Author: dblaikie
> > Date: Wed Jul 2 13:31:35 2014
> > New Revision: 212203
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=212203&view=rev
> > Log:
> > Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
> >
> > If a function isn't actually in a CU's subprogram list in the debug info
> > metadata, ignore all the DebugLocs and don't try to build scopes, track
> > variables, etc.
> >
> > While this is possibly a minor optimization, it's also a correctness fix
> > for an incoming patch that will add assertions to LexicalScopes and the
> > debug info verifier to ensure that all scope chains lead to debug info
> > for the current function.
> >
> > Fix up a few test cases that had broken/incomplete debug info that could
> > violate this constraint.
> >
> > Add a test case where this occurs by design (inlining a
> > debug-info-having function in an attribute nodebug function - we want
> > this to work because /if/ the nodebug function is then inlined into a
> > debug-info-having function, it should be fine (and will work fine - we
> > just stitch the scopes up as usual), but should the inlining not happen
> > we need to not assert fail either).
> >
> > Added:
> > llvm/trunk/test/DebugInfo/nodebug.ll
> > Modified:
> > llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> > llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h
> > llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp
> > llvm/trunk/lib/CodeGen/LiveDebugVariables.h
> > llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll
> > llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll
> > llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll
> >
> > Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=212203&r1=212202&r2=212203&view=diff
> > ==============================================================================
> > --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
> > +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Wed Jul 2 13:31:35 2014
> > @@ -730,6 +730,8 @@ void DwarfDebug::beginModule() {
> >
> > const Module *M = MMI->getModule();
> >
> > + FunctionDIs = makeSubprogramMap(*M);
> > +
> > // If module has named metadata anchors then use them, otherwise scan the
> > // module using debug info finder to collect debug info.
> > NamedMDNode *CU_Nodes = M->getNamedMetadata("llvm.dbg.cu");
> > @@ -1415,6 +1417,10 @@ void DwarfDebug::beginFunction(const Mac
> > if (!MMI->hasDebugInfo())
> > return;
> >
> > + auto DI = FunctionDIs.find(MF->getFunction());
> > + if (DI == FunctionDIs.end())
> > + return;
> > +
> > // Grab the lexical scopes for the function, if we don't have any of those
> > // then we're not going to be able to do anything.
> > LScopes.initialize(*MF);
> > @@ -1430,6 +1436,7 @@ void DwarfDebug::beginFunction(const Mac
> > // belongs to so that we add to the correct per-cu line table in the
> > // non-asm case.
> > LexicalScope *FnScope = LScopes.getCurrentFunctionScope();
> > + assert(FnScope->getScopeNode() == DI->second);
> > DwarfCompileUnit *TheCU = SPMap.lookup(FnScope->getScopeNode());
> > assert(TheCU && "Unable to find compile unit!");
> > if (Asm->OutStreamer.hasRawTextSupport())
> > @@ -1527,7 +1534,8 @@ void DwarfDebug::endFunction(const Machi
> > assert(CurFn == MF);
> > assert(CurFn != nullptr);
> >
> > - if (!MMI->hasDebugInfo() || LScopes.empty()) {
> > + if (!MMI->hasDebugInfo() || LScopes.empty() ||
> > + !FunctionDIs.count(MF->getFunction())) {
> > // If we don't have a lexical scope for this function then there will
> > // be a hole in the range information. Keep note of this by setting the
> > // previously used section to nullptr.
> >
> > Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h?rev=212203&r1=212202&r2=212203&view=diff
> > ==============================================================================
> > --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h (original)
> > +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h Wed Jul 2 13:31:35 2014
> > @@ -330,6 +330,8 @@ class DwarfDebug : public AsmPrinterHand
> > DwarfAccelTable AccelNamespace;
> > DwarfAccelTable AccelTypes;
> >
> > + DenseMap<const Function *, DISubprogram> FunctionDIs;
> > +
> > MCDwarfDwoLineTable *getDwoLineTable(const DwarfCompileUnit &);
> >
> > void addScopeVariable(LexicalScope *LS, DbgVariable *Var);
> >
> > Modified: llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp?rev=212203&r1=212202&r2=212203&view=diff
> > ==============================================================================
> > --- llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp (original)
> > +++ llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp Wed Jul 2 13:31:35 2014
> > @@ -329,12 +329,13 @@ class LDVImpl {
> > void computeIntervals();
> >
> > public:
> > - LDVImpl(LiveDebugVariables *ps) : pass(*ps), EmitDone(false),
> > - ModifiedMF(false) {}
> > + LDVImpl(LiveDebugVariables *ps)
> > + : pass(*ps), MF(nullptr), EmitDone(false), ModifiedMF(false) {}
> > bool runOnMachineFunction(MachineFunction &mf);
> >
> > /// clear - Release all memory.
> > void clear() {
> > + MF = nullptr;
> > userValues.clear();
> > virtRegToEqClass.clear();
> > userVarMap.clear();
> > @@ -693,11 +694,11 @@ void LDVImpl::computeIntervals() {
> > }
> >
> > bool LDVImpl::runOnMachineFunction(MachineFunction &mf) {
> > + clear();
> > MF = &mf;
> > LIS = &pass.getAnalysis<LiveIntervals>();
> > MDT = &pass.getAnalysis<MachineDominatorTree>();
> > TRI = mf.getTarget().getRegisterInfo();
> > - clear();
> > LS.initialize(mf);
> > DEBUG(dbgs() << "********** COMPUTING LIVE DEBUG VARIABLES: "
> > << mf.getName() << " **********\n");
> > @@ -712,6 +713,8 @@ bool LDVImpl::runOnMachineFunction(Machi
> > bool LiveDebugVariables::runOnMachineFunction(MachineFunction &mf) {
> > if (!EnableLDV)
> > return false;
> > + if (!FunctionDIs.count(mf.getFunction()))
> > + return false;
> > if (!pImpl)
> > pImpl = new LDVImpl(this);
> > return static_cast<LDVImpl*>(pImpl)->runOnMachineFunction(mf);
> > @@ -974,6 +977,8 @@ void UserValue::emitDebugValues(VirtRegM
> >
> > void LDVImpl::emitDebugValues(VirtRegMap *VRM) {
> > DEBUG(dbgs() << "********** EMITTING LIVE DEBUG VARIABLES **********\n");
> > + if (!MF)
> > + return;
> > const TargetInstrInfo *TII = MF->getTarget().getInstrInfo();
> > for (unsigned i = 0, e = userValues.size(); i != e; ++i) {
> > DEBUG(userValues[i]->print(dbgs(), &MF->getTarget()));
> > @@ -988,6 +993,10 @@ void LiveDebugVariables::emitDebugValues
> > static_cast<LDVImpl*>(pImpl)->emitDebugValues(VRM);
> > }
> >
> > +bool LiveDebugVariables::doInitialization(Module &M) {
> > + FunctionDIs = makeSubprogramMap(M);
> > + return Pass::doInitialization(M);
> > +}
> >
> > #ifndef NDEBUG
> > void LiveDebugVariables::dump() {
> >
> > Modified: llvm/trunk/lib/CodeGen/LiveDebugVariables.h
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveDebugVariables.h?rev=212203&r1=212202&r2=212203&view=diff
> > ==============================================================================
> > --- llvm/trunk/lib/CodeGen/LiveDebugVariables.h (original)
> > +++ llvm/trunk/lib/CodeGen/LiveDebugVariables.h Wed Jul 2 13:31:35 2014
> > @@ -22,6 +22,7 @@
> > #define LLVM_CODEGEN_LIVEDEBUGVARIABLES_H
> >
> > #include "llvm/ADT/ArrayRef.h"
> > +#include "llvm/IR/DebugInfo.h"
> > #include "llvm/CodeGen/MachineFunctionPass.h"
> >
> > namespace llvm {
> > @@ -32,6 +33,7 @@ class VirtRegMap;
> >
> > class LiveDebugVariables : public MachineFunctionPass {
> > void *pImpl;
> > + DenseMap<const Function*, DISubprogram> FunctionDIs;
> > public:
> > static char ID; // Pass identification, replacement for typeid
> >
> > @@ -64,6 +66,7 @@ private:
> > bool runOnMachineFunction(MachineFunction &) override;
> > void releaseMemory() override;
> > void getAnalysisUsage(AnalysisUsage &) const override;
> > + bool doInitialization(Module &) override;
> >
> > };
> >
> >
> > Modified: llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll?rev=212203&r1=212202&r2=212203&view=diff
> > ==============================================================================
> > --- llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll (original)
> > +++ llvm/trunk/test/CodeGen/X86/2010-06-01-DeadArg-DbgInfo.ll Wed Jul 2 13:31:35 2014
> > @@ -24,7 +24,7 @@ declare void @llvm.dbg.value(metadata, i
> > !llvm.dbg.lv = !{!0, !14, !15, !16, !17, !24, !25, !28}
> >
> > !0 = metadata !{i32 786689, metadata !1, metadata !"this", metadata !3, i32 11, metadata !12, i32 0, null} ; [ DW_TAG_arg_variable ]
> > -!1 = metadata !{i32 786478, metadata !31, metadata !2, metadata !"bar", metadata !"bar", metadata !"_ZN3foo3barEi", i32 11, metadata !9, i1 false, i1 true, i32 0, i32 0, null, i32 0, i1 true, i32 (%struct.foo*, i32)* @_ZN3foo3bazEi, null, null, null, i32 11} ; [ DW_TAG_subprogram ]
> > +!1 = metadata !{i32 786478, metadata !31, metadata !2, metadata !"bar", metadata !"bar", metadata !"_ZN3foo3barEi", i32 11, metadata !9, i1 false, i1 true, i32 0, i32 0, null, i32 0, i1 true, i32 (%struct.foo*, i32)* null, null, null, null, i32 11} ; [ DW_TAG_subprogram ]
> > !2 = metadata !{i32 786451, metadata !31, metadata !3, metadata !"foo", i32 3, i64 32, i64 32, i64 0, i32 0, null, metadata !5, i32 0, null, null, null} ; [ DW_TAG_structure_type ] [foo] [line 3, size 32, align 32, offset 0] [def] [from ]
> > !3 = metadata !{i32 786473, metadata !31} ; [ DW_TAG_file_type ]
> > !4 = metadata !{i32 786449, metadata !31, i32 4, metadata !"4.2.1 LLVM build", i1 true, metadata !"", i32 0, metadata !32, metadata !32, metadata !33, null, null, metadata !""} ; [ DW_TAG_compile_unit ]
> >
> > Modified: llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll?rev=212203&r1=212202&r2=212203&view=diff
> > ==============================================================================
> > --- llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll (original)
> > +++ llvm/trunk/test/CodeGen/X86/dbg-changes-codegen-branch-folding.ll Wed Jul 2 13:31:35 2014
> > @@ -52,58 +52,153 @@ define void @_Z3barii(i32 %param1, i32 %
> > entry:
> > %var1 = alloca %struct.AAA3, align 1
> > %var2 = alloca %struct.AAA3, align 1
> > - %tobool = icmp eq i32 %param2, 0
> > - br i1 %tobool, label %if.end, label %if.then
> > + tail call void @llvm.dbg.value(metadata !{i32 %param1}, i64 0, metadata !30), !dbg !47
> > + tail call void @llvm.dbg.value(metadata !{i32 %param2}, i64 0, metadata !31), !dbg !47
> > + tail call void @llvm.dbg.value(metadata !48, i64 0, metadata !32), !dbg !49
> > + %tobool = icmp eq i32 %param2, 0, !dbg !50
> > + br i1 %tobool, label %if.end, label %if.then, !dbg !50
> >
> > if.then: ; preds = %entry
> > - %call = call i8* @_Z5i2stri(i32 %param2)
> > - br label %if.end
> > + %call = tail call i8* @_Z5i2stri(i32 %param2), !dbg !52
> > + tail call void @llvm.dbg.value(metadata !{i8* %call}, i64 0, metadata !32), !dbg !49
> > + br label %if.end, !dbg !54
> >
> > if.end: ; preds = %entry, %if.then
> > - call void @llvm.dbg.value(metadata !{%struct.AAA3* %var1}, i64 0, metadata !60)
> > - call void @llvm.dbg.value(metadata !62, i64 0, metadata !63)
> > - %arraydecay.i = getelementptr inbounds %struct.AAA3* %var1, i64 0, i32 0, i64 0
> > - call void @_Z3fooPcjPKc(i8* %arraydecay.i, i32 4, i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0))
> > - call void @llvm.dbg.declare(metadata !{%struct.AAA3* %var2}, metadata !38)
> > - %arraydecay.i5 = getelementptr inbounds %struct.AAA3* %var2, i64 0, i32 0, i64 0
> > - call void @_Z3fooPcjPKc(i8* %arraydecay.i5, i32 4, i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0))
> > - %tobool1 = icmp eq i32 %param1, 0
> > - br i1 %tobool1, label %if.else, label %if.then2
> > + tail call void @llvm.dbg.value(metadata !{%struct.AAA3* %var1}, i64 0, metadata !33), !dbg !55
> > + tail call void @llvm.dbg.value(metadata !{%struct.AAA3* %var1}, i64 0, metadata !56), !dbg !57
> > + tail call void @llvm.dbg.value(metadata !58, i64 0, metadata !59), !dbg !60
> > + %arraydecay.i = getelementptr inbounds %struct.AAA3* %var1, i64 0, i32 0, i64 0, !dbg !61
> > + call void @_Z3fooPcjPKc(i8* %arraydecay.i, i32 4, i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0)), !dbg !61
> > + call void @llvm.dbg.value(metadata !{%struct.AAA3* %var2}, i64 0, metadata !34), !dbg !63
> > + call void @llvm.dbg.value(metadata !{%struct.AAA3* %var2}, i64 0, metadata !64), !dbg !65
> > + call void @llvm.dbg.value(metadata !58, i64 0, metadata !66), !dbg !67
> > + %arraydecay.i5 = getelementptr inbounds %struct.AAA3* %var2, i64 0, i32 0, i64 0, !dbg !68
> > + call void @_Z3fooPcjPKc(i8* %arraydecay.i5, i32 4, i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0)), !dbg !68
> > + %tobool1 = icmp eq i32 %param1, 0, !dbg !69
> > + call void @llvm.dbg.value(metadata !{%struct.AAA3* %var2}, i64 0, metadata !34), !dbg !63
> > + br i1 %tobool1, label %if.else, label %if.then2, !dbg !69
> >
> > if.then2: ; preds = %if.end
> > - call void @_Z3fooPcjPKc(i8* %arraydecay.i5, i32 4, i8* getelementptr inbounds ([2 x i8]* @.str1, i64 0, i64 0))
> > - br label %if.end3
> > + call void @llvm.dbg.value(metadata !{%struct.AAA3* %var2}, i64 0, metadata !71), !dbg !73
> > + call void @llvm.dbg.value(metadata !74, i64 0, metadata !75), !dbg !76
> > + call void @_Z3fooPcjPKc(i8* %arraydecay.i5, i32 4, i8* getelementptr inbounds ([2 x i8]* @.str1, i64 0, i64 0)), !dbg !76
> > + br label %if.end3, !dbg !72
> >
> > if.else: ; preds = %if.end
> > - call void @_Z3fooPcjPKc(i8* %arraydecay.i5, i32 4, i8* getelementptr inbounds ([2 x i8]* @.str2, i64 0, i64 0))
> > + call void @llvm.dbg.value(metadata !{%struct.AAA3* %var2}, i64 0, metadata !77), !dbg !79
> > + call void @llvm.dbg.value(metadata !80, i64 0, metadata !81), !dbg !82
> > + call void @_Z3fooPcjPKc(i8* %arraydecay.i5, i32 4, i8* getelementptr inbounds ([2 x i8]* @.str2, i64 0, i64 0)), !dbg !82
> > br label %if.end3
> >
> > if.end3: ; preds = %if.else, %if.then2
> > - call void @_Z3fooPcjPKc(i8* %arraydecay.i, i32 4, i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0))
> > - ret void
> > + call void @llvm.dbg.value(metadata !{%struct.AAA3* %var1}, i64 0, metadata !33), !dbg !55
> > + call void @llvm.dbg.value(metadata !{%struct.AAA3* %var1}, i64 0, metadata !83), !dbg !85
> > + call void @llvm.dbg.value(metadata !58, i64 0, metadata !86), !dbg !87
> > + call void @_Z3fooPcjPKc(i8* %arraydecay.i, i32 4, i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0)), !dbg !87
> > + ret void, !dbg !88
> > }
> >
> > -; Function Attrs: nounwind readnone
> > -declare void @llvm.dbg.declare(metadata, metadata) #1
> > -
> > -declare i8* @_Z5i2stri(i32) #2
> > +declare i8* @_Z5i2stri(i32) #1
> >
> > -declare void @_Z3fooPcjPKc(i8*, i32, i8*) #2
> > +declare void @_Z3fooPcjPKc(i8*, i32, i8*) #1
> >
> > ; Function Attrs: nounwind readnone
> > -declare void @llvm.dbg.value(metadata, i64, metadata) #1
> > +declare void @llvm.dbg.value(metadata, i64, metadata) #2
> >
> > attributes #0 = { uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
> > -attributes #1 = { nounwind readnone }
> > -attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
> > -
> > -!llvm.module.flags = !{!48, !49}
> > -!llvm.ident = !{!50}
> > +attributes #1 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
> > +attributes #2 = { nounwind readnone }
> >
> > -!38 = metadata !{i32 786688, null, metadata !"var2", null, i32 20, null, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [var2] [line 20]
> > -!48 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
> > -!49 = metadata !{i32 1, metadata !"Debug Info Version", i32 1}
> > -!50 = metadata !{metadata !"clang version 3.5 (202418)"}
> > -!60 = metadata !{i32 786689, null, metadata !"this", null, i32 16777216, null, i32 1088, null} ; [ DW_TAG_arg_variable ] [this] [line 0]
> > -!62 = metadata !{i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0)}
> > -!63 = metadata !{i32 786689, null, metadata !"value", null, i32 33554439, null, i32 0, null} ; [ DW_TAG_arg_variable ] [value] [line 7]
> > +!llvm.dbg.cu = !{!0}
> > +!llvm.module.flags = !{!44, !45}
> > +!llvm.ident = !{!46}
> > +
> > +!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.5.0 ", i1 true, metadata !"", i32 0, metadata !2, metadata !3, metadata !23, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp] [DW_LANG_C_plus_plus]
> > +!1 = metadata !{metadata !"dbg-changes-codegen-branch-folding.cpp", metadata !"/tmp/dbginfo"}
> > +!2 = metadata !{}
> > +!3 = metadata !{metadata !4}
> > +!4 = metadata !{i32 786451, metadata !1, null, metadata !"AAA3", i32 4, i64 32, i64 8, i32 0, i32 0, null, metadata !5, i32 0, null, null, metadata !"_ZTS4AAA3"} ; [ DW_TAG_structure_type ] [AAA3] [line 4, size 32, align 8, offset 0] [def] [from ]
> > +!5 = metadata !{metadata !6, metadata !11, metadata !17, metadata !18}
> > +!6 = metadata !{i32 786445, metadata !1, metadata !"_ZTS4AAA3", metadata !"text", i32 8, i64 32, i64 8, i64 0, i32 0, metadata !7} ; [ DW_TAG_member ] [text] [line 8, size 32, align 8, offset 0] [from ]
> > +!7 = metadata !{i32 786433, null, null, metadata !"", i32 0, i64 32, i64 8, i32 0, i32 0, metadata !8, metadata !9, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 32, align 8, offset 0] [from char]
> > +!8 = metadata !{i32 786468, null, null, metadata !"char", i32 0, i64 8, i64 8, i64 0, i32 0, i32 6} ; [ DW_TAG_base_type ] [char] [line 0, size 8, align 8, offset 0, enc DW_ATE_signed_char]
> > +!9 = metadata !{metadata !10}
> > +!10 = metadata !{i32 786465, i64 0, i64 4} ; [ DW_TAG_subrange_type ] [0, 3]
> > +!11 = metadata !{i32 786478, metadata !1, metadata !"_ZTS4AAA3", metadata !"AAA3", metadata !"AAA3", metadata !"", i32 5, metadata !12, i1 false, i1 false, i32 0, i32 0, null, i32 256, i1 true, null, null, i32 0, null, i32 5} ; [ DW_TAG_subprogram ] [line 5] [AAA3]
> > +!12 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !13, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
> > +!13 = metadata !{null, metadata !14, metadata !15}
> > +!14 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 1088, metadata !"_ZTS4AAA3"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from _ZTS4AAA3]
> > +!15 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !16} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from ]
> > +!16 = metadata !{i32 786470, null, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, metadata !8} ; [ DW_TAG_const_type ] [line 0, size 0, align 0, offset 0] [from char]
> > +!17 = metadata !{i32 786478, metadata !1, metadata !"_ZTS4AAA3", metadata !"operator=", metadata !"operator=", metadata !"_ZN4AAA3aSEPKc", i32 6, metadata !12, i1 false, i1 false, i32 0, i32 0, null, i32 256, i1 true, null, null, i32 0, null, i32 6} ; [ DW_TAG_subprogram ] [line 6] [operator=]
> > +!18 = metadata !{i32 786478, metadata !1, metadata !"_ZTS4AAA3", metadata !"operator const char *", metadata !"operator const char *", metadata !"_ZNK4AAA3cvPKcEv", i32 7, metadata !19, i1 false, i1 false, i32 0, i32 0, null, i32 256, i1 true, null, null, i32 0, null, i32 7} ; [ DW_TAG_subprogram ] [line 7] [operator const char *]
> > +!19 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !20, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
> > +!20 = metadata !{metadata !15, metadata !21}
> > +!21 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 1088, metadata !22} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from ]
> > +!22 = metadata !{i32 786470, null, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, metadata !"_ZTS4AAA3"} ; [ DW_TAG_const_type ] [line 0, size 0, align 0, offset 0] [from _ZTS4AAA3]
> > +!23 = metadata !{metadata !24, metadata !35, metadata !40}
> > +!24 = metadata !{i32 786478, metadata !1, metadata !25, metadata !"bar", metadata !"bar", metadata !"_Z3barii", i32 11, metadata !26, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, void (i32, i32)* @_Z3barii, null, null, metadata !29, i32 11} ; [ DW_TAG_subprogram ] [line 11] [def] [bar]
> > +!25 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]
> > +!26 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !27, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
> > +!27 = metadata !{null, metadata !28, metadata !28}
> > +!28 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]
> > +!29 = metadata !{metadata !30, metadata !31, metadata !32, metadata !33, metadata !34}
> > +!30 = metadata !{i32 786689, metadata !24, metadata !"param1", metadata !25, i32 16777227, metadata !28, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [param1] [line 11]
> > +!31 = metadata !{i32 786689, metadata !24, metadata !"param2", metadata !25, i32 33554443, metadata !28, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [param2] [line 11]
> > +!32 = metadata !{i32 786688, metadata !24, metadata !"temp", metadata !25, i32 12, metadata !15, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [temp] [line 12]
> > +!33 = metadata !{i32 786688, metadata !24, metadata !"var1", metadata !25, i32 17, metadata !"_ZTS4AAA3", i32 0, i32 0} ; [ DW_TAG_auto_variable ] [var1] [line 17]
> > +!34 = metadata !{i32 786688, metadata !24, metadata !"var2", metadata !25, i32 18, metadata !"_ZTS4AAA3", i32 0, i32 0} ; [ DW_TAG_auto_variable ] [var2] [line 18]
> > +!35 = metadata !{i32 786478, metadata !1, metadata !"_ZTS4AAA3", metadata !"operator=", metadata !"operator=", metadata !"_ZN4AAA3aSEPKc", i32 6, metadata !12, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, null, null, metadata !17, metadata !36, i32 6} ; [ DW_TAG_subprogram ] [line 6] [def] [operator=]
> > +!36 = metadata !{metadata !37, metadata !39}
> > +!37 = metadata !{i32 786689, metadata !35, metadata !"this", null, i32 16777216, metadata !38, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]
> > +!38 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !"_ZTS4AAA3"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS4AAA3]
> > +!39 = metadata !{i32 786689, metadata !35, metadata !"value", metadata !25, i32 33554438, metadata !15, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [value] [line 6]
> > +!40 = metadata !{i32 786478, metadata !1, metadata !"_ZTS4AAA3", metadata !"AAA3", metadata !"AAA3", metadata !"_ZN4AAA3C2EPKc", i32 5, metadata !12, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, null, null, metadata !11, metadata !41, i32 5} ; [ DW_TAG_subprogram ] [line 5] [def] [AAA3]
> > +!41 = metadata !{metadata !42, metadata !43}
> > +!42 = metadata !{i32 786689, metadata !40, metadata !"this", null, i32 16777216, metadata !38, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]
> > +!43 = metadata !{i32 786689, metadata !40, metadata !"value", metadata !25, i32 33554437, metadata !15, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [value] [line 5]
> > +!44 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
> > +!45 = metadata !{i32 2, metadata !"Debug Info Version", i32 1}
> > +!46 = metadata !{metadata !"clang version 3.5.0 "}
> > +!47 = metadata !{i32 11, i32 0, metadata !24, null}
> > +!48 = metadata !{i8* null}
> > +!49 = metadata !{i32 12, i32 0, metadata !24, null}
> > +!50 = metadata !{i32 14, i32 0, metadata !51, null}
> > +!51 = metadata !{i32 786443, metadata !1, metadata !24, i32 14, i32 0, i32 0, i32 0} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]
> > +!52 = metadata !{i32 15, i32 0, metadata !53, null}
> > +!53 = metadata !{i32 786443, metadata !1, metadata !51, i32 14, i32 0, i32 0, i32 1} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]
> > +!54 = metadata !{i32 16, i32 0, metadata !53, null}
> > +!55 = metadata !{i32 17, i32 0, metadata !24, null}
> > +!56 = metadata !{i32 786689, metadata !40, metadata !"this", null, i32 16777216, metadata !38, i32 1088, metadata !55} ; [ DW_TAG_arg_variable ] [this] [line 0]
> > +!57 = metadata !{i32 0, i32 0, metadata !40, metadata !55}
> > +!58 = metadata !{i8* getelementptr inbounds ([1 x i8]* @.str, i64 0, i64 0)}
> > +!59 = metadata !{i32 786689, metadata !40, metadata !"value", metadata !25, i32 33554437, metadata !15, i32 0, metadata !55} ; [ DW_TAG_arg_variable ] [value] [line 5]
> > +!60 = metadata !{i32 5, i32 0, metadata !40, metadata !55}
> > +!61 = metadata !{i32 5, i32 0, metadata !62, metadata !55}
> > +!62 = metadata !{i32 786443, metadata !1, metadata !40, i32 5, i32 0, i32 0, i32 3} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]
> > +!63 = metadata !{i32 18, i32 0, metadata !24, null}
> > +!64 = metadata !{i32 786689, metadata !40, metadata !"this", null, i32 16777216, metadata !38, i32 1088, metadata !63} ; [ DW_TAG_arg_variable ] [this] [line 0]
> > +!65 = metadata !{i32 0, i32 0, metadata !40, metadata !63}
> > +!66 = metadata !{i32 786689, metadata !40, metadata !"value", metadata !25, i32 33554437, metadata !15, i32 0, metadata !63} ; [ DW_TAG_arg_variable ] [value] [line 5]
> > +!67 = metadata !{i32 5, i32 0, metadata !40, metadata !63}
> > +!68 = metadata !{i32 5, i32 0, metadata !62, metadata !63}
> > +!69 = metadata !{i32 20, i32 0, metadata !70, null}
> > +!70 = metadata !{i32 786443, metadata !1, metadata !24, i32 20, i32 0, i32 0, i32 2} ; [ DW_TAG_lexical_block ] [/tmp/dbginfo/dbg-changes-codegen-branch-folding.cpp]
> > +!71 = metadata !{i32 786689, metadata !35, metadata !"this", null, i32 16777216, metadata !38, i32 1088, metadata !72} ; [ DW_TAG_arg_variable ] [this] [line 0]
> > +!72 = metadata !{i32 21, i32 0, metadata !70, null}
> > +!73 = metadata !{i32 0, i32 0, metadata !35, metadata !72}
> > +!74 = metadata !{i8* getelementptr inbounds ([2 x i8]* @.str1, i64 0, i64 0)}
> > +!75 = metadata !{i32 786689, metadata !35, metadata !"value", metadata !25, i32 33554438, metadata !15, i32 0, metadata !72} ; [ DW_TAG_arg_variable ] [value] [line 6]
> > +!76 = metadata !{i32 6, i32 0, metadata !35, metadata !72}
> > +!77 = metadata !{i32 786689, metadata !35, metadata !"this", null, i32 16777216, metadata !38, i32 1088, metadata !78} ; [ DW_TAG_arg_variable ] [this] [line 0]
> > +!78 = metadata !{i32 23, i32 0, metadata !70, null}
> > +!79 = metadata !{i32 0, i32 0, metadata !35, metadata !78}
> > +!80 = metadata !{i8* getelementptr inbounds ([2 x i8]* @.str2, i64 0, i64 0)}
> > +!81 = metadata !{i32 786689, metadata !35, metadata !"value", metadata !25, i32 33554438, metadata !15, i32 0, metadata !78} ; [ DW_TAG_arg_variable ] [value] [line 6]
> > +!82 = metadata !{i32 6, i32 0, metadata !35, metadata !78}
> > +!83 = metadata !{i32 786689, metadata !35, metadata !"this", null, i32 16777216, metadata !38, i32 1088, metadata !84} ; [ DW_TAG_arg_variable ] [this] [line 0]
> > +!84 = metadata !{i32 24, i32 0, metadata !24, null}
> > +!85 = metadata !{i32 0, i32 0, metadata !35, metadata !84}
> > +!86 = metadata !{i32 786689, metadata !35, metadata !"value", metadata !25, i32 33554438, metadata !15, i32 0, metadata !84} ; [ DW_TAG_arg_variable ] [value] [line 6]
> > +!87 = metadata !{i32 6, i32 0, metadata !35, metadata !84}
> > +!88 = metadata !{i32 25, i32 0, metadata !24, null}
> >
> > Modified: llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll?rev=212203&r1=212202&r2=212203&view=diff
> > ==============================================================================
> > --- llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll (original)
> > +++ llvm/trunk/test/DebugInfo/X86/concrete_out_of_line.ll Wed Jul 2 13:31:35 2014
> > @@ -79,7 +79,7 @@ declare void @_Z8moz_freePv(i8*)
> > !0 = metadata !{i32 786449, metadata !59, i32 4, metadata !"clang version 3.1 ()", i1 true, metadata !"", i32 0, metadata !1, metadata !1, metadata !3, metadata !47, metadata !1, metadata !""} ; [ DW_TAG_compile_unit ]
> > !1 = metadata !{}
> > !3 = metadata !{metadata !5, metadata !23, metadata !27, metadata !31}
> > -!5 = metadata !{i32 720942, metadata !6, null, metadata !"Release", metadata !"Release", metadata !"_ZN17nsAutoRefCnt7ReleaseEv", i32 14, metadata !7, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, i32* null, null, metadata !12, metadata !20, i32 14} ; [ DW_TAG_subprogram ] [line 14] [def] [Release]
> > +!5 = metadata !{i32 720942, metadata !6, null, metadata !"Release", metadata !"Release", metadata !"_ZN17nsAutoRefCnt7ReleaseEv", i32 14, metadata !7, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, i32 ()* @_ZN17nsAutoRefCnt7ReleaseEv , null, metadata !12, metadata !20, i32 14} ; [ DW_TAG_subprogram ] [line 14] [def] [Release]
> > !6 = metadata !{i32 720937, metadata !59} ; [ DW_TAG_file_type ]
> > !7 = metadata !{i32 720917, i32 0, null, i32 0, i32 0, i64 0, i64 0, i32 0, i32 0, null, metadata !8, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
> > !8 = metadata !{metadata !9, metadata !10}
> > @@ -95,7 +95,7 @@ declare void @_Z8moz_freePv(i8*)
> > !18 = metadata !{}
> > !20 = metadata !{metadata !22}
> > !22 = metadata !{i32 786689, metadata !5, metadata !"this", metadata !6, i32 16777230, metadata !10, i32 64, i32 0} ; [ DW_TAG_arg_variable ]
> > -!23 = metadata !{i32 720942, metadata !6, null, metadata !"~nsAutoRefCnt", metadata !"~nsAutoRefCnt", metadata !"_ZN17nsAutoRefCntD1Ev", i32 18, metadata !16, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, i32* null, null, metadata !15, metadata !24, i32 18} ; [ DW_TAG_subprogram ] [line 18] [def] [~nsAutoRefCnt]
> > +!23 = metadata !{i32 720942, metadata !6, null, metadata !"~nsAutoRefCnt", metadata !"~nsAutoRefCnt", metadata !"_ZN17nsAutoRefCntD1Ev", i32 18, metadata !16, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, void ()* @_ZN17nsAutoRefCntD1Ev, null, metadata !15, metadata !24, i32 18} ; [ DW_TAG_subprogram ] [line 18] [def] [~nsAutoRefCnt]
> > !24 = metadata !{metadata !26}
> > !26 = metadata !{i32 786689, metadata !23, metadata !"this", metadata !6, i32 16777234, metadata !10, i32 64, i32 0} ; [ DW_TAG_arg_variable ]
> > !27 = metadata !{i32 720942, metadata !6, null, metadata !"~nsAutoRefCnt", metadata !"~nsAutoRefCnt", metadata !"_ZN17nsAutoRefCntD2Ev", i32 18, metadata !16, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 true, i32* null, null, metadata !15, metadata !28, i32 18} ; [ DW_TAG_subprogram ] [line 18] [def] [~nsAutoRefCnt]
> >
> > Added: llvm/trunk/test/DebugInfo/nodebug.ll
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/nodebug.ll?rev=212203&view=auto
> > ==============================================================================
> > --- llvm/trunk/test/DebugInfo/nodebug.ll (added)
> > +++ llvm/trunk/test/DebugInfo/nodebug.ll Wed Jul 2 13:31:35 2014
> > @@ -0,0 +1,51 @@
> > +; REQUIRES: object-emission
> > +
> > +; RUN: %llc_dwarf < %s -filetype=obj | llvm-dwarfdump -debug-dump=info - | FileCheck %s
> > +
> > +; Test that a nodebug function (a function not appearing in the debug info IR
> > +; metadata subprogram list) with DebugLocs on its IR doesn't cause crashes/does
> > +; the right thing.
> > +
> > +; Build with clang from the following:
> > +; extern int i;
> > +; inline __attribute__((always_inline)) void f1() {
> > +; i = 3;
> > +; }
> > +;
> > +; __attribute__((nodebug)) void f2() {
> > +; f1();
> > +; }
> > +
> > +; Check that there's only one DW_TAG_subprogram, nothing for the 'f2' function.
> > +; CHECK: DW_TAG_subprogram
> > +; CHECK-NOT: DW_TAG
> > +; CHECK: DW_AT_name {{.*}} "f1"
> > +; CHECK-NOT: DW_TAG_subprogram
> > +
> > + at i = external global i32
> > +
> > +; Function Attrs: uwtable
> > +define void @_Z2f2v() #0 {
> > +entry:
> > + store i32 3, i32* @i, align 4, !dbg !11
> > + ret void
> > +}
> > +
> > +attributes #0 = { uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
> > +
> > +!llvm.dbg.cu = !{!0}
> > +!llvm.module.flags = !{!8, !9}
> > +!llvm.ident = !{!10}
> > +
> > +!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.5.0 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [/tmp/dbginfo/nodebug.cpp] [DW_LANG_C_plus_plus]
> > +!1 = metadata !{metadata !"nodebug.cpp", metadata !"/tmp/dbginfo"}
> > +!2 = metadata !{}
> > +!3 = metadata !{metadata !4}
> > +!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"f1", metadata !"f1", metadata !"_Z2f1v", i32 2, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, null, null, null, metadata !2, i32 2} ; [ DW_TAG_subprogram ] [line 2] [def] [f1]
> > +!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/tmp/dbginfo/nodebug.cpp]
> > +!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
> > +!7 = metadata !{null}
> > +!8 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
> > +!9 = metadata !{i32 2, metadata !"Debug Info Version", i32 1}
> > +!10 = metadata !{metadata !"clang version 3.5.0 "}
> > +!11 = metadata !{i32 3, i32 0, metadata !4, null}
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at cs.uiuc.edu
> > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list