Skip to content

Commit 5e8def2

Browse files
committed
Revert "[RISCV] Remove dead early exit in performCombineVMergeAndVOps. NFC"
This reverts commit cee60a8. This change is not NFC because there is also an additional check for isImplicitDef in the branch above.
1 parent cee60a8 commit 5e8def2

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3545,6 +3545,9 @@ bool RISCVDAGToDAGISel::performCombineVMergeAndVOps(SDNode *N) {
35453545

35463546
if (IsMasked) {
35473547
assert(HasTiedDest && "Expected tied dest");
3548+
// The vmerge instruction must be TU.
3549+
if (isImplicitDef(Merge))
3550+
return false;
35483551
// The vmerge instruction must have an all 1s mask since we're going to keep
35493552
// the mask from the True instruction.
35503553
// FIXME: Support mask agnostic True instruction which would have an

0 commit comments

Comments
 (0)