mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 12:41:49 +01:00
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> llvm-svn: 257094
This commit is contained in:
parent
07a5def67e
commit
c074efe1c7
@ -3121,7 +3121,7 @@ void AssemblyWriter::printMetadataAttachments(
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (MDNames.empty())
|
if (MDNames.empty())
|
||||||
TheModule->getMDKindNames(MDNames);
|
MDs[0].second->getContext().getMDKindNames(MDNames);
|
||||||
|
|
||||||
for (const auto &I : MDs) {
|
for (const auto &I : MDs) {
|
||||||
unsigned Kind = I.first;
|
unsigned Kind = I.first;
|
||||||
|
37
unittests/IR/AsmWriterTest.cpp
Normal file
37
unittests/IR/AsmWriterTest.cpp
Normal file
@ -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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -6,6 +6,7 @@ set(LLVM_LINK_COMPONENTS
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(IRSources
|
set(IRSources
|
||||||
|
AsmWriterTest.cpp
|
||||||
AttributesTest.cpp
|
AttributesTest.cpp
|
||||||
ConstantRangeTest.cpp
|
ConstantRangeTest.cpp
|
||||||
ConstantsTest.cpp
|
ConstantsTest.cpp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user