Merge commit '9ba438d32175' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit e48bf5f08abe · 2025-02-20T10:10:14.000-08:00
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMatInt.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMatInt.cpp
@@ -134,7 +134,7 @@ static void generateInstSeqImpl(int64_t Val, const MCSubtargetInfo &STI,
     }
 
     // Try to use SLLI_UW for Val when it is uint32 but not int32.
-    if (isUInt<32>((uint64_t)Val) && !isInt<32>((uint64_t)Val) &&
+    if (isUInt<32>(Val) && !isInt<32>(Val) &&
         STI.hasFeature(RISCV::FeatureStdExtZba)) {
       // Use LUI+ADDI or LUI to compose, then clear the upper 32 bits with
       // SLLI_UW.

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ static void generateInstSeqImpl(int64_t Val, const MCSubtargetInfo &STI,`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Try to use SLLI_UW for Val when it is uint32 but not int32.`
`137`		`- if (isUInt<32>((uint64_t)Val) && !isInt<32>((uint64_t)Val) &&`
	`137`	`+ if (isUInt<32>(Val) && !isInt<32>(Val) &&`
`138`	`138`	`STI.hasFeature(RISCV::FeatureStdExtZba)) {`
`139`	`139`	`// Use LUI+ADDI or LUI to compose, then clear the upper 32 bits with`
`140`	`140`	`// SLLI_UW.`