Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit a39b1ce

Browse files
committed
Verifier: Disallow a line number without a file in DISubprogram
A line number doesn't make much sense if you don't say where it's from. Add a verifier check for this and update some tests that had bogus debug info. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295516 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent e581944 commit a39b1ce

File tree

9 files changed

+26
-10
lines changed

9 files changed

+26
-10
lines changed

lib/IR/Verifier.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,8 @@ void Verifier::visitDISubprogram(const DISubprogram &N) {
10251025
AssertDI(isScope(N.getRawScope()), "invalid scope", &N, N.getRawScope());
10261026
if (auto *F = N.getRawFile())
10271027
AssertDI(isa<DIFile>(F), "invalid file", &N, F);
1028+
else
1029+
AssertDI(N.getLine() == 0, "line specified with no file", &N, N.getLine());
10281030
if (auto *T = N.getRawType())
10291031
AssertDI(isa<DISubroutineType>(T), "invalid subroutine type", &N, T);
10301032
AssertDI(isType(N.getRawContainingType()), "invalid containing type", &N,

test/CodeGen/AMDGPU/vi-removed-intrinsics.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; RUN: not llc -march=amdgcn -mcpu=tonga < %s 2>&1 | FileCheck -check-prefix=ERROR %s
22

3-
; ERROR: error: :1:42: in function rsq_legacy_f32 void (float addrspace(1)*, float): intrinsic not supported on subtarget
3+
; ERROR: error: foo.cl:1:42: in function rsq_legacy_f32 void (float addrspace(1)*, float): intrinsic not supported on subtarget
44

55
declare float @llvm.amdgcn.rsq.legacy(float) #0
66

@@ -21,4 +21,4 @@ attributes #1 = { nounwind }
2121
!2 = !{i32 2, !"Dwarf Version", i32 4}
2222
!3 = !{i32 2, !"Debug Info Version", i32 3}
2323
!4 = !DILocation(line: 1, column: 42, scope: !5)
24-
!5 = distinct !DISubprogram(name: "rsq_legacy_f32", scope: null, line: 1, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: false, unit: !0)
24+
!5 = distinct !DISubprogram(name: "rsq_legacy_f32", scope: null, file: !1, line: 1, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: false, unit: !0)

test/DebugInfo/Generic/2010-01-05-DbgScope.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ entry:
1313

1414
!0 = !DILocation(line: 571, column: 3, scope: !1)
1515
!1 = distinct !DILexicalBlock(line: 1, column: 1, file: !11, scope: !2)
16-
!2 = distinct !DISubprogram(name: "foo", linkageName: "foo", line: 561, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !3, scope: !3, type: !4)
16+
!2 = distinct !DISubprogram(name: "foo", linkageName: "foo", file: !11, line: 561, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !3, scope: !3, type: !4)
1717
!3 = distinct !DICompileUnit(language: DW_LANG_C99, producer: "clang 1.1", isOptimized: true, emissionKind: FullDebug, file: !11, enums: !12, retainedTypes: !12)
1818
!4 = !DISubroutineType(types: !5)
1919
!5 = !{!6}

test/Linker/2011-08-18-unique-class-type2.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
2121
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.0 (trunk 137954)", isOptimized: true, emissionKind: FullDebug, file: !16, enums: !2, retainedTypes: !2, globals: !2)
2222
!1 = !{!2}
2323
!2 = !{}
24-
!5 = distinct !DISubprogram(name: "bar", linkageName: "_Z3barN2N11AE", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scope: !6, type: !7)
24+
!5 = distinct !DISubprogram(name: "bar", linkageName: "_Z3barN2N11AE", file: !16, line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scope: !6, type: !7)
2525
!6 = !DIFile(filename: "n2.c", directory: "/private/tmp")
2626
!7 = !DISubroutineType(types: !8)
2727
!8 = !{null}

test/ThinLTO/X86/crash_debuginfo.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,5 @@ declare void @bar(i32)
4141
!14 = !DILocalVariable(name: "caster", scope: !9, file: !1, line: 728, type: !15)
4242
!15 = distinct !DICompositeType(tag: DW_TAG_union_type, scope: !9, file: !1, line: 728, size: 64, align: 64, elements: !6, identifier: "someclass")
4343
!16 = distinct !DILocation(line: 87, column: 9, scope: !17)
44-
!17 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: !10, line: 73, type: !11, isLocal: false, isDefinition: true, scopeLine: 74, flags: DIFlagPrototyped, isOptimized: true, unit: !0, declaration: !18, variables: !6)
44+
!17 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: !10, file: !1, line: 73, type: !11, isLocal: false, isDefinition: true, scopeLine: 74, flags: DIFlagPrototyped, isOptimized: true, unit: !0, declaration: !18, variables: !6)
4545
!18 = !DISubprogram(name: "foo", linkageName: "foo", scope: !10, file: !1, line: 83, type: !11, isLocal: false, isDefinition: false, scopeLine: 83, flags: DIFlagPrototyped, isOptimized: true)
46-

