Index: llvm/lib/IR/Verifier.cpp =================================================================== --- llvm/lib/IR/Verifier.cpp +++ llvm/lib/IR/Verifier.cpp @@ -6279,6 +6279,21 @@ CheckDI(isType(Var->getRawType()), "invalid type ref", Var, Var->getRawType()); verifyFnArgs(DII); + + if (auto *Declare = dyn_cast(&DII)) { + if (auto *Alloca = dyn_cast_or_null(Declare->getAddress())) { + DIExpression *Expr = Declare->getExpression(); + std::optional FragSize = Declare->getFragmentSizeInBits(); + std::optional AllocSize = Alloca->getAllocationSizeInBits(DL); + if (FragSize && AllocSize && !AllocSize->isScalable() && + (Expr->getNumElements() == 0 || + Expr->expr_op_begin()->getOp() == dwarf::DW_OP_LLVM_fragment)) { + CheckDI(*FragSize <= AllocSize->getFixedValue(), + "llvm.dbg.declare has larger fragment size than alloca size ", + &DII); + } + } + } } void Verifier::visitDbgLabelIntrinsic(StringRef Kind, DbgLabelInst &DLI) { Index: llvm/test/CodeGen/ARM/stack-frame-layout-remarks.ll =================================================================== --- llvm/test/CodeGen/ARM/stack-frame-layout-remarks.ll +++ llvm/test/CodeGen/ARM/stack-frame-layout-remarks.ll @@ -236,19 +236,19 @@ !2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !4, splitDebugInlining: false, nameTableKind: None) !3 = !DIFile(filename: "dot.c", directory: "") !4 = !{!5, !6, !10, !13} -!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64) -!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64) -!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Array", file: !3, line: 3, size: 128, elements: !8) +!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 32) +!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 32) +!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Array", file: !3, line: 3, size: 64, elements: !8) !8 = !{!9, !12} -!9 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !7, file: !3, line: 4, baseType: !10, size: 64) -!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64) +!9 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !7, file: !3, line: 4, baseType: !10, size: 32) +!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 32) !11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) -!12 = !DIDerivedType(tag: DW_TAG_member, name: "size", scope: !7, file: !3, line: 5, baseType: !11, size: 32, offset: 64) -!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64) -!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Result", file: !3, line: 8, size: 128, elements: !15) +!12 = !DIDerivedType(tag: DW_TAG_member, name: "size", scope: !7, file: !3, line: 5, baseType: !11, size: 32, offset: 32) +!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 32) +!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Result", file: !3, line: 8, size: 64, elements: !15) !15 = !{!16, !17} -!16 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !14, file: !3, line: 9, baseType: !6, size: 64) -!17 = !DIDerivedType(tag: DW_TAG_member, name: "sum", scope: !14, file: !3, line: 10, baseType: !11, size: 32, offset: 64) +!16 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !14, file: !3, line: 9, baseType: !6, size: 32) +!17 = !DIDerivedType(tag: DW_TAG_member, name: "sum", scope: !14, file: !3, line: 10, baseType: !11, size: 32, offset: 32) !18 = !{i32 7, !"Dwarf Version", i32 5} !19 = !{i32 2, !"Debug Info Version", i32 3} !20 = !{i32 1, !"wchar_size", i32 4} Index: llvm/test/CodeGen/BPF/warn-stack.ll =================================================================== --- llvm/test/CodeGen/BPF/warn-stack.ll +++ llvm/test/CodeGen/BPF/warn-stack.ll @@ -2,11 +2,11 @@ ;; CHECK-NOT: nowarn define void @nowarn() local_unnamed_addr #0 !dbg !6 { - %1 = alloca [504 x i8], align 1 - call void @llvm.lifetime.start.p0(i64 504, ptr nonnull %1) #4, !dbg !15 + %1 = alloca [511 x i8], align 1 + call void @llvm.lifetime.start.p0(i64 511, ptr nonnull %1) #4, !dbg !15 tail call void @llvm.dbg.declare(metadata ptr %1, metadata !10, metadata !16), !dbg !17 call void @doit(ptr nonnull %1) #4, !dbg !18 - call void @llvm.lifetime.end.p0(i64 504, ptr nonnull %1) #4, !dbg !19 + call void @llvm.lifetime.end.p0(i64 511, ptr nonnull %1) #4, !dbg !19 ret void, !dbg !19 } Index: llvm/test/DebugInfo/invalid-sizes.ll =================================================================== --- /dev/null +++ llvm/test/DebugInfo/invalid-sizes.ll @@ -0,0 +1,80 @@ +; RUN: llvm-as -disable-output < %s 2>&1 | FileCheck %s + +; CHECK: llvm.dbg.declare has larger fragment size than alloca size +; CHECK-NEXT: call void @llvm.dbg.declare(metadata ptr %slice.dbg.spill, metadata !23, metadata !DIExpression()) +; CHECK: llvm.dbg.declare has larger fragment size than alloca size +; CHECK-NEXT: call void @llvm.dbg.declare(metadata ptr %slice.dbg.spill1, metadata !23, metadata !DIExpression()) + +%"EndianSlice<'_>" = type { { ptr, i64 }, i32, [1 x i32] } + +; example::test +; Function Attrs: nonlazybind uwtable +define void @_ZN7example4test17h64a501af0fe536ddE(ptr align 1 %s.0, i64 %s.1) unnamed_addr #0 !dbg !7 { +start: + %slice.dbg.spill1 = alloca i32, align 4 + %slice.dbg.spill = alloca { ptr, i64 }, align 8 + %s.dbg.spill = alloca { ptr, i64 }, align 8 + %_2 = alloca %"EndianSlice<'_>", align 8 + %0 = getelementptr inbounds { ptr, i64 }, ptr %s.dbg.spill, i32 0, i32 0 + store ptr %s.0, ptr %0, align 8 + %1 = getelementptr inbounds { ptr, i64 }, ptr %s.dbg.spill, i32 0, i32 1 + store i64 %s.1, ptr %1, align 8 + call void @llvm.dbg.declare(metadata ptr %s.dbg.spill, metadata !22, metadata !DIExpression()), !dbg !33 + %2 = getelementptr inbounds { ptr, i64 }, ptr %slice.dbg.spill, i32 0, i32 0, !dbg !34 + store ptr %s.0, ptr %2, align 8, !dbg !34 + %3 = getelementptr inbounds { ptr, i64 }, ptr %slice.dbg.spill, i32 0, i32 1, !dbg !34 + store i64 %s.1, ptr %3, align 8, !dbg !34 + call void @llvm.dbg.declare(metadata ptr %slice.dbg.spill, metadata !23, metadata !DIExpression()), !dbg !35 + store i32 1, ptr %slice.dbg.spill1, align 4, !dbg !34 + call void @llvm.dbg.declare(metadata ptr %slice.dbg.spill1, metadata !23, metadata !DIExpression()), !dbg !35 + ret void, !dbg !36 +} + +; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none) +declare void @llvm.dbg.declare(metadata, metadata, metadata) #1 + +attributes #0 = { nonlazybind uwtable "probe-stack"="inline-asm" "target-cpu"="x86-64" } +attributes #1 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) } + +!llvm.module.flags = !{!0, !1, !2, !3} +!llvm.ident = !{!4} +!llvm.dbg.cu = !{!5} + +!0 = !{i32 8, !"PIC Level", i32 2} +!1 = !{i32 2, !"RtLibUseGOT", i32 1} +!2 = !{i32 2, !"Dwarf Version", i32 4} +!3 = !{i32 2, !"Debug Info Version", i32 3} +!4 = !{!"rustc version 1.74.0-nightly (5c6a7e71c 2023-08-20)"} +!5 = distinct !DICompileUnit(language: DW_LANG_Rust, file: !6, producer: "clang LLVM (rustc version 1.74.0-nightly (5c6a7e71c 2023-08-20))", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false) +!6 = !DIFile(filename: "/app/example.rs/@/example.a6c375ed18e8f6d3-cgu.0", directory: "/app") +!7 = distinct !DISubprogram(name: "test", linkageName: "_ZN7example4test17h64a501af0fe536ddE", scope: !9, file: !8, line: 9, type: !10, scopeLine: 9, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !5, templateParams: !20, retainedNodes: !21) +!8 = !DIFile(filename: "example.rs", directory: "/app", checksumkind: CSK_MD5, checksum: "bd53c9e80c244adbeae5aa0d57de599d") +!9 = !DINamespace(name: "example", scope: null) +!10 = !DISubroutineType(types: !11) +!11 = !{null, !12} +!12 = !DICompositeType(tag: DW_TAG_structure_type, name: "&[u8]", file: !13, size: 128, align: 64, elements: !14, templateParams: !20, identifier: "4f7d759e2003ffb713a77bd933fd0146") +!13 = !DIFile(filename: "", directory: "") +!14 = !{!15, !18} +!15 = !DIDerivedType(tag: DW_TAG_member, name: "data_ptr", scope: !12, file: !13, baseType: !16, size: 64, align: 64) +!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !17, size: 64, align: 64, dwarfAddressSpace: 0) +!17 = !DIBasicType(name: "u8", size: 8, encoding: DW_ATE_unsigned) +!18 = !DIDerivedType(tag: DW_TAG_member, name: "length", scope: !12, file: !13, baseType: !19, size: 64, align: 64, offset: 64) +!19 = !DIBasicType(name: "usize", size: 64, encoding: DW_ATE_unsigned) +!20 = !{} +!21 = !{!22, !23} +!22 = !DILocalVariable(name: "s", arg: 1, scope: !7, file: !8, line: 9, type: !12) +!23 = !DILocalVariable(name: "slice", scope: !24, file: !8, line: 10, type: !25, align: 8) +!24 = distinct !DILexicalBlock(scope: !7, file: !8, line: 10, column: 5) +!25 = !DICompositeType(tag: DW_TAG_structure_type, name: "EndianSlice", scope: !9, file: !13, size: 192, align: 64, elements: !26, templateParams: !20, identifier: "f1b6e593370159e9df4228aa26ace4b5") +!26 = !{!27, !28} +!27 = !DIDerivedType(tag: DW_TAG_member, name: "slice", scope: !25, file: !13, baseType: !12, size: 128, align: 64) +!28 = !DIDerivedType(tag: DW_TAG_member, name: "endian", scope: !25, file: !13, baseType: !29, size: 32, align: 32, offset: 128) +!29 = !DICompositeType(tag: DW_TAG_structure_type, name: "Endian", scope: !9, file: !13, size: 32, align: 32, elements: !30, templateParams: !20, identifier: "a76092aada82685a5b963f3da7ae1bd9") +!30 = !{!31} +!31 = !DIDerivedType(tag: DW_TAG_member, name: "__0", scope: !29, file: !13, baseType: !32, size: 32, align: 32) +!32 = !DIBasicType(name: "i32", size: 32, encoding: DW_ATE_signed) +!33 = !DILocation(line: 9, column: 13, scope: !7) +!34 = !DILocation(line: 10, column: 17, scope: !7) +!35 = !DILocation(line: 10, column: 9, scope: !24) +!36 = !DILocation(line: 11, column: 2, scope: !37) +!37 = !DILexicalBlockFile(scope: !7, file: !8, discriminator: 0) Index: llvm/test/Transforms/InstCombine/dbg-scalable-store-fixed-frag.ll =================================================================== --- llvm/test/Transforms/InstCombine/dbg-scalable-store-fixed-frag.ll +++ llvm/test/Transforms/InstCombine/dbg-scalable-store-fixed-frag.ll @@ -4,14 +4,14 @@ define i32 @foo( %x) { ; CHECK-LABEL: @foo( ; CHECK-NEXT: entry: -; CHECK-NEXT: [[ARR:%.*]] = alloca i32, align 8 -; CHECK-NEXT: call void @llvm.dbg.value(metadata undef, metadata [[META8:![0-9]+]], metadata !DIExpression()), !dbg [[DBG14:![0-9]+]] +; CHECK-NEXT: [[ARR:%.*]] = alloca [4 x i32], align 8 +; CHECK-NEXT: call void @llvm.dbg.declare(metadata ptr [[ARR]], metadata [[META8:![0-9]+]], metadata !DIExpression()), !dbg [[DBG14:![0-9]+]] ; CHECK-NEXT: store [[X:%.*]], ptr [[ARR]], align 8 ; CHECK-NEXT: [[RES:%.*]] = load i32, ptr [[ARR]], align 8 ; CHECK-NEXT: ret i32 [[RES]] ; entry: - %arr = alloca i32, align 4 + %arr = alloca [4 x i32], align 4 call void @llvm.dbg.declare(metadata ptr %arr, metadata !8, metadata !DIExpression()), !dbg !14 store %x, ptr %arr, align 4 %res = load i32, ptr %arr Index: llvm/test/Transforms/InstCombine/dbg-simplify-alloca-size.ll =================================================================== --- llvm/test/Transforms/InstCombine/dbg-simplify-alloca-size.ll +++ llvm/test/Transforms/InstCombine/dbg-simplify-alloca-size.ll @@ -7,13 +7,13 @@ ; CHECK-LABEL: @toplevel( ; CHECK: entry: -; CHECK-NEXT: %pixels1 = alloca [3 x i8], align 1 +; CHECK-NEXT: %pixels1 = alloca [4 x i8], align 1 ; CHECK-NEXT: call void @llvm.dbg.declare(metadata ptr %pixels1, metadata ![[MD:[0-9]+]], metadata !DIExpression()), !dbg ![[DBG:[0-9]+]] ; CHECK-NEXT: call void @foo(ptr nonnull %pixels1) ; CHECK-NEXT: ret void define dso_local void @toplevel() { entry: - %pixels = alloca i8, i32 3 + %pixels = alloca i8, i32 4 call void @llvm.dbg.declare(metadata ptr %pixels, metadata !11, metadata !DIExpression()), !dbg !12 call void @foo(ptr %pixels) ret void Index: llvm/test/Transforms/Util/dbg-user-of-aext.ll =================================================================== --- llvm/test/Transforms/Util/dbg-user-of-aext.ll +++ llvm/test/Transforms/Util/dbg-user-of-aext.ll @@ -3,6 +3,8 @@ ; opposed to the operand of a [s|z]ext). ; RUN: opt -S -passes='sroa' %s | FileCheck %s +target datalayout = "i64:64" + ; Built from: ; struct foo { bool b; long i; }; ; void f(bool b, bool expr, foo g) { @@ -12,15 +14,15 @@ ; Expect two fragments: ; * first starting at bit 0, 8 bits (for the bool) -; * second starting at bit 32, 32 bits (for the long) -; (this happens to create/demonstrate a gap from bits [7, 32)) +; * second starting at bit 64, 64 bits (for the long) +; (this happens to create/demonstrate a gap from bits [7, 64)) ; But also check that a complex expression is not used for a lone bool ; parameter. It can reference the register it's in directly without masking off ; high bits or anything ; CHECK: call void @llvm.dbg.value(metadata i8 %g.coerce0, metadata ![[VAR_STRUCT:[0-9]+]], metadata !DIExpression(DW_OP_LLVM_fragment, 0, 8)) -; CHECK: call void @llvm.dbg.value(metadata i64 %g.coerce1, metadata ![[VAR_STRUCT]], metadata !DIExpression(DW_OP_LLVM_fragment, 32, 64)) +; CHECK: call void @llvm.dbg.value(metadata i64 %g.coerce1, metadata ![[VAR_STRUCT]], metadata !DIExpression(DW_OP_LLVM_fragment, 64, 64)) ; CHECK: call void @llvm.dbg.value(metadata i8 %frombool, metadata ![[VAR_BOOL:[0-9]+]], metadata !DIExpression()) ; CHECK: call void @llvm.dbg.value(metadata i8 %frombool1, metadata ![[VAR_FRAG:[0-9]+]], metadata !DIExpression(DW_OP_LLVM_fragment, 0, 4))