merge revision(s) 496591d: [Backport #18578]

nurse · nurse · commit 7fe0ebc4e7ab · 2022-02-17T12:19:17.000+09:00
st.c: Do not clear entries_bound when calling Hash#shift for empty
	 hash

	tab-&gt;entries_bound is used to check if the bins are full in
	rebuild_table_if_necessary.

	Hash#shift against an empty hash assigned 0 to tab-&gt;entries_bound, but
	didn't clear the bins. Thus, the table is not rebuilt even when the bins
	are full. Attempting to add a new element into full-bin hash gets stuck.

	This change stops clearing tab-&gt;entries_bound in Hash#shift.
	[Bug #18578]
	---
	 st.c                   |  1 -
	 test/ruby/test_hash.rb | 13 +++++++++++++
	 2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/st.c b/st.c
@@ -1363,7 +1363,6 @@ st_shift(st_table *tab, st_data_t *key, st_data_t *value)
 	    return 1;
 	}
     }
-    tab->entries_start = tab->entries_bound = 0;
     if (value != 0) *value = 0;
     return 0;
 }
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
@@ -1069,6 +1069,19 @@ def h.default(k = nil)
     assert_equal("FOO", h.shift)
   end
 
+  def test_shift_for_empty_hash
+    # [ruby-dev:51159]
+    h = @cls[]
+    100.times{|n|
+      while h.size < n
+        k = Random.rand 0..1<<30
+        h[k] = 1
+      end
+      0 while h.shift
+      assert_equal({}, h)
+    }
+  end
+
   def test_reject_bang2
     assert_equal({1=>2}, @cls[1=>2,3=>4].reject! {|k, v| k + v == 7 })
     assert_nil(@cls[1=>2,3=>4].reject! {|k, v| k == 5 })
diff --git a/version.h b/version.h
@@ -11,11 +11,11 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 16
+#define RUBY_PATCHLEVEL 17
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 17
 
 #include "ruby/version.h"
 

Original file line number	Diff line number	Diff line change
`@@ -1363,7 +1363,6 @@ st_shift(st_table tab, st_data_t key, st_data_t *value)`
`1363`	`1363`	`return 1;`
`1364`	`1364`	`}`
`1365`	`1365`	`}`
`1366`		`- tab->entries_start = tab->entries_bound = 0;`
`1367`	`1366`	`if (value != 0) *value = 0;`
`1368`	`1367`	`return 0;`
`1369`	`1368`	`}`