Fix crash when printing instructions that have a metadata attached but no parent.

Fix PR24852 (crash with -debug -instcombine)

Patch by Than McIntosh <thanm@google.com>

Summary:
Add guards to the asm writer to prevent crashing
when dumping an instruction that has no basic
block.

Differential Revision: http://reviews.llvm.org/D15798

From: Than McIntosh <thanm@google.com>

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@257094 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/IR/AsmWriter.cpp b/lib/IR/AsmWriter.cpp
index 1ebe9b7ee5bc64d1d843f0cdd11816b258185d21..0ce44e105cc397590ea8b19c7dd362c6a850f7c1 100644 (file)
--- a/lib/IR/AsmWriter.cpp
+++ b/lib/IR/AsmWriter.cpp
@@ -3121,7 +3121,7 @@ void AssemblyWriter::printMetadataAttachments(
     return;
 
   if (MDNames.empty())
     return;
 
   if (MDNames.empty())

-    TheModule->getMDKindNames(MDNames);
+    MDs[0].second->getContext().getMDKindNames(MDNames);

 
   for (const auto &I : MDs) {
     unsigned Kind = I.first;
 
   for (const auto &I : MDs) {
     unsigned Kind = I.first;

diff --git a/unittests/IR/AsmWriterTest.cpp b/unittests/IR/AsmWriterTest.cpp
new file mode 100644 (file)
index 0000000..c7e7bb5
--- /dev/null
+++ b/unittests/IR/AsmWriterTest.cpp
@@ -0,0 +1,37 @@
+//===- llvm/unittest/IR/AsmWriter.cpp - AsmWriter tests -------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/MDBuilder.h"
+#include "llvm/IR/Module.h"
+#include "gtest/gtest.h"
+
+using namespace llvm;
+
+namespace {
+
+TEST(AsmWriterTest, DebugPrintDetachedInstruction) {
+
+  // PR24852: Ensure that an instruction can be printed even when it
+  // has metadata attached but no parent.
+  LLVMContext Ctx;
+  auto Ty = Type::getInt32Ty(Ctx);
+  auto Undef = UndefValue::get(Ty);
+  std::unique_ptr<BinaryOperator> Add(BinaryOperator::CreateAdd(Undef, Undef));
+  Add->setMetadata(
+      "", MDNode::get(Ctx, {ConstantAsMetadata::get(ConstantInt::get(Ty, 1))}));
+  std::string S;
+  raw_string_ostream OS(S);
+  Add->print(OS);
+  std::size_t r = OS.str().find("<badref> = add i32 undef, undef, !<empty");
+  EXPECT_TRUE(r != std::string::npos);
+}
+
+}

diff --git a/unittests/IR/CMakeLists.txt b/unittests/IR/CMakeLists.txt
index e5a0fc981075fc2aabe50b3f55d049b59433500b..5aad8edc9134416742f209be6b2b5c4248c914ed 100644 (file)
--- a/unittests/IR/CMakeLists.txt
+++ b/unittests/IR/CMakeLists.txt
@@ -6,6 +6,7 @@ set(LLVM_LINK_COMPONENTS
   )
 
 set(IRSources
   )
 
 set(IRSources

+  AsmWriterTest.cpp

   AttributesTest.cpp
   ConstantRangeTest.cpp
   ConstantsTest.cpp
   AttributesTest.cpp
   ConstantRangeTest.cpp
   ConstantsTest.cpp