merge revision(s) a05d5ecb1253521cf3b17815a97a152bac6c3399:

	[PATCH] Add write barriers on Hash#rehash

2 files changed, 4 insertions, 1 deletions

diff --git a/hash.c b/hash.c
index 39085ab1a4..abb50641c2 100644
--- a/hash.c
+++ b/hash.c
@@ -1982,6 +1982,9 @@ rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
     else {
         st_insert(RHASH_ST_TABLE(arg), (st_data_t)key, (st_data_t)value);
     }
+
+    RB_OBJ_WRITTEN(arg, Qundef, key);
+    RB_OBJ_WRITTEN(arg, Qundef, value);
     return ST_CONTINUE;
 }
 
diff --git a/version.h b/version.h
index 3261bf4a8b..739b2d1548 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 9
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 82
+#define RUBY_PATCHLEVEL 83
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"