test/Transforms/ArgumentPromotion/dbg.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ define void @caller(i32** %Y) {
2424

2525
!0 = !{i32 2, !"Debug Info Version", i32 3}
2626
!1 = !DILocation(line: 8, scope: !2)
27-
!2 = distinct !DISubprogram(name: "test", line: 3, isLocal: true, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !3, scopeLine: 3, scope: null)
27+
!2 = distinct !DISubprogram(name: "test", file: !5, line: 3, isLocal: true, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !3, scopeLine: 3, scope: null)
2828
!3 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.5.0 ", isOptimized: false, emissionKind: LineTablesOnly, file: !5)
2929
!5 = !DIFile(filename: "test.c", directory: "")

test/Transforms/GlobalOpt/2009-03-05-dbg.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ attributes #1 = { nounwind readnone }
7777
!6 = !{i32 2, !"Dwarf Version", i32 2}
7878
!7 = !{i32 2, !"Debug Info Version", i32 3}
7979
!8 = !DILocalVariable(name: "i", arg: 1, scope: !9, file: !3, line: 4, type: !5)
80-
!9 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: !2, line: 4, type: !10, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !2)!10 = !DISubroutineType(types: !11)!11 = !{!5, !5}!12 = !DIExpression()!13 = !DILocation(line: 5, scope: !14)!14 = distinct !DILexicalBlock(scope: !9, file: !3)!15 = !DILocation(line: 6, scope: !14)!16 = !DILocation(line: 7, scope: !14)!17 = !DILocation(line: 9, scope: !14)!18 = !DILocation(line: 11, scope: !14)!19 = !DILocation(line: 14, scope: !20)!20 = distinct !DILexicalBlock(scope: !21, file: !3)!21 = distinct !DISubprogram(name: "bar", linkageName: "bar", scope: !2, line: 13, type: !22, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !2)!22 = !DISubroutineType(types: !23)!23 = !{!5}!24 = !DILocation(line: 15, scope: !20)!25 = !DILocation(line: 16, scope: !20)
80+
!9 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: !2, file: !3, line: 4, type: !10, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !2)!10 = !DISubroutineType(types: !11)!11 = !{!5, !5}!12 = !DIExpression()!13 = !DILocation(line: 5, scope: !14)!14 = distinct !DILexicalBlock(scope: !9, file: !3)!15 = !DILocation(line: 6, scope: !14)!16 = !DILocation(line: 7, scope: !14)!17 = !DILocation(line: 9, scope: !14)!18 = !DILocation(line: 11, scope: !14)!19 = !DILocation(line: 14, scope: !20)!20 = distinct !DILexicalBlock(scope: !21, file: !3)!21 = distinct !DISubprogram(name: "bar", linkageName: "bar", scope: !2, file: !3, line: 13, type: !22, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, unit: !2)!22 = !DISubroutineType(types: !23)!23 = !{!5}!24 = !DILocation(line: 15, scope: !20)!25 = !DILocation(line: 16, scope: !20)

test/Transforms/SampleProfile/early-inline.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ declare i32 @__gxx_personality_v0(...)
4141
!1 = !DIFile(filename: "a", directory: "b/")
4242
!3 = !{i32 2, !"Dwarf Version", i32 4}
4343
!4 = !{i32 2, !"Debug Info Version", i32 3}
44-
!6 = distinct !DISubprogram(linkageName: "_Z3foov", scope: !1, line: 5, scopeLine: 5, unit: !0)
44+
!6 = distinct !DISubprogram(linkageName: "_Z3foov", scope: !1, file: !1, line: 5, scopeLine: 5, unit: !0)
4545
!9 = !DILocation(line: 6, column: 3, scope: !6)
4646
!10 = !DILocation(line: 8, column: 5, scope: !11)
4747
!11 = distinct !DILexicalBlock(scope: !6, file: !1, line: 7, column: 7)
48-
!12 = distinct !DISubprogram(linkageName: "_ZL3barv", scope: !1, line: 20, scopeLine: 20, unit: !0)
48+
!12 = distinct !DISubprogram(linkageName: "_ZL3barv", scope: !1, file: !1, line: 20, scopeLine: 20, unit: !0)
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
; RUN: not llvm-as -disable-output <%s 2>&1 | FileCheck %s
2+
; CHECK: assembly parsed, but does not verify
3+
; CHECK: line specified with no file
4+
5+
define void @foo() !dbg !3 {
6+
ret void
7+
}
8+
9+
!llvm.module.flags = !{!0}
10+
!llvm.dbg.cu = !{!1}
11+
12+
!0 = !{i32 2, !"Debug Info Version", i32 3}
13+
!1 = distinct !DICompileUnit(language: DW_LANG_C, file: !2)
14+
!2 = !DIFile(filename: "foo.c", directory: "")
15+
!3 = distinct !DISubprogram(name: "foo", scope: !1, line: 1, unit: !1)

0 commit comments

Comments
 (0)