diff options
author | Takashi Kokubun <takashikkbn@gmail.com> | 2022-08-18 07:49:27 -0700 |
---|---|---|
committer | Takashi Kokubun <takashikkbn@gmail.com> | 2022-08-29 09:09:41 -0700 |
commit | 5114ddce3f3475aba8bead85f5fe9db774a4cc14 (patch) | |
tree | fc5ca2b73b8f34401eac7e53d15e809f80d07fc7 | |
parent | a78bbef12feac4d4f5eca98718cf7418c1b8e584 (diff) | |
download | ruby-5114ddce3f3475aba8bead85f5fe9db774a4cc14.tar.gz |
Avoid marking op_type on gen_defined (https://github.com/Shopify/ruby/pull/419)
-rw-r--r-- | .cirrus.yml | 2 | ||||
-rw-r--r-- | 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: 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( 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); |