From 9c695e4fee1cfda08227872e8ca6a406f64173b0 Mon Sep 17 00:00:00 2001 From: James Molloy Date: Fri, 11 Dec 2015 13:36:59 +0000 Subject: [PATCH] [Mem2Reg] Respect optnone Mem2Reg shouldn't be optimizing a function that is marked optnone. There is a test checking this that fails when mem2reg is explicitly added to the standard pass pipeline. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255336 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/Mem2Reg.cpp | 3 +++ test/Transforms/Mem2Reg/optnone.ll | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 test/Transforms/Mem2Reg/optnone.ll diff --git a/lib/Transforms/Utils/Mem2Reg.cpp b/lib/Transforms/Utils/Mem2Reg.cpp index 00cf4e6c01c..aa1e35ddba0 100644 --- a/lib/Transforms/Utils/Mem2Reg.cpp +++ b/lib/Transforms/Utils/Mem2Reg.cpp @@ -63,6 +63,9 @@ bool PromotePass::runOnFunction(Function &F) { BasicBlock &BB = F.getEntryBlock(); // Get the entry node for the function + if (F.hasFnAttribute(Attribute::OptimizeNone)) + return false; + bool Changed = false; DominatorTree &DT = getAnalysis().getDomTree(); diff --git a/test/Transforms/Mem2Reg/optnone.ll b/test/Transforms/Mem2Reg/optnone.ll new file mode 100644 index 00000000000..41ee77aff79 --- /dev/null +++ b/test/Transforms/Mem2Reg/optnone.ll @@ -0,0 +1,21 @@ +; RUN: opt < %s -mem2reg -S | FileCheck %s + +; This function is optnone, so the allocas should not be eliminated. + +; CHECK-LABEL: @testfunc +; CHECK: alloca +; CHECK: alloca +define double @testfunc(i32 %i, double %j) optnone noinline { + %I = alloca i32 ; [#uses=4] + %J = alloca double ; [#uses=2] + store i32 %i, i32* %I + store double %j, double* %J + %t1 = load i32, i32* %I ; [#uses=1] + %t2 = add i32 %t1, 1 ; [#uses=1] + store i32 %t2, i32* %I + %t3 = load i32, i32* %I ; [#uses=1] + %t4 = sitofp i32 %t3 to double ; [#uses=1] + %t5 = load double, double* %J ; [#uses=1] + %t6 = fmul double %t4, %t5 ; [#uses=1] + ret double %t6 +} -- 2.34.1