From 925afc1ce70ab4117073d52bf519ea7cf05ed03f Mon Sep 17 00:00:00 2001 From: Artur Pilipenko Date: Wed, 28 Aug 2019 21:27:50 +0000 Subject: Fix for "DICompileUnit not listed in llvm.dbg.cu" verification error after ... ...cloning a function from a different module Currently when a function with debug info is cloned from a different module, the cloned function may have hanging DICompileUnits, so that the module with the cloned function fails debug info verification. The proposed fix inserts all DICompileUnits reachable from the cloned function to "llvm.dbg.cu" metadata operands of the cloned function module. Reviewed By: aprantl, efriedma Differential Revision: https://reviews.llvm.org/D66510 Patch by Oleg Pliss (Oleg.Pliss@azul.com) llvm-svn: 370265 --- llvm/unittests/Transforms/Utils/CloningTest.cpp | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'llvm/unittests/Transforms/Utils') diff --git a/llvm/unittests/Transforms/Utils/CloningTest.cpp b/llvm/unittests/Transforms/Utils/CloningTest.cpp index 514a7708f9f..3d0bd10e87a 100644 --- a/llvm/unittests/Transforms/Utils/CloningTest.cpp +++ b/llvm/unittests/Transforms/Utils/CloningTest.cpp @@ -652,6 +652,62 @@ TEST_F(CloneFunc, DebugIntrinsics) { } } +static int GetDICompileUnitCount(const Module& M) { + if (const auto* LLVM_DBG_CU = M.getNamedMetadata("llvm.dbg.cu")) { + return LLVM_DBG_CU->getNumOperands(); + } + return 0; +} + +TEST(CloneFunction, CloneFunctionToDifferentModule) { + StringRef ImplAssembly = R"( + define void @foo() { + ret void, !dbg !5 + } + + !llvm.module.flags = !{!0} + !llvm.dbg.cu = !{!2, !6} + !0 = !{i32 1, !"Debug Info Version", i32 3} + !1 = distinct !DISubprogram(unit: !2) + !2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3) + !3 = !DIFile(filename: "foo.c", directory: "/tmp") + !4 = distinct !DISubprogram(unit: !2) + !5 = !DILocation(line: 4, scope: !1) + !6 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3) + )"; + StringRef DeclAssembly = R"( + declare void @foo() + )"; + + LLVMContext Context; + SMDiagnostic Error; + + auto ImplModule = parseAssemblyString(ImplAssembly, Error, Context); + EXPECT_TRUE(ImplModule != nullptr); + // DICompileUnits: !2, !6. Only !2 is reachable from @foo(). + EXPECT_TRUE(GetDICompileUnitCount(*ImplModule) == 2); + auto* ImplFunction = ImplModule->getFunction("foo"); + EXPECT_TRUE(ImplFunction != nullptr); + + auto DeclModule = parseAssemblyString(DeclAssembly, Error, Context); + EXPECT_TRUE(DeclModule != nullptr); + // No DICompileUnits defined here. + EXPECT_TRUE(GetDICompileUnitCount(*DeclModule) == 0); + auto* DeclFunction = DeclModule->getFunction("foo"); + EXPECT_TRUE(DeclFunction != nullptr); + + ValueToValueMapTy VMap; + VMap[ImplFunction] = DeclFunction; + // No args to map + SmallVector Returns; + CloneFunctionInto(DeclFunction, ImplFunction, VMap, true, Returns); + + EXPECT_FALSE(verifyModule(*ImplModule, &errs())); + EXPECT_FALSE(verifyModule(*DeclModule, &errs())); + // DICompileUnit !2 shall be inserted into DeclModule. + EXPECT_TRUE(GetDICompileUnitCount(*DeclModule) == 1); +} + class CloneModule : public ::testing::Test { protected: void SetUp() override { -- cgit v1.2.3