Add YJIT codegen for objtostring (#5149)

This is the minimal correct objtostring implementation in YJIT.
For correctness, it is important that to_string not get called on strings or subclasses of string.
There is a new test for this behavior.

A follow up should implement an optimized version for other types as performed in `vm_objtostring`.

Co-authored-by: John Hawthorn <jhawthorn@github.com>

Co-authored-by: John Hawthorn <jhawthorn@github.com>
This commit is contained in:
Adam Hess 2021-11-19 13:57:09 -08:00 коммит произвёл GitHub
Родитель 3c92516519
Коммит 73388aff5e
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 48 добавлений и 6 удалений

Просмотреть файл

@ -1214,6 +1214,23 @@ assert_equal 'foo123', %q{
make_str("foo", 123)
}
# test string interpolation with overridden to_s
assert_equal 'foo', %q{
class String
def to_s
"bad"
end
end
def make_str(foo)
"#{foo}"
end
make_str("foo")
make_str("foo")
}
# test invokebuiltin as used in struct assignment
assert_equal '123', %q{
def foo(obj)

Просмотреть файл

@ -215,7 +215,7 @@ class TestYJIT < Test::Unit::TestCase
def test_compile_tostring
assert_no_exits('"i am a string #{true}"')
end if false # Until objtostring supported
end
def test_compile_opt_aset
assert_compiles('[1,2,3][2] = 4', insns: %i[opt_aset])
@ -240,7 +240,7 @@ class TestYJIT < Test::Unit::TestCase
def test_compile_regexp
assert_no_exits('/#{true}/')
end if false # Until objtostring supported
end
def test_getlocal_with_level
assert_compiles(<<~RUBY, insns: %i[getlocal opt_plus], result: [[7]])
@ -377,7 +377,7 @@ class TestYJIT < Test::Unit::TestCase
end
def test_string_interpolation
assert_compiles(<<~'RUBY', insns: %i[checktype concatstrings], result: "foobar", min_calls: 2)
assert_compiles(<<~'RUBY', insns: %i[objtostring anytostring concatstrings], result: "foobar", min_calls: 2)
def make_str(foo, bar)
"#{foo}#{bar}"
end
@ -385,17 +385,17 @@ class TestYJIT < Test::Unit::TestCase
make_str("foo", "bar")
make_str("foo", "bar")
RUBY
end if false # Until objtostring supported
end
def test_string_interpolation_cast
assert_compiles(<<~'RUBY', insns: %i[checktype concatstrings tostring], result: "123")
assert_compiles(<<~'RUBY', insns: %i[objtostring anytostring concatstrings], result: "123")
def make_str(foo, bar)
"#{foo}#{bar}"
end
make_str(1, 23)
RUBY
end if false # Until objtostring supported
end
def test_checkkeyword
assert_compiles(<<~'RUBY', insns: %i[checkkeyword], result: [2, 5])

Просмотреть файл

@ -4307,6 +4307,30 @@ gen_anytostring(jitstate_t *jit, ctx_t *ctx, codeblock_t *cb)
return YJIT_KEEP_COMPILING;
}
static codegen_status_t
gen_objtostring(jitstate_t *jit, ctx_t *ctx, codeblock_t *cb)
{
if (!jit_at_current_insn(jit)) {
defer_compilation(jit, ctx);
return YJIT_END_BLOCK;
}
x86opnd_t recv = ctx_stack_opnd(ctx, 0);
VALUE comptime_recv = jit_peek_at_stack(jit, ctx, 0);
if (RB_TYPE_P(comptime_recv, T_STRING)) {
uint8_t *side_exit = yjit_side_exit(jit, ctx);
mov(cb, REG0, recv);
jit_guard_known_klass(jit, ctx, CLASS_OF(comptime_recv), OPND_STACK(0), comptime_recv, SEND_MAX_DEPTH, side_exit);
// No work needed. The string value is already on the top of the stack.
return YJIT_KEEP_COMPILING;
} else {
struct rb_call_data *cd = (struct rb_call_data *)jit_get_arg(jit, 0);
return gen_send_general(jit, ctx, cd, NULL);
}
}
static codegen_status_t
gen_toregexp(jitstate_t *jit, ctx_t *ctx, codeblock_t *cb)
{
@ -4832,6 +4856,7 @@ yjit_init_codegen(void)
yjit_reg_op(BIN(getglobal), gen_getglobal);
yjit_reg_op(BIN(setglobal), gen_setglobal);
yjit_reg_op(BIN(anytostring), gen_anytostring);
yjit_reg_op(BIN(objtostring), gen_objtostring);
yjit_reg_op(BIN(toregexp), gen_toregexp);
yjit_reg_op(BIN(getspecial), gen_getspecial);
yjit_reg_op(BIN(getclassvariable), gen_getclassvariable);