Skip to content

Commit

Permalink
Fix crash when printing instructions that have a metadata attached bu…
Browse files Browse the repository at this point in the history
…t no parent. (#7036)

Applying patch from upstream LLVM:

llvm/llvm-project@b9b50aa#diff-69d28d03f6d27b8c800ff1dafb34ede6999a3165c109263e7da48dbbdf964f0aR9

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
amaiorano and github-actions[bot] authored Dec 17, 2024
1 parent d39324e commit 5b75d5d
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/IR/AsmWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3049,7 +3049,7 @@ void AssemblyWriter::printMetadataAttachments(
return;

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

for (const auto &I : MDs) {
unsigned Kind = I.first;
Expand Down
37 changes: 37 additions & 0 deletions unittests/IR/AsmWriterTest.cpp
Original file line number Diff line number Diff line change
@@ -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/Function.h"
#include "llvm/IR/IRBuilder.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);
}

} // namespace
1 change: 1 addition & 0 deletions unittests/IR/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set(LLVM_LINK_COMPONENTS
)

set(IRSources
AsmWriterTest.cpp
AttributesTest.cpp
ConstantRangeTest.cpp
ConstantsTest.cpp
Expand Down

0 comments on commit 5b75d5d

Please sign in to comment.