[llvm] 0158ca2 - Prevent a crash when a global variable has debug metadata (#145918)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 27 03:43:28 PDT 2025
Author: gbMattN
Date: 2025-06-27T11:43:24+01:00
New Revision: 0158ca21a23b0cef0a9921e6885cd2b95fef2678
URL: https://github.com/llvm/llvm-project/commit/0158ca21a23b0cef0a9921e6885cd2b95fef2678
DIFF: https://github.com/llvm/llvm-project/commit/0158ca21a23b0cef0a9921e6885cd2b95fef2678.diff
LOG: Prevent a crash when a global variable has debug metadata (#145918)
This patch fixes a crash I found when trying to compile some codebases
with -fsanitize=type and -g
Added:
Modified:
llvm/lib/IR/DebugInfo.cpp
llvm/unittests/IR/DebugInfoTest.cpp
Removed:
################################################################################
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index 5c645ffe3f3f7..ecb19fd3c82db 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -50,7 +50,7 @@ TinyPtrVector<DbgDeclareInst *> llvm::findDbgDeclares(Value *V) {
// DenseMap lookup. This check is a bitfield datamember lookup.
if (!V->isUsedByMetadata())
return {};
- auto *L = LocalAsMetadata::getIfExists(V);
+ auto *L = ValueAsMetadata::getIfExists(V);
if (!L)
return {};
auto *MDV = MetadataAsValue::getIfExists(V->getContext(), L);
@@ -69,7 +69,7 @@ TinyPtrVector<DbgVariableRecord *> llvm::findDVRDeclares(Value *V) {
// DenseMap lookup. This check is a bitfield datamember lookup.
if (!V->isUsedByMetadata())
return {};
- auto *L = LocalAsMetadata::getIfExists(V);
+ auto *L = ValueAsMetadata::getIfExists(V);
if (!L)
return {};
@@ -86,7 +86,7 @@ TinyPtrVector<DbgVariableRecord *> llvm::findDVRValues(Value *V) {
// DenseMap lookup. This check is a bitfield datamember lookup.
if (!V->isUsedByMetadata())
return {};
- auto *L = LocalAsMetadata::getIfExists(V);
+ auto *L = ValueAsMetadata::getIfExists(V);
if (!L)
return {};
diff --git a/llvm/unittests/IR/DebugInfoTest.cpp b/llvm/unittests/IR/DebugInfoTest.cpp
index 35bdbf8cc8321..41bf863420304 100644
--- a/llvm/unittests/IR/DebugInfoTest.cpp
+++ b/llvm/unittests/IR/DebugInfoTest.cpp
@@ -195,6 +195,49 @@ TEST(MetadataTest, DeleteInstUsedByDbgRecord) {
EXPECT_TRUE(isa<UndefValue>(DVRs[0]->getValue(0)));
}
+TEST(MetadataTest, GlobalConstantMetadataUsedByDbgRecord) {
+ LLVMContext C;
+ std::unique_ptr<Module> M = parseIR(C, R"(
+ @x = dso_local global i32 0, align 4
+ declare void @llvm.dbg.value(metadata, metadata, metadata) #0
+
+ define i16 @f(i16 %a) !dbg !6 {
+ %b = add i16 %a, 1, !dbg !11
+ call void @llvm.dbg.declare(metadata ptr @x, metadata !9, metadata !DIExpression()), !dbg !11
+ call void @llvm.dbg.value(metadata ptr @x, metadata !9, metadata !DIExpression()), !dbg !11
+ ret i16 0, !dbg !11
+ }
+
+ attributes #0 = { nounwind readnone speculatable willreturn }
+
+ !llvm.dbg.cu = !{!0}
+ !llvm.module.flags = !{!5}
+
+ !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
+ !1 = !DIFile(filename: "t.ll", directory: "/")
+ !2 = !{}
+ !5 = !{i32 2, !"Debug Info Version", i32 3}
+ !6 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: null, file: !1, line: 1, type: !7, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
+ !7 = !DISubroutineType(types: !2)
+ !8 = !{!9}
+ !9 = !DILocalVariable(name: "1", scope: !6, file: !1, line: 1, type: !10)
+ !10 = !DIBasicType(name: "ty16", size: 16, encoding: DW_ATE_unsigned)
+ !11 = !DILocation(line: 1, column: 1, scope: !6)
+)");
+
+ // Find the global @x
+ Value *V = M->getNamedValue("x");
+
+ // Find the dbg.value
+ auto DVIs = findDbgDeclares(V);
+ auto DVRs = findDVRDeclares(V);
+ auto DVRVs = findDVRValues(V);
+
+ EXPECT_EQ(DVRs[0]->getNumVariableLocationOps(), 1u);
+ EXPECT_TRUE(DVRVs.size() == 1);
+ EXPECT_FALSE(isa<UndefValue>(DVRs[0]->getValue(0)));
+}
+
TEST(DbgVariableIntrinsic, EmptyMDIsKillLocation) {
LLVMContext Ctx;
std::unique_ptr<Module> M = parseIR(Ctx, R"(
More information about the llvm-commits
mailing list