summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadav Rotem <nrotem@apple.com>2012-09-06 14:27:06 +0000
committerNadav Rotem <nrotem@apple.com>2012-09-06 14:27:06 +0000
commit79cb162e5d7aeaa3602bf4a7afa253232f461b33 (patch)
treec01a46b2f5c25139ebd2ed53b1ff4db3e4a42791
parent6d3d7656539188b496089a3313ed4d13759adba3 (diff)
downloadllvm-79cb162e5d7aeaa3602bf4a7afa253232f461b33.tar.gz
llvm-79cb162e5d7aeaa3602bf4a7afa253232f461b33.tar.bz2
llvm-79cb162e5d7aeaa3602bf4a7afa253232f461b33.tar.xz
Disable stack coloring by default in order to resolve the i386 failures.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163316 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/CodeGen/StackColoring.cpp2
-rw-r--r--test/CodeGen/X86/StackColoring.ll4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/CodeGen/StackColoring.cpp b/lib/CodeGen/StackColoring.cpp
index f1818f642c..cd333f2f9f 100644
--- a/lib/CodeGen/StackColoring.cpp
+++ b/lib/CodeGen/StackColoring.cpp
@@ -59,7 +59,7 @@ using namespace llvm;
static cl::opt<bool>
DisableColoring("no-stack-coloring",
- cl::init(false), cl::Hidden,
+ cl::init(true), cl::Hidden,
cl::desc("Suppress stack coloring"));
STATISTIC(NumMarkerSeen, "Number of life markers found.");
diff --git a/test/CodeGen/X86/StackColoring.ll b/test/CodeGen/X86/StackColoring.ll
index 442c51de53..26ed0ecc0c 100644
--- a/test/CodeGen/X86/StackColoring.ll
+++ b/test/CodeGen/X86/StackColoring.ll
@@ -1,5 +1,5 @@
-; RUN: llc -mcpu=corei7 < %s | FileCheck %s --check-prefix=YESCOLOR
-; RUN: llc -mcpu=corei7 -no-stack-coloring < %s | FileCheck %s --check-prefix=NOCOLOR
+; RUN: llc -mcpu=corei7 -no-stack-coloring=false < %s | FileCheck %s --check-prefix=YESCOLOR
+; RUN: llc -mcpu=corei7 -no-stack-coloring=true < %s | FileCheck %s --check-prefix=NOCOLOR
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.8.0"