[llvm] r267370 - Verifier: Verify that each inlinable callsite of a debug-info-bearing function
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Mon Apr 25 10:33:41 PDT 2016
On Sun, Apr 24, 2016 at 3:23 PM, Adrian Prantl via llvm-commits <
llvm-commits at lists.llvm.org> wrote:
> Author: adrian
> Date: Sun Apr 24 17:23:13 2016
> New Revision: 267370
>
> URL: http://llvm.org/viewvc/llvm-project?rev=267370&view=rev
> Log:
> Verifier: Verify that each inlinable callsite of a debug-info-bearing
> function
> in a debug-info-bearing function has a debug location attached to it.
> Failure to
> do so causes an "!dbg attachment points at wrong subprogram for function"
> assertion failure when the inliner sets up inline scope info.
>
Great to have this check - though, as an FYI: This doesn't catch all the
cases of the downstream assertion. The downstream assertion can be
triggered through indirect scenarios:
void f1();
inline __attribute__((alwaysinline)) void f2() { f1(); }
inline __attribute__((alwaysinline)) void f3() { f2(); } // make this
nodebug or equivalent
void f4() { f3(); } // if f3 has no debugloc
Now you'll end up with the same problem if f2 is inlined into f3 (maybe
even in the other order), producing instructions with debug locations - and
then that's inlined into f4 at a callsite with no debugloc, leaving the
instructions having debug locations that don't chain up to the f4
subprogram scope - but still chain up to the f2 subprogram scope.
- Dave
> rdar://problem/25878916
>
> This reaplies r267320 without changes after fixing an issue in the OpenMP
> IR
> generator in clang.
>
> Added:
> llvm/trunk/test/Verifier/callsite-dbgloc.ll
> Modified:
> llvm/trunk/lib/IR/Verifier.cpp
> llvm/trunk/test/DebugInfo/X86/arange-and-stub.ll
> llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll
>
> Modified: llvm/trunk/lib/IR/Verifier.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=267370&r1=267369&r2=267370&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/IR/Verifier.cpp (original)
> +++ llvm/trunk/lib/IR/Verifier.cpp Sun Apr 24 17:23:13 2016
> @@ -2579,6 +2579,15 @@ void Verifier::verifyCallSite(CallSite C
> }
> }
>
> + // Verify that each inlinable callsite of a debug-info-bearing function
> in a
> + // debug-info-bearing function has a debug location attached to it.
> Failure to
> + // do so causes assertion failures when the inliner sets up inline
> scope info.
> + if (I->getFunction()->getSubprogram() && CS.getCalledFunction() &&
> + CS.getCalledFunction()->getSubprogram())
> + Assert(I->getDebugLoc(), "inlinable function call in a function with
> debug "
> + "info must have a !dbg location",
> + I);
> +
> visitInstruction(*I);
> }
>
>
> Modified: llvm/trunk/test/DebugInfo/X86/arange-and-stub.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/arange-and-stub.ll?rev=267370&r1=267369&r2=267370&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/DebugInfo/X86/arange-and-stub.ll (original)
> +++ llvm/trunk/test/DebugInfo/X86/arange-and-stub.ll Sun Apr 24 17:23:13
> 2016
> @@ -18,7 +18,7 @@ define void @foo() !dbg !4 {
>
> define void @bar() personality i8* bitcast (void ()* @foo to i8*) !dbg !9
> {
> invoke void @foo()
> - to label %invoke.cont unwind label %lpad
> + to label %invoke.cont unwind label %lpad, !dbg !19
>
> invoke.cont: ; preds = %0
> ret void
> @@ -50,3 +50,4 @@ lpad:
> !16 = !DISubrange(count: 1)
> !17 = !{i32 2, !"Dwarf Version", i32 4}
> !18 = !{i32 2, !"Debug Info Version", i32 3}
> +!19 = !DILocation(line: 0, scope: !9)
>
> Modified: llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll?rev=267370&r1=267369&r2=267370&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll (original)
> +++ llvm/trunk/test/DebugInfo/X86/dbg-declare-arg.ll Sun Apr 24 17:23:13
> 2016
> @@ -54,7 +54,7 @@ entry:
> store %class.A* %this, %class.A** %this.addr, align 8
> call void @llvm.dbg.declare(metadata %class.A** %this.addr, metadata
> !43, metadata !DIExpression()), !dbg !44
> %this1 = load %class.A*, %class.A** %this.addr
> - call void @_ZN1AD2Ev(%class.A* %this1)
> + call void @_ZN1AD2Ev(%class.A* %this1), !dbg !53
> ret void, !dbg !45
> }
>
> @@ -124,3 +124,4 @@ entry:
> !49 = distinct !DILexicalBlock(line: 2, column: 52, file: !51, scope: !25)
> !51 = !DIFile(filename: "a.cc", directory: "/private/tmp")
> !52 = !{i32 1, !"Debug Info Version", i32 3}
> +!53 = !DILocation(line: 0, scope: !22)
>
> Added: llvm/trunk/test/Verifier/callsite-dbgloc.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/callsite-dbgloc.ll?rev=267370&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Verifier/callsite-dbgloc.ll (added)
> +++ llvm/trunk/test/Verifier/callsite-dbgloc.ll Sun Apr 24 17:23:13 2016
> @@ -0,0 +1,62 @@
> +; RUN: not llvm-as %s -o %t 2>&1 | FileCheck %s
> +; Created and then edited from
>
It'd be good to describe the required edits here? (so that if someone is
trying to regenerate or otherwise understand this test they know what to
look for)
> +; extern void i();
> +; void h() { i(); }
> +; void g() { h(); }
> +; void f() { g(); }
> +;
> +; Compiling this with inlining runs into the
> +; "!dbg attachment points at wrong subprogram for function"
> +; assertion.
> +
> +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
> +target triple = "x86_64-apple-macosx"
> +
> +; Function Attrs: nounwind ssp uwtable
> +define void @h() #0 !dbg !7 {
> +entry:
> + call void (...) @i(), !dbg !9
> + ret void, !dbg !10
> +}
> +
> +declare void @i(...) #1
> +
> +; Function Attrs: nounwind ssp uwtable
> +define void @g() #0 !dbg !11 {
> +entry:
> +; Manually removed !dbg.
> +; CHECK: inlinable function call in a function with debug info must have
> a !dbg location
> + call void @h()
> + ret void, !dbg !13
> +}
> +
> +; Function Attrs: nounwind ssp uwtable
> +define void @f() #0 !dbg !14 {
> +entry:
> + call void @g(), !dbg !15
> + ret void, !dbg !16
> +}
> +
> +attributes #0 = { nounwind ssp uwtable }
> +
> +!llvm.dbg.cu = !{!0}
> +!llvm.module.flags = !{!3, !4, !5}
> +!llvm.ident = !{!6}
> +
> +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer:
> "clang version 3.9.0 (trunk 267186)", isOptimized: false, runtimeVersion:
> 0, emissionKind: LineTablesOnly, enums: !2)
> +!1 = !DIFile(filename: "test.c", directory: "/Volumes/Data/llvm")
> +!2 = !{}
> +!3 = !{i32 2, !"Dwarf Version", i32 2}
> +!4 = !{i32 2, !"Debug Info Version", i32 3}
> +!5 = !{i32 1, !"PIC Level", i32 2}
> +!6 = !{!"clang version 3.9.0 (trunk 267186)"}
> +!7 = distinct !DISubprogram(name: "h", scope: !1, file: !1, line: 2,
> type: !8, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized:
> false, unit: !0, variables: !2)
> +!8 = !DISubroutineType(types: !2)
> +!9 = !DILocation(line: 2, column: 12, scope: !7)
> +!10 = !DILocation(line: 2, column: 17, scope: !7)
> +!11 = distinct !DISubprogram(name: "g", scope: !1, file: !1, line: 3,
> type: !8, isLocal: false, isDefinition: true, scopeLine: 3, isOptimized:
> false, unit: !0, variables: !2)
> +!12 = !DILocation(line: 3, column: 12, scope: !11)
> +!13 = !DILocation(line: 3, column: 17, scope: !11)
> +!14 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 4,
> type: !8, isLocal: false, isDefinition: true, scopeLine: 4, isOptimized:
> false, unit: !0, variables: !2)
> +!15 = !DILocation(line: 4, column: 12, scope: !14)
> +!16 = !DILocation(line: 4, column: 17, scope: !14)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160425/f61d8638/attachment.html>
More information about the llvm-commits
mailing list