https://git.ruby-lang.org/ruby.git/commit/?id=95dce1ccac

From 95dce1ccacb5e893bbd2bfb100c0778c5be83d47 Mon Sep 17 00:00:00 2001
From: Maxime Chevalier-Boisvert <maximechevalierb@g...>
Date: Tue, 16 Aug 2022 12:00:35 -0400
Subject: Temporarily disable rb_str_concat, add CI tests
 (https://github.com/Shopify/ruby/pull/407)

Make sure we can load the test-all runner and run test_yjit.rb
---
 .cirrus.yml         | 11 +++++++++--
 yjit/src/codegen.rs |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 3425ebd175..35f908df04 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -163,6 +163,13 @@ yjit_task: https://github.com/ruby/ruby/blob/trunk/.cirrus.yml#L163
     bootstraptest/test_yjit_rust_port.rb \
     bootstraptest/test_yjit.rb
 
-  # FIXME: not currently working on CI, missing cargo
   # Check that we can do a full ruby build
-  #full_build_script: make -j
+  full_build_script: source $HOME/.cargo/env && make -j
+
+  # Check that we can build rdoc successfully
+  make_rdoc_script: source $HOME/.cargo/env && make -j rdoc
+
+  # Run John's YJIT instruction tests, and make sure we can load the test-all runner
+  test_yjit_script: source $HOME/.cargo/env && make test-all TESTS='test/ruby/test_yjit.rb' RUN_OPTS="--yjit-call-threshold=1"
+
+  # TODO: check that we can we run all of test-all successfully
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
index fd4a3e6b50..ed11f7cf0f 100644
--- a/yjit/src/codegen.rs
+++ b/yjit/src/codegen.rs
@@ -6134,7 +6134,7 @@ impl CodegenGlobals { https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L6134
             //self.yjit_reg_method(rb_cString, "to_s", jit_rb_str_to_s);
             //self.yjit_reg_method(rb_cString, "to_str", jit_rb_str_to_s);
             self.yjit_reg_method(rb_cString, "bytesize", jit_rb_str_bytesize);
-            self.yjit_reg_method(rb_cString, "<<", jit_rb_str_concat);
+            //self.yjit_reg_method(rb_cString, "<<", jit_rb_str_concat);
             //self.yjit_reg_method(rb_cString, "+@", jit_rb_str_uplus);
 
             // Thread.current
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/