diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp --- a/llvm/lib/IR/DebugInfo.cpp +++ b/llvm/lib/IR/DebugInfo.cpp @@ -1919,7 +1919,9 @@ /// Return std::nullopt if any properties are not constants. static std::optional getAssignmentInfoImpl(const DataLayout &DL, const Value *StoreDest, - uint64_t SizeInBits) { + TypeSize SizeInBits) { + if (SizeInBits.isScalable()) + return std::nullopt; APInt GEPOffset(DL.getIndexTypeSizeInBits(StoreDest->getType()), 0); const Value *Base = StoreDest->stripAndAccumulateConstantOffsets( DL, GEPOffset, /*AllowNonInbounds*/ true); @@ -1941,19 +1943,18 @@ // We can't use a non-const size, bail. return std::nullopt; uint64_t SizeInBits = 8 * ConstLengthInBytes->getZExtValue(); - return getAssignmentInfoImpl(DL, StoreDest, SizeInBits); + return getAssignmentInfoImpl(DL, StoreDest, TypeSize::getFixed(SizeInBits)); } std::optional at::getAssignmentInfo(const DataLayout &DL, const StoreInst *SI) { - const Value *StoreDest = SI->getPointerOperand(); - uint64_t SizeInBits = DL.getTypeSizeInBits(SI->getValueOperand()->getType()); - return getAssignmentInfoImpl(DL, StoreDest, SizeInBits); + TypeSize SizeInBits = DL.getTypeSizeInBits(SI->getValueOperand()->getType()); + return getAssignmentInfoImpl(DL, SI->getPointerOperand(), SizeInBits); } std::optional at::getAssignmentInfo(const DataLayout &DL, const AllocaInst *AI) { - uint64_t SizeInBits = DL.getTypeSizeInBits(AI->getAllocatedType()); + TypeSize SizeInBits = DL.getTypeSizeInBits(AI->getAllocatedType()); return getAssignmentInfoImpl(DL, AI, SizeInBits); } diff --git a/llvm/test/DebugInfo/assignment-tracking/AArch64/lit.local.cfg b/llvm/test/DebugInfo/assignment-tracking/AArch64/lit.local.cfg new file mode 100644 --- /dev/null +++ b/llvm/test/DebugInfo/assignment-tracking/AArch64/lit.local.cfg @@ -0,0 +1,2 @@ +if not 'AArch64' in config.root.targets: + config.unsupported = True diff --git a/llvm/test/DebugInfo/assignment-tracking/AArch64/scalable-vectors.ll b/llvm/test/DebugInfo/assignment-tracking/AArch64/scalable-vectors.ll new file mode 100644 --- /dev/null +++ b/llvm/test/DebugInfo/assignment-tracking/AArch64/scalable-vectors.ll @@ -0,0 +1,51 @@ +; RUN: llc %s -stop-after=finalize-isel -o - | FileCheck %s + +;; Hand written. Check AssignmentTrackingAnalysis doesn't try to get the size +;; of scalable vectors (which causes an assertion failure). + +; CHECK: DBG_VALUE %stack.0, $noreg, ![[#]], !DIExpression(DW_OP_deref) +; CHECK: DBG_VALUE i256 0, $noreg, ![[#]], !DIExpression() +;; FIXME: We should reinstate (or poison) the variable at the store. See +;; llvm.org/PR62346. + +target triple = "aarch64" + +define dso_local void @square(ptr %0) local_unnamed_addr #0 !dbg !9 { +entry: + %1 = alloca <32 x i8>, !DIAssignID !18 + call void @llvm.dbg.assign(metadata i1 poison, metadata !19, metadata !DIExpression(), metadata !18, metadata ptr %1, metadata !DIExpression()), !dbg !21 + %2 = load , ptr %0, align 1 + call void @llvm.dbg.assign(metadata i256 0, metadata !19, metadata !DIExpression(), metadata !22, metadata ptr %1, metadata !DIExpression()), !dbg !21 + store %2, ptr %1, align 1 + ret void +} + +declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata) + +attributes #0 = { vscale_range(1,16) "target-cpu"="generic" "target-features"="+sve" } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!2, !3, !7} +!llvm.ident = !{!8} + +!0 = distinct !DICompileUnit(language: DW_LANG_C11, file: !1, producer: "clang version 17.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None) +!1 = !DIFile(filename: "/app/example.c", directory: "/app") +!2 = !{i32 7, !"Dwarf Version", i32 4} +!3 = !{i32 2, !"Debug Info Version", i32 3} +!7 = !{i32 7, !"debug-info-assignment-tracking", i1 true} +!8 = !{!"clang version 17.0.0"} +!9 = distinct !DISubprogram(name: "square", scope: !10, file: !10, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !17) +!10 = !DIFile(filename: "example.c", directory: "/app") +!11 = !DISubroutineType(types: !12) +!12 = !{null, !13, !14, !16} +!13 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !14) +!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64) +!15 = !DIBasicType(name: "unsigned char", size: 8, encoding: DW_ATE_unsigned_char) +!16 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +!17 = !{} +!18 = distinct !DIAssignID() +!19 = !DILocalVariable(name: "i", scope: !9, file: !10, line: 2, type: !20) +!20 = !DIBasicType(name: "cats", size: 256, encoding: DW_ATE_signed) +!21 = !DILocation(line: 0, scope: !9) +!22 = distinct !DIAssignID() +