Skip to content

Commit 2a8f40d

Browse files
committed
[RISCV][GISel] Fix a bug exposed from compilation warnings. NFC
- G_MERGE_VALUES and G_UNMERGE_VALUES need type pairs instead of type.
1 parent da2db4a commit 2a8f40d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST)
8585

8686
// Merge/Unmerge
8787
for (unsigned Op : {G_MERGE_VALUES, G_UNMERGE_VALUES}) {
88-
unsigned BigTyIdx = Op == G_MERGE_VALUES ? 0 : 1;
89-
unsigned LitTyIdx = Op == G_MERGE_VALUES ? 1 : 0;
88+
unsigned BigTyIdx = (Op == G_MERGE_VALUES) ? 0 : 1;
89+
unsigned LitTyIdx = (Op == G_MERGE_VALUES) ? 1 : 0;
9090
auto &MergeUnmergeActions = getActionDefinitionsBuilder(Op);
9191
if (XLen == 32 && ST.hasStdExtD()) {
92-
LLT IdxZeroTy = G_MERGE_VALUES ? s64 : s32;
93-
LLT IdxOneTy = G_MERGE_VALUES ? s32 : s64;
94-
MergeUnmergeActions.legalFor({IdxZeroTy, IdxOneTy});
92+
LLT IdxZeroTy = (Op == G_MERGE_VALUES) ? s64 : s32;
93+
LLT IdxOneTy = (Op == G_MERGE_VALUES) ? s32 : s64;
94+
MergeUnmergeActions.legalFor({{IdxZeroTy, IdxOneTy}});
9595
}
9696
MergeUnmergeActions.widenScalarToNextPow2(LitTyIdx, XLen)
9797
.widenScalarToNextPow2(BigTyIdx, XLen)

0 commit comments

Comments
 (0)