From 8efe38a1e2c469d49548a23f4f576dfad52b40e4 Mon Sep 17 00:00:00 2001 From: Peter Zotov Date: Sun, 3 Apr 2016 19:32:13 +0000 Subject: [PATCH] [CodeGenPrepare] Fix r265264 (again). Don't require TLI for SinkCmpExpression, like it wasn't before r265264. llvm-svn: 265271 --- llvm/lib/CodeGen/CodeGenPrepare.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp index ba68a4e..89ffab4 100644 --- a/llvm/lib/CodeGen/CodeGenPrepare.cpp +++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp @@ -855,11 +855,11 @@ static bool CombineUAddWithOverflow(CmpInst *CI) { /// lose; some adjustment may be wanted there. /// /// Return true if any changes are made. -static bool SinkCmpExpression(CmpInst *CI, const TargetLowering &TLI) { +static bool SinkCmpExpression(CmpInst *CI, const TargetLowering *TLI) { BasicBlock *DefBB = CI->getParent(); // Avoid sinking soft-FP comparisons, since this can move them into a loop. - if (TLI.useSoftFloat() && isa(CI)) + if (TLI && TLI->useSoftFloat() && isa(CI)) return false; // Only insert a cmp in each block once. @@ -911,7 +911,7 @@ static bool SinkCmpExpression(CmpInst *CI, const TargetLowering &TLI) { } static bool OptimizeCmpExpression(CmpInst *CI, const TargetLowering *TLI) { - if (TLI && SinkCmpExpression(CI, *TLI)) + if (SinkCmpExpression(CI, TLI)) return true; if (CombineUAddWithOverflow(CI)) -- 2.7.4