naruse	2017-03-11 23:48:04 +0900 (Sat, 11 Mar 2017)

  New Revision: 57848

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57848

  Log:
    merge revision(s) 57278,57279: [Backport #12855]
    
    fix optimization for hash aset/aref with fstring
    
    Patch by Eric Wong [ruby-core:78797].
    I don't like the idea of making insns.def any bigger to support
    a corner case, and "test_hash_aref_fstring_identity" shows
    how contrived this is.
    
    [ruby-core:78783] [Bug #12855]
    adjust indent [ci skip]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/hash.c
    branches/ruby_2_4/insns.def
    branches/ruby_2_4/internal.h
    branches/ruby_2_4/test/ruby/test_hash.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/hash.c
===================================================================
--- ruby_2_4/hash.c	(revision 57847)
+++ ruby_2_4/hash.c	(revision 57848)
@@ -2758,8 +2758,6 @@ rb_hash_compact_bang(VALUE hash) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/hash.c#L2758
     return Qnil;
 }
 
-static VALUE rb_hash_compare_by_id_p(VALUE hash);
-
 /*
  *  call-seq:
  *     hsh.compare_by_identity -> hsh
@@ -2795,7 +2793,7 @@ rb_hash_compare_by_id(VALUE hash) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/hash.c#L2793
  *
  */
 
-static VALUE
+VALUE
 rb_hash_compare_by_id_p(VALUE hash)
 {
     if (!RHASH(hash)->ntbl)
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57847)
+++ ruby_2_4/version.h	(revision 57848)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-11"
-#define RUBY_PATCHLEVEL 15
+#define RUBY_PATCHLEVEL 16
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/test/ruby/test_hash.rb
===================================================================
--- ruby_2_4/test/ruby/test_hash.rb	(revision 57847)
+++ ruby_2_4/test/ruby/test_hash.rb	(revision 57848)
@@ -237,6 +237,19 @@ class TestHash < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/ruby/test_hash.rb#L237
     assert_same a.keys[0], b.keys[0]
   end
 
+  def test_hash_aset_fstring_identity
+    h = {}.compare_by_identity
+    h['abc'] = 1
+    h['abc'] = 2
+    assert_equal 2, h.size, '[ruby-core:78783] [Bug #12855]'
+  end
+
+  def test_hash_aref_fstring_identity
+    h = {}.compare_by_identity
+    h['abc'] = 1
+    assert_nil h['abc'], '[ruby-core:78783] [Bug #12855]'
+  end
+
   def test_NEWHASH_fstring_key
     a = {"ABC" => :t}
     b = {"ABC" => :t}
Index: ruby_2_4/internal.h
===================================================================
--- ruby_2_4/internal.h	(revision 57847)
+++ ruby_2_4/internal.h	(revision 57848)
@@ -1098,6 +1098,7 @@ long rb_objid_hash(st_index_t index); https://github.com/ruby/ruby/blob/trunk/ruby_2_4/internal.h#L1098
 long rb_dbl_long_hash(double d);
 st_table *rb_init_identtable(void);
 st_table *rb_init_identtable_with_size(st_index_t size);
+VALUE rb_hash_compare_by_id_p(VALUE hash);
 
 #define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h)
 VALUE rb_hash_keys(VALUE hash);
Index: ruby_2_4/insns.def
===================================================================
--- ruby_2_4/insns.def	(revision 57847)
+++ ruby_2_4/insns.def	(revision 57848)
@@ -1881,7 +1881,9 @@ opt_aset_with https://github.com/ruby/ruby/blob/trunk/ruby_2_4/insns.def#L1881
 (VALUE recv, VALUE val)
 (VALUE val)
 {
-    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG)) {
+    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash &&
+	BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG) &&
+	rb_hash_compare_by_id_p(recv) == Qfalse) {
 	rb_hash_aset(recv, key, val);
     }
     else {
@@ -1903,7 +1905,9 @@ opt_aref_with https://github.com/ruby/ruby/blob/trunk/ruby_2_4/insns.def#L1905
 (VALUE recv)
 (VALUE val)
 {
-    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG)) {
+    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash &&
+	BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG) &&
+	rb_hash_compare_by_id_p(recv) == Qfalse) {
 	val = rb_hash_aref(recv, key);
     }
     else {
@@ -2052,8 +2056,7 @@ opt_succ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/insns.def#L2056
 	    BASIC_OP_UNREDEFINED_P(BOP_SUCC, STRING_REDEFINED_OP_FLAG)) {
 	    val = rb_str_succ(recv);
 	}
-	else
-	  {
+	else {
 	    goto INSN_LABEL(normal_dispatch);
 	}
     }

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57278-57279


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/