[GR-18163] Fix Hash#{to_s,inspect} for keys whose #inspect return a frozen String

PullRequest: truffleruby/3218

Author: eregon

CHANGELOG.md

@@ -15,6 +15,7 @@ Bug fixes:
 * Fix a resource leak from allocators defined in C extensions (@aardvark179).
 * `SIGINT`/`Interrupt`/`Ctrl+C` now shows the backtrace and exits as signaled, like CRuby (@eregon).
 * Update patch feature finding to prefer the longest matching load path (#2605, @bjfish).
+* Fix `Hash#{to_s,inspect}` for keys whose `#inspect` return a frozen String (#2613, @eregon).
 
 Compatibility:
 

spec/ruby/core/hash/shared/to_s.rb

@@ -2,7 +2,6 @@
 require_relative '../fixtures/classes'
 
 describe :hash_to_s, shared: true do
-
   it "returns a string representation with same order as each()" do
     h = { a: [1, 2], b: -2, d: -6, nil => nil }
 
@@ -95,4 +94,8 @@
 
     {a: utf_16be}.send(@method).should == '{:a=>"utf_16be \u3042"}'
   end
+
+  it "works for keys and values whose #inspect return a frozen String" do
+    { true => false }.to_s.should == "{true=>false}"
+  end
 end

src/main/ruby/truffleruby/core/array.rb

@@ -602,15 +602,14 @@ def insert(idx, *items)
   Truffle::Graal.always_split instance_method(:insert)
 
   def inspect
-    return '[]'.encode(Encoding::US_ASCII) if size == 0
-    comma = ', '
+    return '[]'.encode(Encoding::US_ASCII) if empty?
     result = +'['
 
     return +'[...]' if Truffle::ThreadOperations.detect_recursion self do
       each_with_index do |element, index|
         temp = Truffle::Type.rb_inspect(element)
         result.force_encoding(temp.encoding) if index == 0
-        result << temp << comma
+        result << temp << ', '
       end
     end
 

src/main/ruby/truffleruby/core/false.rb

@@ -27,16 +27,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 class FalseClass
-
   def to_s
     'false'
   end
-
-  def inspect
-    # Call #to_s rather than alias it so that people can change #to_s if they
-    # wish.
-    to_s
-  end
+  alias_method :inspect, :to_s
 
   alias_method :===, :===
 

src/main/ruby/truffleruby/core/hash.rb

@@ -420,10 +420,7 @@ def inspect
     out = []
     return +'{...}' if Truffle::ThreadOperations.detect_recursion self do
       each_pair do |key,value|
-        str =  Truffle::Type.rb_inspect(key)
-        str << '=>'
-        str << Truffle::Type.rb_inspect(value)
-        out << str
+        out << "#{Truffle::Type.rb_inspect(key)}=>#{Truffle::Type.rb_inspect(value)}"
       end
     end
 

src/main/ruby/truffleruby/core/true.rb

@@ -27,16 +27,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 class TrueClass
-
   def to_s
     'true'
   end
-
-  def inspect
-    # Call #to_s rather than alias it so that people can change #to_s if they
-    # wish.
-    to_s
-  end
+  alias_method :inspect, :to_s
 
   alias_method :===, :===