[llvm-commits] [llvm] r150703 - in /llvm/trunk: lib/CodeGen/Passes.cpp test/CodeGen/X86/machine-cp.ll

[Benjamin Kramer]

Author: d0k
Date: Thu Feb 16 11:29:50 2012
New Revision: 150703

URL: http://llvm.org/viewvc/llvm-project?rev=150703&view=rev
Log:
Disable machine copy propagation for now. It's known to be buggy (PR11940) and introduces subtle miscompiles in many places.

Modified:
    llvm/trunk/lib/CodeGen/Passes.cpp
    llvm/trunk/test/CodeGen/X86/machine-cp.ll

Modified: llvm/trunk/lib/CodeGen/Passes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/Passes.cpp?rev=150703&r1=150702&r2=150703&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/Passes.cpp (original)
+++ llvm/trunk/lib/CodeGen/Passes.cpp Thu Feb 16 11:29:50 2012
@@ -69,7 +69,7 @@
 static cl::opt<bool> DisableCGP("disable-cgp", cl::Hidden,
     cl::desc("Disable Codegen Prepare"));
 static cl::opt<bool> DisableCopyProp("disable-copyprop", cl::Hidden,
-    cl::desc("Disable Copy Propagation pass"));
+    cl::desc("Disable Copy Propagation pass"), cl::init(true)); // PR11940
 static cl::opt<bool> PrintLSR("print-lsr-output", cl::Hidden,
     cl::desc("Print LLVM IR produced by the loop-reduce pass"));
 static cl::opt<bool> PrintISelInput("print-isel-input", cl::Hidden,

Modified: llvm/trunk/test/CodeGen/X86/machine-cp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/machine-cp.ll?rev=150703&r1=150702&r2=150703&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/machine-cp.ll (original)
+++ llvm/trunk/test/CodeGen/X86/machine-cp.ll Thu Feb 16 11:29:50 2012
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=x86_64-apple-macosx -mcpu=nocona < %s | FileCheck %s
+; RUN: llc -mtriple=x86_64-apple-macosx -mcpu=nocona < %s -disable-copyprop=false | FileCheck %s
 
 ; After tail duplication, two copies in an early exit BB can be cancelled out.
 ; rdar://10640363