From: Serguei Katkov Date: Wed, 13 Dec 2017 07:39:35 +0000 (+0000) Subject: Revert "[CGP] Enable select in complex addr mode" X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=407ce54852856d6411b2897b6e252c0318f133c2;p=llvm Revert "[CGP] Enable select in complex addr mode" Causes: Assertion `ScaledReg == nullptr' failed. This actually a revert of rL320551. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@320553 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CodeGenPrepare.cpp b/lib/CodeGen/CodeGenPrepare.cpp index 18b3b4f28ed..1b01f843036 100644 --- a/lib/CodeGen/CodeGenPrepare.cpp +++ b/lib/CodeGen/CodeGenPrepare.cpp @@ -196,7 +196,7 @@ AddrSinkNewPhis("addr-sink-new-phis", cl::Hidden, cl::init(false), cl::desc("Allow creation of Phis in Address sinking.")); static cl::opt -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 AddrSinkCombineBaseReg( diff --git a/test/CodeGen/X86/x86-cmov-converter.ll b/test/CodeGen/X86/x86-cmov-converter.ll index 62b491e2f3a..5fec1380e14 100644 --- a/test/CodeGen/X86/x86-cmov-converter.ll +++ b/test/CodeGen/X86/x86-cmov-converter.ll @@ -234,7 +234,7 @@ for.body: ; preds = %for.body.preheader, } ; CHECK-LABEL: BinarySearch -; CHECK: set +; CHECK: cmov define i32 @BinarySearch(i32 %Mask, %struct.Node* nocapture readonly %Curr, %struct.Node* nocapture readonly %Next) #0 { entry: