Reapply [InstCombine] Switch foldOpIntoPhi() to use InstSimplify
authorNikita Popov <npopov@redhat.com>
Fri, 30 Sep 2022 10:13:40 +0000 (12:13 +0200)
committerNikita Popov <npopov@redhat.com>
Mon, 17 Oct 2022 14:11:05 +0000 (16:11 +0200)
commit779fd3968412dd2c8b75a0f5884d39bd5ba29bfd
tree32547c755e1307b30b4e9532b6719b8111f3850d
parentefd0d6626943d0a9eef638961915ab37bee9ef87
Reapply [InstCombine] Switch foldOpIntoPhi() to use InstSimplify

Relative to the previous attempt, this is rebased over the
InstSimplify fix in ac74e7a7806480a000c9a3502405c3dedd8810de,
which addresses the miscompile reported in PR58401.

-----

foldOpIntoPhi() currently only folds operations into the phi if all
but one operands constant-fold. The two exceptions to this are freeze
and select, where we allow more general simplification.

This patch makes foldOpIntoPhi() generally simplification based and
removes all the instruction-specific logic. We just try to simplify
the instruction for each operand, and for the (potentially) one
non-simplified operand, we move it into the new block with adjusted
operands.

This fixes https://github.com/llvm/llvm-project/issues/57448, which
was my original motivation for the change.

Differential Revision: https://reviews.llvm.org/D134954
llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
llvm/test/Transforms/InstCombine/intptr1.ll
llvm/test/Transforms/InstCombine/intptr4.ll
llvm/test/Transforms/InstCombine/intptr5.ll
llvm/test/Transforms/InstCombine/intptr7.ll
llvm/test/Transforms/InstCombine/phi-select-constant.ll
llvm/test/Transforms/InstCombine/phi.ll
llvm/test/Transforms/InstCombine/recurrence.ll