diff options
| -rw-r--r-- | test/excludes/_wercker/test-mjit-wait/TestGemStreamUI.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_jit.rb | 21 | ||||
| -rw-r--r-- | tool/ruby_vm/views/_mjit_compile_ivar.erb | 12 |
3 files changed, 27 insertions, 8 deletions
diff --git a/test/excludes/_wercker/test-mjit-wait/TestGemStreamUI.rb b/test/excludes/_wercker/test-mjit-wait/TestGemStreamUI.rb deleted file mode 100644 index 56edf339b2..0000000000 --- a/test/excludes/_wercker/test-mjit-wait/TestGemStreamUI.rb +++ /dev/null @@ -1,2 +0,0 @@ -# debugging this right now -exclude(/.*/, 'this fails with --jit-wait') diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index 888290faa9..5c31b504c4 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -669,6 +669,27 @@ class TestJIT < Test::Unit::TestCase end; end + def test_inlined_undefined_ivar + assert_eval_with_jit("#{<<~"begin;"}\n#{<<~"end;"}", stdout: "bbb", success_count: 2, min_calls: 3) + begin; + class Foo + def initialize + @a = :a + end + + def bar + if @b.nil? + @b = :b + end + end + end + + print(Foo.new.bar) + print(Foo.new.bar) + print(Foo.new.bar) + end; + end + def test_attr_reader assert_eval_with_jit("#{<<~"begin;"}\n#{<<~"end;"}", stdout: "4nil\nnil\n6", success_count: 2, min_calls: 2) begin; diff --git a/tool/ruby_vm/views/_mjit_compile_ivar.erb b/tool/ruby_vm/views/_mjit_compile_ivar.erb index 3f75b576da..f1963c23f7 100644 --- a/tool/ruby_vm/views/_mjit_compile_ivar.erb +++ b/tool/ruby_vm/views/_mjit_compile_ivar.erb @@ -26,19 +26,19 @@ fprintf(f, " VALUE obj = GET_SELF();\n"); fprintf(f, " const rb_serial_t ic_serial = (rb_serial_t)%"PRI_SERIALT_PREFIX"u;\n", ic_copy->ic_serial); fprintf(f, " const st_index_t index = %"PRIuSIZE";\n", ic_copy->ic_value.index); +% # JIT: cache hit path of vm_getivar, or cancel JIT. % if insn.name == 'setinstancevariable' fprintf(f, " VALUE val = stack[%d];\n", b->stack_size - 1); -% end -% -% # JIT: cache hit path of vm_getivar, or cancel JIT. fprintf(f, " if (LIKELY(RB_TYPE_P(obj, T_OBJECT) && ic_serial == RCLASS_SERIAL(RBASIC(obj)->klass) && index < ROBJECT_NUMIV(obj))) {\n"); -% if insn.name == 'setinstancevariable' fprintf(f, " VALUE *ptr = ROBJECT_IVPTR(obj);\n"); fprintf(f, " RB_OBJ_WRITE(obj, &ptr[index], val);\n"); + fprintf(f, " }\n"); % else - fprintf(f, " stack[%d] = ROBJECT_IVPTR(obj)[index];\n", b->stack_size); -% end + fprintf(f, " VALUE val;\n"); + fprintf(f, " if (LIKELY(RB_TYPE_P(obj, T_OBJECT) && ic_serial == RCLASS_SERIAL(RBASIC(obj)->klass) && index < ROBJECT_NUMIV(obj) && (val = ROBJECT_IVPTR(obj)[index]) != Qundef)) {\n"); + fprintf(f, " stack[%d] = val;\n", b->stack_size); fprintf(f, " }\n"); +% end fprintf(f, " else {\n"); fprintf(f, " reg_cfp->pc = original_body_iseq + %d;\n", pos); fprintf(f, " reg_cfp->sp = (VALUE *)reg_cfp->bp + %d;\n", b->stack_size + 1); |