From f641146377b5c043e7b8b6a6febaa4b05badf7bf Mon Sep 17 00:00:00 2001
From: Zack Deveau <zack.ref@gmail.com>
Date: Fri, 5 Aug 2022 09:18:34 -0400
Subject: [PATCH] Port gen_opt_str_freeze to new backend IR
 (https://github.com/Shopify/ruby/pull/366)

---
 bootstraptest/test_yjit_new_backend.rb |  8 ++++++++
 yjit/src/codegen.rs                    | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bootstraptest/test_yjit_new_backend.rb b/bootstraptest/test_yjit_new_backend.rb
index fee5d7d2a39815..b46a582c4cd783 100644
--- a/bootstraptest/test_yjit_new_backend.rb
+++ b/bootstraptest/test_yjit_new_backend.rb
@@ -538,6 +538,14 @@ def foo
   Foo.new.foo
 }
 
+# opt_str_freeze
+assert_equal 'netscape', %q{
+    def foo()
+      "netscape".freeze
+    end
+    foo()
+}
+
 # BOP redefinition works on Integer#<
 assert_equal 'false', %q{
   def less_than x
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
index 58bc0367565ab5..87bb43caa218e0 100644
--- a/yjit/src/codegen.rs
+++ b/yjit/src/codegen.rs
@@ -3054,11 +3054,11 @@ fn gen_opt_succ(
     gen_opt_send_without_block(jit, ctx, asm, ocb)
 }
 
-/*
+
 fn gen_opt_str_freeze(
     jit: &mut JITState,
     ctx: &mut Context,
-    cb: &mut CodeBlock,
+    asm: &mut Assembler,
     ocb: &mut OutlinedCb,
 ) -> CodegenStatus {
     if !assume_bop_not_redefined(jit, ocb, STRING_REDEFINED_OP_FLAG, BOP_FREEZE) {
@@ -3066,15 +3066,15 @@ fn gen_opt_str_freeze(
     }
 
     let str = jit_get_arg(jit, 0);
-    jit_mov_gc_ptr(jit, cb, REG0, str);
 
     // Push the return value onto the stack
     let stack_ret = ctx.stack_push(Type::CString);
-    mov(cb, stack_ret, REG0);
+    asm.mov(stack_ret, str.into());
 
     KeepCompiling
 }
 
+/*
 fn gen_opt_str_uminus(
     jit: &mut JITState,
     ctx: &mut Context,
@@ -5964,7 +5964,7 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> {
         YARVINSN_opt_gt => Some(gen_opt_gt),
         YARVINSN_opt_ge => Some(gen_opt_ge),
         YARVINSN_opt_mod => Some(gen_opt_mod),
-        //YARVINSN_opt_str_freeze => Some(gen_opt_str_freeze),
+        YARVINSN_opt_str_freeze => Some(gen_opt_str_freeze),
         //YARVINSN_opt_str_uminus => Some(gen_opt_str_uminus),
         YARVINSN_splatarray => Some(gen_splatarray),
         YARVINSN_newrange => Some(gen_newrange),