[llvm] c572861 - [RISCV] Use TokenFactor instead of MERGE_VALUES to combine chains.

[Craig Topper via llvm-commits]

Author: Craig Topper
Date: 2023-04-29T18:05:15-07:00
New Revision: c5728616ab8e0cc03e343f5043188ae9918051cf

URL: https://github.com/llvm/llvm-project/commit/c5728616ab8e0cc03e343f5043188ae9918051cf
DIFF: https://github.com/llvm/llvm-project/commit/c5728616ab8e0cc03e343f5043188ae9918051cf.diff

LOG: [RISCV] Use TokenFactor instead of MERGE_VALUES to combine chains.

Added: 
    

Modified: 
    llvm/lib/Target/RISCV/RISCVISelLowering.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
index 8b95075105a8..8f217425084a 100644
--- a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+++ b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
@@ -7787,8 +7787,8 @@ SDValue RISCVTargetLowering::lowerVectorStrictFSetcc(SDValue Op,
       SDValue Tmp2 = DAG.getNode(ISD::STRICT_FSETCCS, DL, VTList, Chain, Op2,
                                  Op1, OLECCVal);
       SDValue And = DAG.getNode(ISD::AND, DL, VT, Tmp1, Tmp2);
-      SDValue OutChain =
-          DAG.getMergeValues({Tmp1.getValue(1), Tmp2.getValue(1)}, DL);
+      SDValue OutChain = DAG.getNode(ISD::TokenFactor, DL, MVT::Other,
+                                     Tmp1.getValue(1), Tmp2.getValue(1));
       return DAG.getMergeValues({And, OutChain}, DL);
     }