[llvm] r320553 - Revert "[CGP] Enable select in complex addr mode"

[Serguei Katkov via llvm-commits]

Author: skatkov
Date: Tue Dec 12 23:39:35 2017
New Revision: 320553

URL: http://llvm.org/viewvc/llvm-project?rev=320553&view=rev
Log:
Revert "[CGP] Enable select in complex addr mode"

Causes: Assertion `ScaledReg == nullptr' failed.

This actually a revert of rL320551.

Modified:
    llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
    llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll

Modified: llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp?rev=320553&r1=320552&r2=320553&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp Tue Dec 12 23:39:35 2017
@@ -196,7 +196,7 @@ AddrSinkNewPhis("addr-sink-new-phis", cl
                 cl::desc("Allow creation of Phis in Address sinking."));
 
 static cl::opt<bool>
-AddrSinkNewSelects("addr-sink-new-select", cl::Hidden, cl::init(true),
+AddrSinkNewSelects("addr-sink-new-select", cl::Hidden, cl::init(false),
                    cl::desc("Allow creation of selects in Address sinking."));
 
 static cl::opt<bool> AddrSinkCombineBaseReg(

Modified: llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll?rev=320553&r1=320552&r2=320553&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll Tue Dec 12 23:39:35 2017
@@ -234,7 +234,7 @@ for.body:
 }
 
 ; CHECK-LABEL: BinarySearch
-; CHECK: set
+; CHECK: cmov
 
 define i32 @BinarySearch(i32 %Mask, %struct.Node* nocapture readonly %Curr, %struct.Node* nocapture readonly %Next) #0 {
 entry: