diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp --- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp +++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp @@ -3966,12 +3966,11 @@ // predecessor, so that we don't have to split the critical edge. // Another option where we can sink is a block that ends with a // terminator that does not pass control to other block (such as - // return or unreachable). In this case: + // return or unreachable or resume). In this case: // - I dominates the User (by SSA form); // - the User will be executed at most once. // So sinking I down to User is always profitable or neutral. - if (UserParent->getUniquePredecessor() == BB || - (isa(Term) || isa(Term))) { + if (UserParent->getUniquePredecessor() == BB || succ_empty(Term)) { assert(DT.dominates(BB, UserParent) && "Dominance relation broken?"); return UserParent; } diff --git a/llvm/test/Transforms/InstCombine/sink-into-resume-block.ll b/llvm/test/Transforms/InstCombine/sink-into-resume-block.ll --- a/llvm/test/Transforms/InstCombine/sink-into-resume-block.ll +++ b/llvm/test/Transforms/InstCombine/sink-into-resume-block.ll @@ -7,7 +7,6 @@ ; CHECK-LABEL: @t0_noop( ; CHECK-NEXT: entry: ; CHECK-NEXT: [[C:%.*]] = call i1 @cond() -; CHECK-NEXT: [[V0:%.*]] = add i32 [[ARG:%.*]], 42 ; CHECK-NEXT: br i1 [[C]], label [[IF_THEN:%.*]], label [[IF_END:%.*]] ; CHECK: if.then: ; CHECK-NEXT: invoke void @simple_throw() @@ -17,6 +16,7 @@ ; CHECK: lpad: ; CHECK-NEXT: [[EH:%.*]] = landingpad { i8*, i32 } ; CHECK-NEXT: cleanup +; CHECK-NEXT: [[V0:%.*]] = add i32 [[ARG:%.*]], 42 ; CHECK-NEXT: call void @consume(i32 [[V0]]) ; CHECK-NEXT: call void @destructor() ; CHECK-NEXT: resume { i8*, i32 } [[EH]]