Skip to content

Commit 47324cf

Browse files
nikicnikic
committed
Reapply [Verifier] Sanity check alloca size against DILocalVariable fragment size
Reapply after fixing a clang bug this exposed in D158972 and adjusting a number of tests that failed for 32-bit targets. ----- Add a check that the DILocalVariable fragment size in dbg.declare does not exceed the size of the alloca. This would have caught the invalid debuginfo regenerated by rustc in #64149. Differential Revision: https://reviews.llvm.org/D158743
1 parent 303eb50 commit 47324cf

20 files changed

+225
-204
lines changed

‎llvm/lib/IR/Verifier.cpp

+14
Original file line numberDiff line numberDiff line change
@@ -6298,6 +6298,20 @@ void Verifier::visitDbgIntrinsic(StringRef Kind, DbgVariableIntrinsic &DII) {
62986298
CheckDI(isType(Var->getRawType()), "invalid type ref", Var,
62996299
Var->getRawType());
63006300
verifyFnArgs(DII);
6301+
6302+
if (auto *Declare = dyn_cast<DbgDeclareInst>(&DII)) {
6303+
if (auto *Alloca = dyn_cast_or_null<AllocaInst>(Declare->getAddress())) {
6304+
DIExpression *Expr = Declare->getExpression();
6305+
std::optional<uint64_t> FragSize = Declare->getFragmentSizeInBits();
6306+
std::optional<TypeSize> AllocSize = Alloca->getAllocationSizeInBits(DL);
6307+
if (FragSize && AllocSize && !AllocSize->isScalable() &&
6308+
!Expr->isComplex()) {
6309+
CheckDI(*FragSize <= AllocSize->getFixedValue(),
6310+
"llvm.dbg.declare has larger fragment size than alloca size ",
6311+
&DII);
6312+
}
6313+
}
6314+
}
63016315
}
63026316

63036317
void Verifier::visitDbgLabelIntrinsic(StringRef Kind, DbgLabelInst &DLI) {

‎llvm/test/CodeGen/ARM/stack-frame-layout-remarks.ll

+10-10
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,19 @@ attributes #2 = { ssp "stack-protector-buffer-size"="5" "frame-pointer"="all" }
236236
!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !4, splitDebugInlining: false, nameTableKind: None)
237237
!3 = !DIFile(filename: "dot.c", directory: "")
238238
!4 = !{!5, !6, !10, !13}
239-
!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
240-
!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
241-
!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Array", file: !3, line: 3, size: 128, elements: !8)
239+
!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 32)
240+
!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 32)
241+
!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Array", file: !3, line: 3, size: 64, elements: !8)
242242
!8 = !{!9, !12}
243-
!9 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !7, file: !3, line: 4, baseType: !10, size: 64)
244-
!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64)
243+
!9 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !7, file: !3, line: 4, baseType: !10, size: 32)
244+
!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 32)
245245
!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
246-
!12 = !DIDerivedType(tag: DW_TAG_member, name: "size", scope: !7, file: !3, line: 5, baseType: !11, size: 32, offset: 64)
247-
!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
248-
!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Result", file: !3, line: 8, size: 128, elements: !15)
246+
!12 = !DIDerivedType(tag: DW_TAG_member, name: "size", scope: !7, file: !3, line: 5, baseType: !11, size: 32, offset: 32)
247+
!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 32)
248+
!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Result", file: !3, line: 8, size: 64, elements: !15)
249249
!15 = !{!16, !17}
250-
!16 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !14, file: !3, line: 9, baseType: !6, size: 64)
251-
!17 = !DIDerivedType(tag: DW_TAG_member, name: "sum", scope: !14, file: !3, line: 10, baseType: !11, size: 32, offset: 64)
250+
!16 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !14, file: !3, line: 9, baseType: !6, size: 32)
251+
!17 = !DIDerivedType(tag: DW_TAG_member, name: "sum", scope: !14, file: !3, line: 10, baseType: !11, size: 32, offset: 32)
252252
!18 = !{i32 7, !"Dwarf Version", i32 5}
253253
!19 = !{i32 2, !"Debug Info Version", i32 3}
254254
!20 = !{i32 1, !"wchar_size", i32 4}

