summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Cheng <evan.cheng@apple.com>2009-11-17 09:55:52 +0000
committerEvan Cheng <evan.cheng@apple.com>2009-11-17 09:55:52 +0000
commit84efacfaaddd1023cb18ea98af77963dd5a627ec (patch)
tree86db0c99d596a1374d305f8adaf489fe5d131f9d
parent5392cc9d142ddb00290a8c01014f57bbe9aafff1 (diff)
downloadbcm5719-llvm-84efacfaaddd1023cb18ea98af77963dd5a627ec.tar.gz
bcm5719-llvm-84efacfaaddd1023cb18ea98af77963dd5a627ec.zip
Revert 89021. It's miscompiling llvm-gcc driver driver at -O0.
llvm-svn: 89082
-rw-r--r--llvm/lib/CodeGen/PHIElimination.cpp2
-rw-r--r--llvm/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll6
-rw-r--r--llvm/test/CodeGen/X86/stack-color-with-reg.ll4
3 files changed, 3 insertions, 9 deletions
diff --git a/llvm/lib/CodeGen/PHIElimination.cpp b/llvm/lib/CodeGen/PHIElimination.cpp
index 9adc56234a0..c4f2cc7a75d 100644
--- a/llvm/lib/CodeGen/PHIElimination.cpp
+++ b/llvm/lib/CodeGen/PHIElimination.cpp
@@ -39,7 +39,7 @@ STATISTIC(NumSplits, "Number of critical edges split on demand");
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>
diff --git a/llvm/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll b/llvm/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll
index 664a69f2649..83eb61aed43 100644
--- a/llvm/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll
+++ b/llvm/test/CodeGen/X86/2008-04-15-LiveVariableBug.ll
@@ -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 }
diff --git a/llvm/test/CodeGen/X86/stack-color-with-reg.ll b/llvm/test/CodeGen/X86/stack-color-with-reg.ll
index 95b5a777753..0f32a50fc5b 100644
--- a/llvm/test/CodeGen/X86/stack-color-with-reg.ll
+++ b/llvm/test/CodeGen/X86/stack-color-with-reg.ll
@@ -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
OpenPOWER on IntegriCloud