[llvm-branch-commits] [llvm-branch] r303687 - Merging r303456:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Tue May 23 15:49:01 2017
New Revision: 303687

URL: http://llvm.org/viewvc/llvm-project?rev=303687&view=rev
Log:
Merging r303456:

------------------------------------------------------------------------
r303456 | eugenis | 2017-05-19 16:58:48 -0400 (Fri, 19 May 2017) | 3 lines

[safestack] Disable stack coloring by default.

Workaround for apparent miscompilation of PR32143.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/lib/CodeGen/SafeStackColoring.cpp
    llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring-ssp.ll
    llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring.ll
    llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring2.ll
    llvm/branches/release_40/test/Transforms/SafeStack/X86/layout-frag.ll

Modified: llvm/branches/release_40/lib/CodeGen/SafeStackColoring.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/lib/CodeGen/SafeStackColoring.cpp?rev=303687&r1=303686&r2=303687&view=diff
==============================================================================
--- llvm/branches/release_40/lib/CodeGen/SafeStackColoring.cpp (original)
+++ llvm/branches/release_40/lib/CodeGen/SafeStackColoring.cpp Tue May 23 15:49:01 2017
@@ -20,9 +20,10 @@ using namespace llvm::safestack;
 
 #define DEBUG_TYPE "safestackcoloring"
 
+// Disabled by default due to PR32143.
 static cl::opt<bool> ClColoring("safe-stack-coloring",
                                 cl::desc("enable safe stack coloring"),
-                                cl::Hidden, cl::init(true));
+                                cl::Hidden, cl::init(false));
 
 const StackColoring::LiveRange &StackColoring::getLiveRange(AllocaInst *AI) {
   const auto IT = AllocaNumbering.find(AI);

Modified: llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring-ssp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring-ssp.ll?rev=303687&r1=303686&r2=303687&view=diff
==============================================================================
--- llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring-ssp.ll (original)
+++ llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring-ssp.ll Tue May 23 15:49:01 2017
@@ -1,4 +1,4 @@
-; RUN: opt -safe-stack -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
+; RUN: opt -safe-stack -safe-stack-coloring=1 -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
 
 ; %x and %y share a stack slot between them, but not with the stack guard.
 define void @f() safestack sspreq {

Modified: llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring.ll?rev=303687&r1=303686&r2=303687&view=diff
==============================================================================
--- llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring.ll (original)
+++ llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring.ll Tue May 23 15:49:01 2017
@@ -1,5 +1,5 @@
-; RUN: opt -safe-stack -S -mtriple=i386-pc-linux-gnu < %s -o - | FileCheck %s
-; RUN: opt -safe-stack -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
+; RUN: opt -safe-stack -safe-stack-coloring=1 -S -mtriple=i386-pc-linux-gnu < %s -o - | FileCheck %s
+; RUN: opt -safe-stack -safe-stack-coloring=1 -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
 
 define void @f() safestack {
 entry:

Modified: llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring2.ll?rev=303687&r1=303686&r2=303687&view=diff
==============================================================================
--- llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring2.ll (original)
+++ llvm/branches/release_40/test/Transforms/SafeStack/X86/coloring2.ll Tue May 23 15:49:01 2017
@@ -1,5 +1,5 @@
-; RUN: opt -safe-stack -S -mtriple=i386-pc-linux-gnu < %s -o - | FileCheck %s
-; RUN: opt -safe-stack -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
+; RUN: opt -safe-stack -safe-stack-coloring=1 -S -mtriple=i386-pc-linux-gnu < %s -o - | FileCheck %s
+; RUN: opt -safe-stack -safe-stack-coloring=1 -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
 
 ; x and y share the stack slot.
 define void @f() safestack {

Modified: llvm/branches/release_40/test/Transforms/SafeStack/X86/layout-frag.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/test/Transforms/SafeStack/X86/layout-frag.ll?rev=303687&r1=303686&r2=303687&view=diff
==============================================================================
--- llvm/branches/release_40/test/Transforms/SafeStack/X86/layout-frag.ll (original)
+++ llvm/branches/release_40/test/Transforms/SafeStack/X86/layout-frag.ll Tue May 23 15:49:01 2017
@@ -1,5 +1,5 @@
 ; Test that safestack layout reuses a region w/o fragmentation.
-; RUN: opt -safe-stack -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
+; RUN: opt -safe-stack -safe-stack-coloring=1 -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
 
 define void @f() safestack {
 ; CHECK-LABEL: define void @f