[llvm] r255336 - [Mem2Reg] Respect optnone

[James Molloy via llvm-commits]

Author: jamesm
Date: Fri Dec 11 07:36:59 2015
New Revision: 255336

URL: http://llvm.org/viewvc/llvm-project?rev=255336&view=rev
Log:
[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.

Added:
    llvm/trunk/test/Transforms/Mem2Reg/optnone.ll
Modified:
    llvm/trunk/lib/Transforms/Utils/Mem2Reg.cpp

Modified: llvm/trunk/lib/Transforms/Utils/Mem2Reg.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/Mem2Reg.cpp?rev=255336&r1=255335&r2=255336&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/Mem2Reg.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/Mem2Reg.cpp Fri Dec 11 07:36:59 2015
@@ -63,6 +63,9 @@ bool PromotePass::runOnFunction(Function
 
   BasicBlock &BB = F.getEntryBlock();  // Get the entry node for the function
 
+  if (F.hasFnAttribute(Attribute::OptimizeNone))
+    return false;
+
   bool Changed  = false;
 
   DominatorTree &DT = getAnalysis<DominatorTreeWrapperPass>().getDomTree();

Added: llvm/trunk/test/Transforms/Mem2Reg/optnone.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Mem2Reg/optnone.ll?rev=255336&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/Mem2Reg/optnone.ll (added)
+++ llvm/trunk/test/Transforms/Mem2Reg/optnone.ll Fri Dec 11 07:36:59 2015
@@ -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		; <i32*> [#uses=4]
+	%J = alloca double		; <double*> [#uses=2]
+	store i32 %i, i32* %I
+	store double %j, double* %J
+	%t1 = load i32, i32* %I		; <i32> [#uses=1]
+	%t2 = add i32 %t1, 1		; <i32> [#uses=1]
+	store i32 %t2, i32* %I
+	%t3 = load i32, i32* %I		; <i32> [#uses=1]
+	%t4 = sitofp i32 %t3 to double		; <double> [#uses=1]
+	%t5 = load double, double* %J		; <double> [#uses=1]
+	%t6 = fmul double %t4, %t5		; <double> [#uses=1]
+	ret double %t6
+}