[GR-17457] Fix rb_uv_to_utf8() spec

PullRequest: truffleruby/3322

Author: eregon

spec/ruby/core/dir/foreach_spec.rb

@@ -41,13 +41,13 @@
 
   it "accepts an encoding keyword for the encoding of the entries" do
     dirs = Dir.foreach("#{DirSpecs.mock_dir}/deeply/nested", encoding: "utf-8").to_a.sort
-    dirs.each {|dir| dir.encoding.should == Encoding::UTF_8}
+    dirs.each { |dir| dir.encoding.should == Encoding::UTF_8 }
 
-    dirs = Dir.foreach("#{DirSpecs.mock_dir}/deeply/nested", encoding: Encoding::UTF_16LE).to_a.sort
-    dirs.each {|dir| dir.encoding.should == Encoding::UTF_16LE}
+    dirs = Dir.foreach("#{DirSpecs.mock_dir}/deeply/nested", encoding: Encoding::ISO_8859_1).to_a.sort
+    dirs.each { |dir| dir.encoding.should == Encoding::ISO_8859_1 }
 
-    Dir.foreach("#{DirSpecs.mock_dir}/deeply/nested", encoding: Encoding::UTF_16LE) do |f|
-      f.encoding.should == Encoding::UTF_16LE
+    Dir.foreach("#{DirSpecs.mock_dir}/deeply/nested", encoding: Encoding::ISO_8859_1) do |f|
+      f.encoding.should == Encoding::ISO_8859_1
     end
   end
 

spec/ruby/optional/capi/encoding_spec.rb

@@ -613,15 +613,15 @@
     it 'converts a Unicode codepoint to a UTF-8 C string' do
       str = ' ' * 6
       {
-        0  => "\x01",
-        0x7f => "\xC2\x80",
-        0x7ff => "\xE0\xA0\x80",
-        0xffff => "\xF0\x90\x80\x80",
-        0x1fffff => "\xF8\x88\x80\x80\x80",
-        0x3ffffff => "\xFC\x84\x80\x80\x80\x80",
+        1  => "\x01",
+        0x80 => "\xC2\x80",
+        0x800 => "\xE0\xA0\x80",
+        0x10000 => "\xF0\x90\x80\x80",
+        0x200000 => "\xF8\x88\x80\x80\x80",
+        0x4000000 => "\xFC\x84\x80\x80\x80\x80",
       }.each do |num, result|
-        len = @s.rb_uv_to_utf8(str, num + 1)
-        str[0..len-1].should == result
+        len = @s.rb_uv_to_utf8(str, num)
+        str.byteslice(0, len).should == result
       end
     end
   end

spec/ruby/optional/capi/ext/encoding_spec.c

@@ -275,7 +275,9 @@ static VALUE encoding_spec_rb_enc_str_asciionly_p(VALUE self, VALUE str) {
 }
 
 static VALUE encoding_spec_rb_uv_to_utf8(VALUE self, VALUE buf, VALUE num) {
-  return INT2NUM(rb_uv_to_utf8(RSTRING_PTR(buf), NUM2INT(num)));
+  int len = rb_uv_to_utf8(RSTRING_PTR(buf), NUM2INT(num));
+  RB_ENC_CODERANGE_CLEAR(buf);
+  return INT2NUM(len);
 }
 
 static VALUE encoding_spec_ONIGENC_MBC_CASE_FOLD(VALUE self, VALUE str) {

src/main/java/org/truffleruby/core/hash/HashNodes.java

@@ -257,7 +257,7 @@ protected Object set(RubyHash hash, Object key, Object value,
     @ImportStatic(HashGuards.class)
     public abstract static class ClearNode extends CoreMethodArrayArgumentsNode {
 
-        @Specialization(limit = "2")
+        @Specialization(limit = "hashStrategyLimit()")
         protected RubyHash clear(RubyHash hash,
                 @CachedLibrary("hash.store") HashStoreLibrary hashes) {
             hashes.clear(hash.store, hash);

src/main/java/org/truffleruby/core/hash/library/PackedHashStoreLibrary.java

@@ -165,6 +165,7 @@ protected static Object lookupOrDefault(
         return lookupPackedEntryNode.execute(frame, hash, key, hashed, defaultNode);
     }
 
+    @ImportStatic(HashGuards.class)
     @ExportMessage
     protected static class Set {
         @Specialization(guards = "hash.size == 0")
@@ -190,7 +191,7 @@ protected static boolean set(Object[] store, RubyHash hash, Object key, Object v
                 @Cached @Shared("propagateKey") PropagateSharingNode propagateSharingKey,
                 @Cached @Shared("propagateValue") PropagateSharingNode propagateSharingValue,
                 @Cached @Shared("compareHashKeys") CompareHashKeysNode compareHashKeys,
-                @CachedLibrary(limit = "2") HashStoreLibrary hashes,
+                @CachedLibrary(limit = "hashStrategyLimit()") HashStoreLibrary hashes,
                 @Cached ConditionProfile withinCapacity) {
 
             assert verify(store, hash);