[llvm-commits] [llvm] r89082 - in /llvm/trunk: lib/CodeGen/PHIElimination.cpp test/CodeGen/X86/2008-04-15-LiveVariableBug.ll test/CodeGen/X86/stack-color-with-reg.ll

[Evan Cheng]

Author: evancheng
Date: Tue Nov 17 03:55:52 2009
New Revision: 89082

URL: http://llvm.org/viewvc/llvm-project?rev=89082&view=rev
Log:
Revert 89021. It's miscompiling llvm-gcc driver driver at -O0.

Modified:
    llvm/trunk/lib/CodeGen/PHIElimination.cpp
    llvm/trunk/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll
    llvm/trunk/test/CodeGen/X86/stack-color-with-reg.ll

Modified: llvm/trunk/lib/CodeGen/PHIElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PHIElimination.cpp?rev=89082&r1=89081&r2=89082&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PHIElimination.cpp (original)
+++ llvm/trunk/lib/CodeGen/PHIElimination.cpp Tue Nov 17 03:55:52 2009
@@ -39,7 +39,7 @@
 static cl::opt<bool>
 SplitEdges("split-phi-edges",
            cl::desc("Split critical edges during phi elimination"),
-           cl::init(true), cl::Hidden);
+           cl::init(false), cl::Hidden);
 
 char PHIElimination::ID = 0;
 static RegisterPass<PHIElimination>

Modified: llvm/trunk/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll?rev=89082&r1=89081&r2=89082&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll Tue Nov 17 03:55:52 2009
@@ -1,9 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin
-
-; Globally enabling -split-phi-edges causes LiveVariables to always run.
-; LiveVariables trips up the local allocator on this test.
-; It doesn't understand the subtleties of subregister imp-kills.
-; DONT: llc < %s -mtriple=x86_64-apple-darwin -relocation-model=pic -disable-fp-elim -O0 -regalloc=local
+; RUN: llc < %s -mtriple=x86_64-apple-darwin -relocation-model=pic -disable-fp-elim -O0 -regalloc=local
 
 	%struct.CGPoint = type { double, double }
 	%struct.NSArray = type { %struct.NSObject }

Modified: llvm/trunk/test/CodeGen/X86/stack-color-with-reg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/stack-color-with-reg.ll?rev=89082&r1=89081&r2=89082&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/stack-color-with-reg.ll (original)
+++ llvm/trunk/test/CodeGen/X86/stack-color-with-reg.ll Tue Nov 17 03:55:52 2009
@@ -1,8 +1,6 @@
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin10 -relocation-model=pic -disable-fp-elim -color-ss-with-regs -stats -info-output-file - > %t
 ; RUN:   grep stackcoloring %t | grep "stack slot refs replaced with reg refs"  | grep 6
-
-; Obviously the only correct way of translating this function is with 175 instructions. Not 177 (duh!)
-; RUN:   grep asm-printer %t   | grep 175
+; RUN:   grep asm-printer %t   | grep 177
 
 	type { [62 x %struct.Bitvec*] }		; type %0
 	type { i8* }		; type %1