‎llvm/test/CodeGen/BPF/warn-stack.ll

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
;; CHECK-NOT: nowarn
44
define void @nowarn() local_unnamed_addr #0 !dbg !6 {
5-
%1 = alloca [504 x i8], align 1
6-
call void @llvm.lifetime.start.p0(i64 504, ptr nonnull %1) #4, !dbg !15
5+
%1 = alloca [511 x i8], align 1
6+
call void @llvm.lifetime.start.p0(i64 511, ptr nonnull %1) #4, !dbg !15
77
tail call void @llvm.dbg.declare(metadata ptr %1, metadata !10, metadata !16), !dbg !17
88
call void @doit(ptr nonnull %1) #4, !dbg !18
9-
call void @llvm.lifetime.end.p0(i64 504, ptr nonnull %1) #4, !dbg !19
9+
call void @llvm.lifetime.end.p0(i64 511, ptr nonnull %1) #4, !dbg !19
1010
ret void, !dbg !19
1111
}
1212

‎llvm/test/CodeGen/X86/stack-frame-layout-remarks.ll renamed to ‎llvm/test/CodeGen/X86/stack-frame-layout-remarks-32.ll

+12-32
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,16 @@
11
; Test remark output for stack-frame-layout
22

3-
; ensure basic output works
4-
; RUN: llc -mcpu=corei7 -O1 -pass-remarks-analysis=stack-frame-layout < %s 2>&1 >/dev/null | FileCheck %s
5-
6-
; check additional slots are displayed when stack is not optimized
7-
; RUN: llc -mcpu=corei7 -O0 -pass-remarks-analysis=stack-frame-layout < %s 2>&1 >/dev/null | FileCheck %s --check-prefix=NO_COLORING
8-
93
; check more complex cases
104
; RUN: llc %s -pass-remarks-analysis=stack-frame-layout -o /dev/null --march=x86 -mcpu=i386 2>&1 | FileCheck %s --check-prefix=BOTH --check-prefix=DEBUG
115

126
; check output without debug info
137
; RUN: opt %s -passes=strip -S | llc -pass-remarks-analysis=stack-frame-layout -o /dev/null --march=x86 -mcpu=i386 2>&1 | FileCheck %s --check-prefix=BOTH --check-prefix=STRIPPED
148

15-
target triple = "x86_64-unknown-linux-gnu"
9+
target triple = "i386-unknown-linux-gnu"
1610

1711
@.str = private unnamed_addr constant [4 x i8] c"%s\0A\00", align 1
1812
declare i32 @printf(ptr, ...)
1913

20-
; CHECK: Function: stackSizeWarning
21-
; CHECK: Offset: [SP-88], Type: Variable, Align: 16, Size: 80
22-
; CHECK: buffer @ frame-diags.c:30
23-
; NO_COLORING: Offset: [SP-168], Type: Variable, Align: 16, Size: 80
24-
; CHECK: buffer2 @ frame-diags.c:33
25-
define void @stackSizeWarning() {
26-
entry:
27-
%buffer = alloca [80 x i8], align 16
28-
%buffer2 = alloca [80 x i8], align 16
29-
call void @llvm.dbg.declare(metadata ptr %buffer, metadata !25, metadata !DIExpression()), !dbg !39
30-
call void @llvm.dbg.declare(metadata ptr %buffer2, metadata !31, metadata !DIExpression()), !dbg !40
31-
ret void
32-
}
33-
3414
; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
3515
declare void @llvm.dbg.declare(metadata, metadata, metadata) #0
3616

@@ -208,7 +188,7 @@ entry:
208188
}
209189

210190
; uselistorder directives
211-
uselistorder ptr @llvm.dbg.declare, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 19, 18 }
191+
uselistorder ptr @llvm.dbg.declare, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 16 }
212192

