ruby-changes:73304
From: Takashi <ko1@a...>
Date: Tue, 30 Aug 2022 01:09:59 +0900 (JST)
Subject: [ruby-changes:73304] 5114ddce3f (master): Avoid marking op_type on gen_defined (https://github.com/Shopify/ruby/pull/419)
https://git.ruby-lang.org/ruby.git/commit/?id=5114ddce3f From 5114ddce3f3475aba8bead85f5fe9db774a4cc14 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Thu, 18 Aug 2022 07:49:27 -0700 Subject: Avoid marking op_type on gen_defined (https://github.com/Shopify/ruby/pull/419) --- .cirrus.yml | 2 +- yjit/src/codegen.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 35f908df04..21f3e38651 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -170,6 +170,6 @@ yjit_task: https://github.com/ruby/ruby/blob/trunk/.cirrus.yml#L170 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" + test_yjit_script: source $HOME/.cargo/env && make -j test-all TESTS='test/ruby/test_method.rb 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 5be0f0f749..01ce65deb1 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -2186,7 +2186,7 @@ fn gen_defined( https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L2186 asm: &mut Assembler, _ocb: &mut OutlinedCb, ) -> CodegenStatus { - let op_type = jit_get_arg(jit, 0); + let op_type = jit_get_arg(jit, 0).as_u64(); let obj = jit_get_arg(jit, 1); let pushval = jit_get_arg(jit, 2); -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/