[llvm] 2a8f40d - [RISCV][GISel] Fix a bug exposed from compilation warnings. NFC

[Michael Liao via llvm-commits]

Author: Michael Liao
Date: 2023-12-18T15:07:12-05:00
New Revision: 2a8f40d4628d9ee070114b5550e2b20e35667a54

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

LOG: [RISCV][GISel] Fix a bug exposed from compilation warnings. NFC

- G_MERGE_VALUES and G_UNMERGE_VALUES need type pairs instead of type.

Added: 
    

Modified: 
    llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
index 8f03a7ac41d37b..dbbe335e190174 100644
--- a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
+++ b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
@@ -85,13 +85,13 @@ RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST)
 
   // Merge/Unmerge
   for (unsigned Op : {G_MERGE_VALUES, G_UNMERGE_VALUES}) {
-    unsigned BigTyIdx = Op == G_MERGE_VALUES ? 0 : 1;
-    unsigned LitTyIdx = Op == G_MERGE_VALUES ? 1 : 0;
+    unsigned BigTyIdx = (Op == G_MERGE_VALUES) ? 0 : 1;
+    unsigned LitTyIdx = (Op == G_MERGE_VALUES) ? 1 : 0;
     auto &MergeUnmergeActions = getActionDefinitionsBuilder(Op);
     if (XLen == 32 && ST.hasStdExtD()) {
-      LLT IdxZeroTy = G_MERGE_VALUES ? s64 : s32;
-      LLT IdxOneTy = G_MERGE_VALUES ? s32 : s64;
-      MergeUnmergeActions.legalFor({IdxZeroTy, IdxOneTy});
+      LLT IdxZeroTy = (Op == G_MERGE_VALUES) ? s64 : s32;
+      LLT IdxOneTy = (Op == G_MERGE_VALUES) ? s32 : s64;
+      MergeUnmergeActions.legalFor({{IdxZeroTy, IdxOneTy}});
     }
     MergeUnmergeActions.widenScalarToNextPow2(LitTyIdx, XLen)
         .widenScalarToNextPow2(BigTyIdx, XLen)