add tag v2_3_4

nagachika · nagachika · commit 4bd69735af90 · 2017-03-29T16:44:59.000Z
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v2_3_4@58214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Mar 29 23:47:31 2017  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* hash.c (any_hash): fix CI failure on L32LLP64 architecture.
+	  The patch was provided by usa. [ruby-core:80484] [Bug #13376]
+
+Wed Mar 29 06:22:27 2017  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* hash.c (any_hash): fix Symbol#hash to be nondeterministic.
+	  The patch was provided by Eric Wong. [ruby-core:80433] [Bug #13376]
+
+	* test/ruby/test_symbol.rb: add test for above.
+
 Tue Mar 28 00:38:39 2017  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets
diff --git a/hash.c b/hash.c
@@ -139,6 +139,7 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))
 	if (a == Qundef) return 0;
 	if (STATIC_SYM_P(a)) {
 	    hnum = a >> (RUBY_SPECIAL_SHIFT + ID_SCOPE_SHIFT);
+	    hnum = rb_hash_start(hnum);
 	    goto out;
 	}
 	else if (FLONUM_P(a)) {
@@ -167,7 +168,7 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))
     }
   out:
     hnum <<= 1;
-    return (st_index_t)RSHIFT(hnum, 1);
+    return (long)RSHIFT(hnum, 1);
 }
 
 static st_index_t
diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb
@@ -411,4 +411,14 @@ def test_not_freeze
     assert_equal str, str.to_sym.to_s
     assert_not_predicate(str, :frozen?, bug11721)
   end
+
+  def test_hash_nondeterministic
+    ruby = EnvUtil.rubybin
+    refute_equal `#{ruby} -e 'puts :foo.hash'`, `#{ruby} -e 'puts :foo.hash'`,
+                 '[ruby-core:80430] [Bug #13376]'
+
+    sym = "dynsym_#{Random.rand(10000)}_#{Time.now}"
+    refute_equal `#{ruby} -e 'puts #{sym.inspect}.to_sym.hash'`,
+                 `#{ruby} -e 'puts #{sym.inspect}.to_sym.hash'`
+  end
 end
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.3.4"
-#define RUBY_RELEASE_DATE "2017-03-28"
-#define RUBY_PATCHLEVEL 299
+#define RUBY_RELEASE_DATE "2017-03-30"
+#define RUBY_PATCHLEVEL 301
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"
 

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))`
`139`	`139`	`if (a == Qundef) return 0;`
`140`	`140`	`if (STATIC_SYM_P(a)) {`
`141`	`141`	`hnum = a >> (RUBY_SPECIAL_SHIFT + ID_SCOPE_SHIFT);`
	`142`	`+ hnum = rb_hash_start(hnum);`
`142`	`143`	`goto out;`
`143`	`144`	`}`
`144`	`145`	`else if (FLONUM_P(a)) {`
`@@ -167,7 +168,7 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))`
`167`	`168`	`}`
`168`	`169`	`out:`
`169`	`170`	`hnum <<= 1;`
`170`		`- return (st_index_t)RSHIFT(hnum, 1);`
	`171`	`+ return (long)RSHIFT(hnum, 1);`
`171`	`172`	`}`
`172`	`173`
`173`	`174`	`static st_index_t`