nagachika	2017-12-19 01:52:19 +0900 (Tue, 19 Dec 2017)

  New Revision: 61328

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

  Log:
    merge revision(s) 59748: [Backport #14073]
    
    st.c: fix num_entries
    
    * st.c (st_insert2): should manage num_entries when the key is
      undefined, as well as st_insert().

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/st.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/st.c
===================================================================
--- ruby_2_4/st.c	(revision 61327)
+++ ruby_2_4/st.c	(revision 61328)
@@ -1182,6 +1182,8 @@ st_insert2(st_table *tab, st_data_t key, https://github.com/ruby/ruby/blob/trunk/ruby_2_4/st.c#L1182
     if (tab->bins == NULL) {
         bin = find_entry(tab, hash_value, key);
 	new_p = bin == UNDEFINED_ENTRY_IND;
+	if (new_p)
+	    tab->num_entries++;
 	bin_ind = UNDEFINED_BIN_IND;
     } else {
         bin = find_table_bin_ptr_and_reserve(tab, &hash_value,
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 61327)
+++ ruby_2_4/version.h	(revision 61328)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.4"
-#define RUBY_RELEASE_DATE "2017-12-16"
-#define RUBY_PATCHLEVEL 206
+#define RUBY_RELEASE_DATE "2017-12-19"
+#define RUBY_PATCHLEVEL 207
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 61327)
+++ ruby_2_4	(revision 61328)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r59748

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