From b3df24519cc743b472f01f850d760e723ffbde74 Mon Sep 17 00:00:00 2001 From: Chen Li Date: Fri, 7 Aug 2015 19:30:12 +0000 Subject: [PATCH] [ConstantFoldTerminator] Preserve make.implicit metadata when converting SwitchInst to BranchInst Summary: llvm::ConstantFoldTerminator function can convert SwitchInst with single case (and default) to a conditional BranchInst. This patch adds support to preserve make.implicit metadata on this conversion. Reviewers: sanjoy, weimingz, chenli Subscribers: mcrosier, llvm-commits Differential Revision: http://reviews.llvm.org/D11841 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244348 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/Local.cpp | 5 ++++ .../preserve-make-implicit-on-switch-to-br.ll | 30 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 test/Transforms/SimplifyCFG/preserve-make-implicit-on-switch-to-br.ll diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index 3483032651a..310aab43d28 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/lib/Transforms/Utils/Local.cpp @@ -229,6 +229,11 @@ bool llvm::ConstantFoldTerminator(BasicBlock *BB, bool DeleteDeadConditions, SIDef->getValue().getZExtValue())); } + // Update make.implicit metadata to the newly-created conditional branch. + MDNode *MakeImplicitMD = SI->getMetadata(LLVMContext::MD_make_implicit); + if (MakeImplicitMD) + NewBr->setMetadata(LLVMContext::MD_make_implicit, MakeImplicitMD); + // Delete the old switch. SI->eraseFromParent(); return true; diff --git a/test/Transforms/SimplifyCFG/preserve-make-implicit-on-switch-to-br.ll b/test/Transforms/SimplifyCFG/preserve-make-implicit-on-switch-to-br.ll new file mode 100644 index 00000000000..0e95336bbc1 --- /dev/null +++ b/test/Transforms/SimplifyCFG/preserve-make-implicit-on-switch-to-br.ll @@ -0,0 +1,30 @@ +; RUN: opt %s -simplifycfg -S | FileCheck %s + +; ConstantFoldTerminator function can convert SwitchInst with one case (and default) to +; a conditional BranchInst. This test checks the converted BranchInst preserve the +; make.implicit metadata. + +declare i32 @consume(i32*) +declare void @trap() + +define i32 @copy-metadata(i32* %x) { + +entry: + %x.int = ptrtoint i32* %x to i64 + +; CHECK: br i1 %cond, label %is_null, label %default, !make.implicit !0 + switch i64 %x.int, label %default [ + i64 0, label %is_null + ], !make.implicit !0 + +default: + %0 = call i32 @consume(i32* %x) + ret i32 %0 + +is_null: + call void @trap() + unreachable +} + +!0 = !{} + -- 2.34.1