Index: llvm/trunk/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
===================================================================
--- llvm/trunk/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
+++ llvm/trunk/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
@@ -71,8 +71,10 @@
     // Check immediate is the correct argument...
     if (Instruction::isCommutative(Opcode) || Idx == ImmArgIdx) {
       // ... and fits into the 12-bit immediate.
-      if (getTLI()->isLegalAddImmediate(Imm.getSExtValue()))
+      if (Imm.getMinSignedBits() <= 64 &&
+          getTLI()->isLegalAddImmediate(Imm.getSExtValue())) {
         return TTI::TCC_Free;
+      }
     }
 
     // Otherwise, use the full materialisation cost.
Index: llvm/trunk/test/Transforms/ConstantHoisting/RISCV/immediates.ll
===================================================================
--- llvm/trunk/test/Transforms/ConstantHoisting/RISCV/immediates.ll
+++ llvm/trunk/test/Transforms/ConstantHoisting/RISCV/immediates.ll
@@ -26,4 +26,13 @@
   %1 = mul i64 %a, 32767
   %2 = add i64 %1, 32767
   ret i64 %2
-}
\ No newline at end of file
+}
+
+; Check that we hoist immediates with very large values.
+define i128 @test4(i128 %a) nounwind {
+; CHECK-LABEL: test4
+; CHECK: %const = bitcast i128 12297829382473034410122878 to i128
+  %1 = add i128 %a, 12297829382473034410122878
+  %2 = add i128 %1, 12297829382473034410122878
+  ret i128 %2
+}