From: David Majnemer Date: Wed, 30 Mar 2016 21:12:06 +0000 (+0000) Subject: [IndVarSimplify] Don't insert after a catchswitch X-Git-Tag: llvmorg-3.9.0-rc1~10470 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d518386b658f51e18e77d31e2f823c171572b71;p=platform%2Fupstream%2Fllvm.git [IndVarSimplify] Don't insert after a catchswitch Widening a PHI requires us to insert a trunc. The logical place for this trunc is in the same BB as the PHI. This is not possible if the BB is terminated by a catchswitch. This fixes PR27133. llvm-svn: 264926 --- diff --git a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp index c9dec3b..ecbb148 100644 --- a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp +++ b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp @@ -1283,6 +1283,12 @@ Instruction *WidenIV::widenIVUse(NarrowIVDefUse DU, SCEVExpander &Rewriter) { if (UsePhi->getNumOperands() != 1) truncateIVUse(DU, DT, LI); else { + // Widening the PHI requires us to insert a trunc. The logical place + // for this trunc is in the same BB as the PHI. This is not possible if + // the BB is terminated by a catchswitch. + if (isa(UsePhi->getParent()->getTerminator())) + return nullptr; + PHINode *WidePhi = PHINode::Create(DU.WideDef->getType(), 1, UsePhi->getName() + ".wide", UsePhi); diff --git a/llvm/test/Transforms/IndVarSimplify/pr27133.ll b/llvm/test/Transforms/IndVarSimplify/pr27133.ll new file mode 100644 index 0000000..1262407 --- /dev/null +++ b/llvm/test/Transforms/IndVarSimplify/pr27133.ll @@ -0,0 +1,38 @@ +; RUN: opt -indvars -S < %s | FileCheck %s +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-pc-windows-msvc18.0.0" + +define i32 @fn2() personality i32 (...)* @__CxxFrameHandler3 { +entry: + br label %for.cond + +for.cond: ; preds = %for.inc, %entry + %c.0 = phi i32 [ %inc, %for.inc ], [ 0, %entry ] +; CHECK: %[[WIDE:.*]] = phi i64 +; CHECK: %[[NORM:.*]] = phi i32 +; CHECK: invoke void @fn1(i64 %[[WIDE]]) + %idxprom = sext i32 %c.0 to i64 + invoke void @fn1(i64 %idxprom) + to label %for.inc unwind label %catch.dispatch + +catch.dispatch: ; preds = %for.cond + %c.0.lcssa = phi i32 [ %c.0, %for.cond ] +; CHECK: %[[LCSSA:.*]] = phi i32 [ %[[NORM]], + %0 = catchswitch within none [label %catch] unwind to caller + +catch: ; preds = %catch.dispatch + %1 = catchpad within %0 [i8* null, i32 64, i8* null] + catchret from %1 to label %exit + +exit: +; CHECK: ret i32 %[[LCSSA]] + ret i32 %c.0.lcssa + +for.inc: ; preds = %for.cond + %inc = add nsw nuw i32 %c.0, 1 + br label %for.cond +} + +declare void @fn1(i64 %idxprom) + +declare i32 @__CxxFrameHandler3(...)