From e65222a748954291ba31122584d260f8675328fb Mon Sep 17 00:00:00 2001 From: Victor Hernandez Date: Sat, 6 Feb 2010 01:21:09 +0000 Subject: [PATCH] Function-local metadata whose operands had been optimized to no longer refer to function-local IR were not getting written by BitcodeWriter; solution is for these metadata to be enumerated just like global metadata. llvm-svn: 95467 --- lib/Bitcode/Writer/ValueEnumerator.cpp | 4 +-- ...-02-05-FunctionLocalMetadataBecomesNull.ll | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll diff --git a/lib/Bitcode/Writer/ValueEnumerator.cpp b/lib/Bitcode/Writer/ValueEnumerator.cpp index 3eacc5e2be0..595497f6de5 100644 --- a/lib/Bitcode/Writer/ValueEnumerator.cpp +++ b/lib/Bitcode/Writer/ValueEnumerator.cpp @@ -93,7 +93,7 @@ ValueEnumerator::ValueEnumerator(const Module *M) { for (User::const_op_iterator OI = I->op_begin(), E = I->op_end(); OI != E; ++OI) { if (MDNode *MD = dyn_cast(*OI)) - if (MD->isFunctionLocal()) + if (MD->isFunctionLocal() && MD->getFunction()) // These will get enumerated during function-incorporation. continue; EnumerateOperandType(*OI); @@ -415,7 +415,7 @@ void ValueEnumerator::incorporateFunction(const Function &F) { for (User::const_op_iterator OI = I->op_begin(), E = I->op_end(); OI != E; ++OI) { if (MDNode *MD = dyn_cast(*OI)) - if (MD->isFunctionLocal()) + if (MD->isFunctionLocal() && MD->getFunction()) // Enumerate metadata after the instructions they might refer to. FunctionLocalMDs.push_back(MD); } diff --git a/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll b/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll new file mode 100644 index 00000000000..b2256b10a8d --- /dev/null +++ b/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll @@ -0,0 +1,25 @@ +; RUN: opt -std-compile-opts < %s | llvm-dis | not grep badref + +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" +target triple = "x86_64-apple-darwin10.2" + +%struct.anon = type { i32, i32 } +%struct.test = type { i64, %struct.anon, %struct.test* } + +@TestArrayPtr = global %struct.test* getelementptr inbounds ([10 x %struct.test]* @TestArray, i64 0, i64 3) ; <%struct.test**> [#uses=1] +@TestArray = common global [10 x %struct.test] zeroinitializer, align 32 ; <[10 x %struct.test]*> [#uses=2] + +define i32 @main() nounwind readonly { + %diff1 = alloca i64 ; [#uses=2] + call void @llvm.dbg.declare(metadata !{i64* %diff1}, metadata !0) + store i64 72, i64* %diff1, align 8 + %v1 = load %struct.test** @TestArrayPtr, align 8 ; <%struct.test*> [#uses=1] + %v2 = ptrtoint %struct.test* %v1 to i64 ; [#uses=1] + %v3 = sub i64 %v2, ptrtoint ([10 x %struct.test]* @TestArray to i64) ; [#uses=1] + store i64 %v3, i64* %diff1, align 8 + ret i32 4 +} + +declare void @llvm.dbg.declare(metadata, metadata) nounwind readnone + +!0 = metadata !{i32 459008, metadata !0, metadata !0, metadata !0, i32 38, metadata !0} ; [ DW_TAG_auto_variable ]