From 9d18661e1de053a9fecae7f4ab4ed41300537cec Mon Sep 17 00:00:00 2001 From: Noah Gibbs Date: Wed, 1 Jun 2022 15:22:08 +0100 Subject: Revert incorrect string-guard optimisation. (#5969) Also add jhawthorn's test to for this bug. Fix String#to_s invalidation test --- bootstraptest/test_yjit.rb | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'bootstraptest') diff --git a/bootstraptest/test_yjit.rb b/bootstraptest/test_yjit.rb index 6d0ba93fc8..503af1ab80 100644 --- a/bootstraptest/test_yjit.rb +++ b/bootstraptest/test_yjit.rb @@ -1339,12 +1339,42 @@ assert_equal 'foo123', %q{ # test that invalidation of String#to_s doesn't crash assert_equal 'meh', %q{ + def inval_method + "".to_s + end + + inval_method + class String def to_s "meh" end end - "".to_s + + inval_method +} + +# test that overriding to_s on a String subclass isn't over-optimised +assert_equal 'meh', %q{ + class MyString < String + def to_s + "meh" + end + end + + def test_to_s(obj) + obj.to_s + end + + OBJ = MyString.new + + # Should return 'meh' both times + test_to_s("") + test_to_s("") + + # Can return '' if YJIT optimises String#to_s too aggressively + test_to_s(OBJ) + test_to_s(OBJ) } # test string interpolation with overridden to_s -- cgit v1.2.3