ZJIT: Split shift with immediate operand

tekknolagi · tekknolagi · commit 6a9704190d43 · 2025-07-16T14:54:21.000-04:00
diff --git a/test/ruby/test_zjit.rb b/test/ruby/test_zjit.rb
@@ -382,6 +382,16 @@ def test(a, b) = a | b
     }, call_threshold: 2, insns: [:opt_or]
   end
 
+  def test_fixnum_mul
+    assert_compiles '12', %q{
+      C = 3
+      def test(n) = C * n
+      test(4)
+      test(4)
+      test(4)
+    }, call_threshold: 2, insns: [:opt_mult]
+  end
+
   def test_opt_not
     assert_compiles('[true, true, false]', <<~RUBY, insns: [:opt_not])
       def test(obj) = !obj
diff --git a/zjit/src/backend/arm64/mod.rs b/zjit/src/backend/arm64/mod.rs
@@ -657,12 +657,7 @@ impl Assembler
                 Insn::URShift { opnd, .. } => {
                     // The operand must be in a register, so
                     // if we get anything else we need to load it first.
-                    let opnd0 = match opnd {
-                        Opnd::Mem(_) => split_load_operand(asm, *opnd),
-                        _ => *opnd
-                    };
-
-                    *opnd = opnd0;
+                    *opnd = split_load_operand(asm, *opnd);
                     asm.push_insn(insn);
                 },
                 Insn::Store { dest, src } => {