213193
attributes #0 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
214194
attributes #1 = { "frame-pointer"="all" }
@@ -222,19 +202,19 @@ attributes #2 = { ssp "stack-protector-buffer-size"="5" "frame-pointer"="all" }
222202
!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !4, splitDebugInlining: false, nameTableKind: None)
223203
!3 = !DIFile(filename: "dot.c", directory: "")
224204
!4 = !{!5, !6, !10, !13}
225-
!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
226-
!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
227-
!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Array", file: !3, line: 3, size: 128, elements: !8)
205+
!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 32)
206+
!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 32)
207+
!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Array", file: !3, line: 3, size: 64, elements: !8)
228208
!8 = !{!9, !12}
229-
!9 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !7, file: !3, line: 4, baseType: !10, size: 64)
230-
!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64)
209+
!9 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !7, file: !3, line: 4, baseType: !10, size: 32)
210+
!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 32)
231211
!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
232-
!12 = !DIDerivedType(tag: DW_TAG_member, name: "size", scope: !7, file: !3, line: 5, baseType: !11, size: 32, offset: 64)
233-
!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
234-
!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Result", file: !3, line: 8, size: 128, elements: !15)
212+
!12 = !DIDerivedType(tag: DW_TAG_member, name: "size", scope: !7, file: !3, line: 5, baseType: !11, size: 32, offset: 32)
213+
!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 32)
214+
!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Result", file: !3, line: 8, size: 64, elements: !15)
235215
!15 = !{!16, !17}
236-
!16 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !14, file: !3, line: 9, baseType: !6, size: 64)
237-
!17 = !DIDerivedType(tag: DW_TAG_member, name: "sum", scope: !14, file: !3, line: 10, baseType: !11, size: 32, offset: 64)
216+
!16 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !14, file: !3, line: 9, baseType: !6, size: 32)
217+
!17 = !DIDerivedType(tag: DW_TAG_member, name: "sum", scope: !14, file: !3, line: 10, baseType: !11, size: 32, offset: 32)
238218
!18 = !{i32 7, !"Dwarf Version", i32 5}
239219
!19 = !{i32 2, !"Debug Info Version", i32 3}
240220
!20 = !{i32 1, !"wchar_size", i32 4}

