Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b8836c1

Browse files
k0kubunk0kubun
committed
ZJIT: Stop loading an extra parameter
1 parent 242343f commit b8836c1

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎.github/workflows/zjit-macos.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,39 +107,39 @@ jobs:
107107
run: |
108108
RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
109109
../src/bootstraptest/test_attr.rb \
110+
../src/bootstraptest/test_autoload.rb \
110111
../src/bootstraptest/test_constant_cache.rb \
111112
../src/bootstraptest/test_env.rb \
113+
../src/bootstraptest/test_fiber.rb \
112114
../src/bootstraptest/test_finalizer.rb \
113115
../src/bootstraptest/test_flip.rb \
116+
../src/bootstraptest/test_flow.rb \
117+
../src/bootstraptest/test_fork.rb \
118+
../src/bootstraptest/test_io.rb \
119+
../src/bootstraptest/test_jump.rb \
114120
../src/bootstraptest/test_literal.rb \
115121
../src/bootstraptest/test_literal_suffix.rb \
122+
../src/bootstraptest/test_marshal.rb \
123+
../src/bootstraptest/test_objectspace.rb \
116124
../src/bootstraptest/test_string.rb \
117125
../src/bootstraptest/test_struct.rb \
126+
../src/bootstraptest/test_syntax.rb \
118127
../src/bootstraptest/test_yjit_30k_ifelse.rb \
119-
../src/bootstraptest/test_yjit_30k_methods.rb
120-
# ../src/bootstraptest/test_autoload.rb \
128+
../src/bootstraptest/test_yjit_30k_methods.rb \
129+
../src/bootstraptest/test_yjit_rust_port.rb
121130
# ../src/bootstraptest/test_block.rb \
122131
# ../src/bootstraptest/test_class.rb \
123132
# ../src/bootstraptest/test_eval.rb \
124133
# ../src/bootstraptest/test_exception.rb \
125-
# ../src/bootstraptest/test_fiber.rb \
126-
# ../src/bootstraptest/test_flow.rb \
127-
# ../src/bootstraptest/test_fork.rb \
128134
# ../src/bootstraptest/test_gc.rb \
129135
# ../src/bootstraptest/test_insns.rb \
130-
# ../src/bootstraptest/test_io.rb \
131-
# ../src/bootstraptest/test_jump.rb \
132136
# ../src/bootstraptest/test_load.rb \
133-
# ../src/bootstraptest/test_marshal.rb \
134137
# ../src/bootstraptest/test_massign.rb \
135138
# ../src/bootstraptest/test_method.rb \
136-
# ../src/bootstraptest/test_objectspace.rb \
137139
# ../src/bootstraptest/test_proc.rb \
138140
# ../src/bootstraptest/test_ractor.rb \
139-
# ../src/bootstraptest/test_syntax.rb \
140141
# ../src/bootstraptest/test_thread.rb \
141142
# ../src/bootstraptest/test_yjit.rb \
142-
# ../src/bootstraptest/test_yjit_rust_port.rb \
143143
if: ${{ matrix.test_task == 'btest' }}
144144

145145
- name: make ${{ matrix.test_task }}

‎.github/workflows/zjit-ubuntu.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,39 +129,39 @@ jobs:
129129
run: |
130130
RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
131131
../src/bootstraptest/test_attr.rb \
132+
../src/bootstraptest/test_autoload.rb \
132133
../src/bootstraptest/test_constant_cache.rb \
133134
../src/bootstraptest/test_env.rb \
135+
../src/bootstraptest/test_fiber.rb \
134136
../src/bootstraptest/test_finalizer.rb \
135137
../src/bootstraptest/test_flip.rb \
138+
../src/bootstraptest/test_flow.rb \
139+
../src/bootstraptest/test_fork.rb \
140+
../src/bootstraptest/test_io.rb \
141+
../src/bootstraptest/test_jump.rb \
136142
../src/bootstraptest/test_literal.rb \
137143
../src/bootstraptest/test_literal_suffix.rb \
144+
../src/bootstraptest/test_marshal.rb \
138145
../src/bootstraptest/test_massign.rb \
146+
../src/bootstraptest/test_objectspace.rb \
139147
../src/bootstraptest/test_string.rb \
140148
../src/bootstraptest/test_struct.rb \
149+
../src/bootstraptest/test_syntax.rb \
141150
../src/bootstraptest/test_yjit_30k_ifelse.rb \
142-
../src/bootstraptest/test_yjit_30k_methods.rb
143-
# ../src/bootstraptest/test_autoload.rb \
151+
../src/bootstraptest/test_yjit_30k_methods.rb \
152+
../src/bootstraptest/test_yjit_rust_port.rb
144153
# ../src/bootstraptest/test_block.rb \
145154
# ../src/bootstraptest/test_class.rb \
146155
# ../src/bootstraptest/test_eval.rb \
147156
# ../src/bootstraptest/test_exception.rb \
148-
# ../src/bootstraptest/test_fiber.rb \
149-
# ../src/bootstraptest/test_flow.rb \
150-
# ../src/bootstraptest/test_fork.rb \
151157
# ../src/bootstraptest/test_gc.rb \
152158
# ../src/bootstraptest/test_insns.rb \
153-
# ../src/bootstraptest/test_io.rb \
154-
# ../src/bootstraptest/test_jump.rb \
155159
# ../src/bootstraptest/test_load.rb \
156-
# ../src/bootstraptest/test_marshal.rb \
157160
# ../src/bootstraptest/test_method.rb \
158-
# ../src/bootstraptest/test_objectspace.rb \
159161
# ../src/bootstraptest/test_proc.rb \
160162
# ../src/bootstraptest/test_ractor.rb \
161-
# ../src/bootstraptest/test_syntax.rb \
162163
# ../src/bootstraptest/test_thread.rb \
163164
# ../src/bootstraptest/test_yjit.rb \
164-
# ../src/bootstraptest/test_yjit_rust_port.rb \
165165
if: ${{ matrix.test_task == 'btest' }}
166166

167167
- name: make ${{ matrix.test_task }}

‎zjit/src/codegen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ fn gen_method_params(asm: &mut Assembler, iseq: IseqPtr, entry_block: &Block) {
429429
let self_param = gen_param(asm, SELF_PARAM_IDX);
430430
asm.mov(self_param, Opnd::mem(VALUE_BITS, CFP, RUBY_OFFSET_CFP_SELF));
431431

432-
let num_params = entry_block.params().len();
432+
let num_params = entry_block.params().len() - 1; // -1 to exclude self
433433
if num_params > 0 {
434434
asm_comment!(asm, "set method params: {num_params}");
435435

0 commit comments

Comments
 (0)