Index: lib/Transforms/Utils/LoopSimplify.cpp =================================================================== --- lib/Transforms/Utils/LoopSimplify.cpp +++ lib/Transforms/Utils/LoopSimplify.cpp @@ -686,8 +686,10 @@ } DT->eraseNode(ExitingBlock); - BI->getSuccessor(0)->removePredecessor(ExitingBlock); - BI->getSuccessor(1)->removePredecessor(ExitingBlock); + BI->getSuccessor(0)->removePredecessor( + ExitingBlock, /* DontDeleteUselessPHIs */ PreserveLCSSA); + BI->getSuccessor(1)->removePredecessor( + ExitingBlock, /* DontDeleteUselessPHIs */ PreserveLCSSA); ExitingBlock->eraseFromParent(); } } @@ -748,6 +750,7 @@ AU.addPreserved(); AU.addPreserved(); AU.addPreserved(); + AU.addPreservedID(LCSSAID); AU.addPreserved(); AU.addPreservedID(BreakCriticalEdgesID); // No critical edges added. } Index: test/Transforms/LoopSimplify/pr26682.ll =================================================================== --- /dev/null +++ test/Transforms/LoopSimplify/pr26682.ll @@ -0,0 +1,32 @@ +; RUN: opt < %s -lcssa -loop-simplify -indvars -S | FileCheck %s +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-unknown" + +@a = external global i32, align 4 + +; Check that loop-simplify merges two loop exits, but preserves LCSSA form. +; CHECK-LABEL: @foo +; CHECK: for: +; CHECK: %or.cond = and i1 %cmp1, %cmp2 +; CHECK-NOT: for.cond: +; CHECK: for.end: +; CHECK: %a.lcssa = phi i32 [ %a, %for ] +define i32 @foo(i32 %x) { +entry: + br label %for + +for: + %iv = phi i32 [ 0, %entry ], [ %iv.next, %for.cond ] + %cmp1 = icmp eq i32 %x, 0 + %iv.next = add nuw nsw i32 %iv, 1 + %a = load i32, i32* @a + br i1 %cmp1, label %for.cond, label %for.end + +for.cond: + %cmp2 = icmp slt i32 %iv.next, 4 + br i1 %cmp2, label %for, label %for.end + +for.end: + %a.lcssa = phi i32 [ %a, %for ], [ %a, %for.cond ] + ret i32 %a.lcssa +}