[GR-19220] Ruby 3.2 Fix Hash#shift when Hash is empty but has default value or proc

PullRequest: truffleruby/3747

Author: eregon

CHANGELOG.md

@@ -8,6 +8,7 @@ Bug fixes:
 
 Compatibility:
 
+- Fix `Hash#shift` when Hash is empty but has initial default value or initial default proc (@itarato).
 
 Performance:
 

spec/tags/core/hash/shift_tags.txt

@@ -0,0 +1,2 @@
+fails:Hash#shift calls #default with nil if the Hash is empty
+fails:Hash#shift returns (computed) default for empty hashes

spec/truffleruby.mspec

@@ -104,6 +104,7 @@ class MSpecScript
   # Use spec/ruby/core/nil/nil_spec.rb as a dummy file to avoid being empty
   set :next, %w[
     spec/ruby/core/nil/nil_spec.rb
+    spec/ruby/core/hash/shift_spec.rb
   ]
 
   set :tags_patterns, [

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

@@ -511,9 +511,9 @@ protected Object setDefault(RubyHash hash, Object defaultValue,
     public abstract static class ShiftNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization(guards = "hash.empty()")
-        protected Object shiftEmpty(RubyHash hash,
+        protected Nil shiftEmpty(RubyHash hash,
                 @Cached DispatchNode callDefault) {
-            return callDefault.call(hash, "default", nil);
+            return nil;
         }
 
         @Specialization(guards = "!hash.empty()", limit = "hashStrategyLimit()")

test/mri/excludes/TestHash.rb

@@ -1,34 +1,29 @@
 exclude :test_ar2st, "mutating Hash during key.hash"
-exclude :test_ASET_fstring_key, "needs investigation"
-exclude :test_ASET_fstring_non_literal_key, "needs investigation"
-exclude :test_NEWHASH_fstring_key, "needs investigation"
-exclude :test_callcc_escape, "needs investigation"
-exclude :test_callcc_reenter, "needs investigation"
-exclude :test_create, "needs investigation"
-exclude :test_dup_equality, "needs investigation"
-exclude :test_dup_will_rehash, "needs investigation"
-exclude :test_fetch_error, "needs investigation"
-exclude :test_huge_iter_level, "needs investigation"
-exclude :test_inverse_hash, "needs investigation"
-exclude :test_recursive_hash_value_struct, "needs investigation"
-exclude :test_rehash2, "needs investigation"
-exclude :test_reject, "needs investigation"
-exclude :test_ruby2_keywords_hash?, "needs investigation"
-exclude :test_s_AREF, "needs investigation"
-exclude :test_callcc, "needs investigation"
-exclude :test_callcc_iter_level, "needs investigation"
-exclude :test_bug_12706, "needs investigation"
-exclude :test_to_proc, "needs investigation"
-exclude :test_transform_keys_bang, "needs investigation"
-exclude :test_AREF_fstring_key, "needs investigation"
-exclude :test_except, "needs investigation"
-exclude :test_transform_keys, "needs investigation"
+exclude :test_to_proc, "<true> expected but was"
+exclude :test_huge_iter_level, "RuntimeError expected but nothing was raised."
+exclude :test_merge!, "FrozenError expected but nothing was raised."
+exclude :test_create, "ArgumentError expected but nothing was raised."
+exclude :test_callcc_reenter, "[ruby-dev:47803] [Bug #9105]."
+exclude :test_select_reject_will_not_rehash, "<1> expected but was"
+exclude :test_reject_on_identhash, "<{}> expected but was"
 exclude :test_select_on_identhash, "<{\"str\"=>1, \"str\"=>2}> expected but was"
 exclude :test_slice_on_identhash, "<{\"str\"=>1, \"str\"=>2}> expected but was"
-exclude :test_reject_on_identhash, "<{}> expected but was"
-exclude :test_select_reject_will_not_rehash, "<1> expected but was"
-exclude :test_merge!, "FrozenError expected but nothing was raised."
+exclude :test_shift2, "<:foo> expected but was"
+exclude :test_NEWHASH_fstring_key, "Expected \"ABC\" (oid=4680) to be the same as \"ABC\" (oid=48)."
+exclude :test_inverse_hash, "[ruby-core:34334]."
+exclude :test_rehash2, "RuntimeError expected but nothing was raised."
+exclude :test_shift_none, "<\"FOO\"> expected but was"
 exclude :test_update5, "FrozenError expected but nothing was raised."
 exclude :test_transform_values_on_identhash, "<{1=>2, 3=>4, 5=>6, \"str\"=>1, \"str\"=>2}> expected but was"
 exclude :test_s_AREF_from_pairs, "ArgumentError expected but nothing was raised."
 exclude :test_any_hash_fixable, "too slow"
+exclude :test_recursive_hash_value_struct, "[ruby-core:58567] [Bug #9151]."
+exclude :test_reject, "Expected 42 to be nil."
+exclude :test_transform_keys_bang, "<{false=>1, :b=>2, :c=>3}> expected but was"
+exclude :test_callcc_escape, "[ruby-dev:47803] [Bug #9105]."
+exclude :test_ASET_fstring_key, "Expected \"abc\" (oid=39832) to be the same as \"abc\" (oid=39848)."
+exclude :test_fetch_error, "Expected /\\.\\.\\.\\z/ to match \"key not found: \\\"gumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumby\\\"\"."
+exclude :test_ASET_fstring_non_literal_key, "Expected \"abc_def\" (oid=40568) to be the same as \"abc_def\" (oid=40584)."
+exclude :test_callcc, "RuntimeError: Continuations are unsupported on TruffleRuby"
+exclude :test_AREF_fstring_key, "NoMethodError: undefined method `count_objects' for ObjectSpace:Module"
+exclude :test_callcc_iter_level, "RuntimeError: Continuations are unsupported on TruffleRuby"

test/mri/excludes/TestHash/TestSubHash.rb

@@ -1,34 +1,29 @@
 exclude :test_ar2st, "mutating Hash during key.hash"
-exclude :test_ASET_fstring_key, "needs investigation"
-exclude :test_ASET_fstring_non_literal_key, "needs investigation"
-exclude :test_NEWHASH_fstring_key, "needs investigation"
-exclude :test_callcc_escape, "needs investigation"
-exclude :test_callcc_reenter, "needs investigation"
-exclude :test_create, "needs investigation"
-exclude :test_dup_equality, "needs investigation"
-exclude :test_dup_will_rehash, "needs investigation"
-exclude :test_fetch_error, "needs investigation"
-exclude :test_huge_iter_level, "needs investigation"
-exclude :test_inverse_hash, "needs investigation"
-exclude :test_recursive_hash_value_struct, "needs investigation"
-exclude :test_rehash2, "needs investigation"
-exclude :test_reject, "needs investigation"
-exclude :test_ruby2_keywords_hash?, "needs investigation"
-exclude :test_s_AREF, "needs investigation"
-exclude :test_callcc, "needs investigation"
-exclude :test_callcc_iter_level, "needs investigation"
-exclude :test_bug_12706, "needs investigation"
-exclude :test_to_proc, "needs investigation"
-exclude :test_transform_keys_bang, "needs investigation"
-exclude :test_AREF_fstring_key, "needs investigation"
-exclude :test_except, "needs investigation"
-exclude :test_transform_keys, "needs investigation"
+exclude :test_to_proc, "<true> expected but was"
+exclude :test_huge_iter_level, "RuntimeError expected but nothing was raised."
+exclude :test_merge!, "FrozenError expected but nothing was raised."
+exclude :test_create, "ArgumentError expected but nothing was raised."
+exclude :test_callcc_reenter, "[ruby-dev:47803] [Bug #9105]."
+exclude :test_select_reject_will_not_rehash, "<1> expected but was"
+exclude :test_reject_on_identhash, "<{}> expected but was"
 exclude :test_select_on_identhash, "<{\"str\"=>1, \"str\"=>2}> expected but was"
 exclude :test_slice_on_identhash, "<{\"str\"=>1, \"str\"=>2}> expected but was"
-exclude :test_reject_on_identhash, "<{}> expected but was"
-exclude :test_select_reject_will_not_rehash, "<1> expected but was"
-exclude :test_merge!, "FrozenError expected but nothing was raised."
+exclude :test_shift2, "<:foo> expected but was"
+exclude :test_NEWHASH_fstring_key, "Expected \"ABC\" (oid=44424) to be the same as \"ABC\" (oid=48)."
+exclude :test_inverse_hash, "[ruby-core:34334]."
+exclude :test_rehash2, "RuntimeError expected but nothing was raised."
+exclude :test_shift_none, "<\"FOO\"> expected but was"
 exclude :test_update5, "FrozenError expected but nothing was raised."
 exclude :test_transform_values_on_identhash, "<{1=>2, 3=>4, 5=>6, \"str\"=>1, \"str\"=>2}> expected but was"
 exclude :test_s_AREF_from_pairs, "ArgumentError expected but nothing was raised."
 exclude :test_any_hash_fixable, "too slow"
+exclude :test_recursive_hash_value_struct, "[ruby-core:58567] [Bug #9151]."
+exclude :test_reject, "Expected {1=>\"one\", 2=>false, true=>\"true\", \"cat\"=>99} to be an instance of Hash, not TestHash::TestSubHash::SubHash."
+exclude :test_transform_keys_bang, "<{false=>1, :b=>2, :c=>3}> expected but was"
+exclude :test_callcc_escape, "[ruby-dev:47803] [Bug #9105]."
+exclude :test_ASET_fstring_key, "Expected \"abc\" (oid=84584) to be the same as \"abc\" (oid=84600)."
+exclude :test_fetch_error, "Expected /\\.\\.\\.\\z/ to match \"key not found: \\\"gumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumbygumby\\\"\"."
+exclude :test_ASET_fstring_non_literal_key, "Expected \"abc_def\" (oid=85320) to be the same as \"abc_def\" (oid=85336)."
+exclude :test_callcc, "RuntimeError: Continuations are unsupported on TruffleRuby"
+exclude :test_AREF_fstring_key, "NoMethodError: undefined method `count_objects' for ObjectSpace:Module"
+exclude :test_callcc_iter_level, "RuntimeError: Continuations are unsupported on TruffleRuby"