kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

_mjit_compile_send.erb: revert r63350

Browse source 
Revert "_mjit_compile_send.erb: inline recursive call"

I reverted r63360 in r63379, but the errors were reproductive from
r63350. So I need to revert this.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-05-09 17:11:07 +00:00
parent 29ac19a05b
commit 179bc1b814
3 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mjit_compile.c
View file

@ -27,7 +27,6 @@ struct compile_status {
/* If TRUE, JIT-ed code will use local variables to store pushed values instead of
using VM's stack and moving stack pointer. */
int local_stack_p;
const char *funcname; /* the method name which is being compiled */
};
/* Storage to keep data which is consistent in each conditional branch.
@ -194,7 +193,6 @@ mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *func
status.success = TRUE;
status.local_stack_p = !body->catch_except_p;
status.stack_size_for_pos = ALLOC_N(int, body->iseq_size);
status.funcname = funcname;
memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size);
/* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */

10
test/ruby/test_jit.rb
View file

@ -322,16 +322,6 @@ class TestJIT < Test::Unit::TestCase
def test_compile_insn_opt_send_without_block
assert_compile_once('print', result_inspect: 'nil', insns: %i[opt_send_without_block])
# recursive inline
assert_eval_with_jit("#{<<~"begin;"}\n#{<<~"end;"}", stdout: '120', success_count: 1, min_calls: 2)
begin;
def fact(i)
return i if i <= 1
i * fact(i - 1)
end
print fact(5)
end;
end
def test_compile_insn_invokesuper

3
tool/ruby_vm/views/_mjit_compile_send.erb
View file

@ -58,9 +58,6 @@
fprintf(f, " VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH);\n");
fprintf(f, " v = vm_exec(ec, TRUE);\n");
}
else if (body == iseq->body) { /* inline recursive call */
fprintf(f, " v = %s(ec, ec->cfp);\n", status->funcname);
}
else {
fprintf(f, " if ((v = mjit_exec(ec)) == Qundef) {\n");
fprintf(f, " VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH);\n"); /* This is vm_call0_body's code after vm_call_iseq_setup */