Skip to content

Commit 98cf20f

Browse files
nikicnikic
committed
Revert "[Verifier] Sanity check alloca size against DILocalVariable fragment size"
This reverts commit 183f49c. The lang/cpp/trivial_abi/TestTrivialABI.py lldb test fails on buildbots.
1 parent 1880d8f commit 98cf20f

File tree

10 files changed

+55
-208
lines changed

10 files changed

+55
-208
lines changed

‎llvm/lib/IR/Verifier.cpp‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6284,20 +6284,6 @@ void Verifier::visitDbgIntrinsic(StringRef Kind, DbgVariableIntrinsic &DII) {
62846284
CheckDI(isType(Var->getRawType()), "invalid type ref", Var,
62856285
Var->getRawType());
62866286
verifyFnArgs(DII);
6287-
6288-
if (auto *Declare = dyn_cast<DbgDeclareInst>(&DII)) {
6289-
if (auto *Alloca = dyn_cast_or_null<AllocaInst>(Declare->getAddress())) {
6290-
DIExpression *Expr = Declare->getExpression();
6291-
std::optional<uint64_t> FragSize = Declare->getFragmentSizeInBits();
6292-
std::optional<TypeSize> AllocSize = Alloca->getAllocationSizeInBits(DL);
6293-
if (FragSize && AllocSize && !AllocSize->isScalable() &&
6294-
!Expr->isComplex()) {
6295-
CheckDI(*FragSize <= AllocSize->getFixedValue(),
6296-
"llvm.dbg.declare has larger fragment size than alloca size ",
6297-
&DII);
6298-
}
6299-
}
6300-
}
63016287
}
63026288

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

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

Lines changed: 10 additions & 10 deletions
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: 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)
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)
242242
!8 = !{!9, !12}
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)
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)
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: 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)
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)
249249
!15 = !{!16, !17}
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)
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)
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‎

Lines changed: 3 additions & 3 deletions
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 [511 x i8], align 1
6-
call void @llvm.lifetime.start.p0(i64 511, ptr nonnull %1) #4, !dbg !15
5+
%1 = alloca [504 x i8], align 1
6+
call void @llvm.lifetime.start.p0(i64 504, 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 511, ptr nonnull %1) #4, !dbg !19
9+
call void @llvm.lifetime.end.p0(i64 504, ptr nonnull %1) #4, !dbg !19
1010
ret void, !dbg !19
1111
}
1212

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

Lines changed: 0 additions & 76 deletions
This file was deleted.

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

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,36 @@
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+
39
; check more complex cases
410
; 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
511

612
; check output without debug info
713
; 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
814

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

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

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+
1434
; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
1535
declare void @llvm.dbg.declare(metadata, metadata, metadata) #0
1636

@@ -188,7 +208,7 @@ entry:
188208
}
189209

190210
; uselistorder directives
191-
uselistorder ptr @llvm.dbg.declare, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 16 }
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 }
192212

193213
attributes #0 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
194214
attributes #1 = { "frame-pointer"="all" }
@@ -202,19 +222,19 @@ attributes #2 = { ssp "stack-protector-buffer-size"="5" "frame-pointer"="all" }
202222
!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !4, splitDebugInlining: false, nameTableKind: None)
203223
!3 = !DIFile(filename: "dot.c", directory: "")
204224
!4 = !{!5, !6, !10, !13}
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)
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)
208228
!8 = !{!9, !12}
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)
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)
211231
!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
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)
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)
215235
!15 = !{!16, !17}
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)
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)
218238
!18 = !{i32 7, !"Dwarf Version", i32 5}
219239
!19 = !{i32 2, !"Debug Info Version", i32 3}
220240
!20 = !{i32 1, !"wchar_size", i32 4}

‎llvm/test/DebugInfo/X86/fi-piece.ll‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
; CHECK: DW_TAG_subprogram
66
; CHECK: DW_AT_abstract_origin
77
; CHECK: DW_TAG_variable
8-
; CHECK-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_fbreg -8, DW_OP_piece 0x2, DW_OP_fbreg -12, DW_OP_piece 0x2)
8+
; CHECK-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_fbreg -4, DW_OP_piece 0x2, DW_OP_fbreg -8, DW_OP_piece 0x2)
99
; CHECK-NEXT: DW_AT_abstract_origin {{.*}}"a"
1010
; Inlined variable, not to be merged.
1111
; CHECK-NOT: DW_TAG
@@ -25,11 +25,10 @@ define void @f() #0 !dbg !8 {
2525
entry:
2626
%a = alloca i16, align 4
2727
%b = alloca i16, align 4
28-
%c = alloca { i16, i16 }, align 4
2928
call void @llvm.dbg.declare(metadata ptr %a, metadata !11, metadata !DIExpression(DW_OP_LLVM_fragment, 0, 16)), !dbg !14
3029
store i16 1, ptr %a, align 4, !dbg !14
3130
call void @llvm.dbg.declare(metadata ptr %b, metadata !11, metadata !DIExpression(DW_OP_LLVM_fragment, 16, 16)), !dbg !16
32-
call void @llvm.dbg.declare(metadata ptr %c, metadata !11, metadata !13), !dbg !17
31+
call void @llvm.dbg.declare(metadata ptr %a, metadata !11, metadata !13), !dbg !17
3332
store i16 2, ptr %b, align 4, !dbg !17
3433
ret void
3534
}

‎llvm/test/DebugInfo/invalid-sizes.ll‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)