‎llvm/test/CodeGen/X86/stack-frame-layout-remarks-64.ll

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
; Test remark output for stack-frame-layout
2+
3+
; ensure basic output works
4+
; RUN: llc -mcpu=corei7 -O1 -pass-remarks-analysis=stack-frame-layout < %s 2>&1 >/dev/null | FileCheck %s
5+
6+
; check additional slots are displayed when stack is not optimized
7+
; RUN: llc -mcpu=corei7 -O0 -pass-remarks-analysis=stack-frame-layout < %s 2>&1 >/dev/null | FileCheck %s --check-prefix=NO_COLORING
8+
9+
target triple = "x86_64-unknown-linux-gnu"
10+
11+
@.str = private unnamed_addr constant [4 x i8] c"%s\0A\00", align 1
12+
declare i32 @printf(ptr, ...)
13+
14+
; CHECK: Function: stackSizeWarning
15+
; CHECK: Offset: [SP-88], Type: Variable, Align: 16, Size: 80
16+
; CHECK: buffer @ frame-diags.c:30
17+
; NO_COLORING: Offset: [SP-168], Type: Variable, Align: 16, Size: 80
18+
; CHECK: buffer2 @ frame-diags.c:33
19+
define void @stackSizeWarning() {
20+
entry:
21+
%buffer = alloca [80 x i8], align 16
22+
%buffer2 = alloca [80 x i8], align 16
23+
call void @llvm.dbg.declare(metadata ptr %buffer, metadata !25, metadata !DIExpression()), !dbg !39
24+
call void @llvm.dbg.declare(metadata ptr %buffer2, metadata !31, metadata !DIExpression()), !dbg !40
25+
ret void
26+
}
27+
28+
; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
29+
declare void @llvm.dbg.declare(metadata, metadata, metadata) #0
30+
31+
attributes #0 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
32+
33+
!llvm.dbg.cu = !{!0, !2}
34+
!llvm.module.flags = !{!18, !19, !20, !21, !22, !23, !24}
35+
36+
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
37+
!1 = !DIFile(filename: "frame-diags.c", directory: "")
38+
!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !4, splitDebugInlining: false, nameTableKind: None)
39+
!3 = !DIFile(filename: "dot.c", directory: "")
40+
!4 = !{!5, !6, !10, !13}
41+
!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
42+
!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
43+
!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Array", file: !3, line: 3, size: 128, elements: !8)
44+
!8 = !{!9, !12}
45+
!9 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !7, file: !3, line: 4, baseType: !10, size: 64)
46+
!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64)
47+
!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
48+
!12 = !DIDerivedType(tag: DW_TAG_member, name: "size", scope: !7, file: !3, line: 5, baseType: !11, size: 32, offset: 64)
49+
!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
50+
!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Result", file: !3, line: 8, size: 128, elements: !15)
51+
!15 = !{!16, !17}
52+
!16 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !14, file: !3, line: 9, baseType: !6, size: 64)
53+
!17 = !DIDerivedType(tag: DW_TAG_member, name: "sum", scope: !14, file: !3, line: 10, baseType: !11, size: 32, offset: 64)
54+
!18 = !{i32 7, !"Dwarf Version", i32 5}
55+
!19 = !{i32 2, !"Debug Info Version", i32 3}
56+
!20 = !{i32 1, !"wchar_size", i32 4}
57+
!21 = !{i32 8, !"PIC Level", i32 2}
58+
!22 = !{i32 7, !"PIE Level", i32 2}
59+
!23 = !{i32 7, !"uwtable", i32 2}
60+
!24 = !{i32 7, !"frame-pointer", i32 2}
61+
!25 = !DILocalVariable(name: "buffer", scope: !26, file: !1, line: 30, type: !32)
62+
!26 = distinct !DILexicalBlock(scope: !27, file: !1, line: 29, column: 3)
63+
!27 = distinct !DISubprogram(name: "stackSizeWarning", scope: !1, file: !1, line: 28, type: !28, scopeLine: 28, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !30)
64+
!28 = !DISubroutineType(types: !29)
65+
!29 = !{null}
66+
!30 = !{!25, !31, !36, !37}
67+
!31 = !DILocalVariable(name: "buffer2", scope: !27, file: !1, line: 33, type: !32)
68+
!32 = !DICompositeType(tag: DW_TAG_array_type, baseType: !33, size: 640, elements: !34)
69+
!33 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
70+
!34 = !{!35}
71+
!35 = !DISubrange(count: 80)
72+
!36 = !DILocalVariable(name: "a", scope: !27, file: !1, line: 34, type: !11)
73+
!37 = !DILocalVariable(name: "b", scope: !27, file: !1, line: 35, type: !38)
74+
!38 = !DIBasicType(name: "long", size: 64, encoding: DW_ATE_signed)
75+
!39 = !DILocation(line: 30, column: 10, scope: !26)
76+
!40 = !DILocation(line: 33, column: 8, scope: !27)

‎llvm/test/DebugInfo/Generic/discriminated-union.ll

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
; CHECK: DW_AT_alignment
2626
; CHECK: DW_AT_data_member_location [DW_FORM_data1] (0x00)
2727

28-
%F = type { [0 x i8], ptr, [8 x i8] }
28+
%F = type { [0 x i8], i64, [8 x i8] }
2929
%"F::Nope" = type {}
3030

3131
define internal void @_ZN2e34main17h934ff72f9a38d4bbE() unnamed_addr #0 !dbg !5 {
3232
start:
3333
%qq = alloca %F, align 8
3434
call void @llvm.dbg.declare(metadata ptr %qq, metadata !10, metadata !28), !dbg !29
35-
store ptr null, ptr %qq, !dbg !29
35+
store i64 0, ptr %qq, !dbg !29
3636
ret void, !dbg !30
3737
}
3838

0 commit comments

Comments
 (0)