summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-08-27 05:28:30 (GMT)
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-08-27 05:28:30 (GMT)
commit8536f671b2f62f995a301a928a482e3b49b270d3 (patch)
tree38a528aa3281e45178b9292ebc048fbc06c88123
parentb67fae3712b782c7910a2b85ef7302eda7562c25 (diff)
merge revision(s) 1613917ae64: [Backport #15784]
Defer setting gc_stress instead of setting dont_gc [Bug #15784] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--gc.c8
-rw-r--r--version.h2
2 files changed, 2 insertions, 8 deletions
diff --git a/gc.c b/gc.c
index 7c972f5..c02ac62 100644
--- a/gc.c
+++ b/gc.c
@@ -2386,12 +2386,6 @@ Init_heap(void)
{
rb_objspace_t *objspace = &rb_objspace;
- gc_stress_set(objspace, ruby_initial_gc_stress);
-
- dont_gc = 1;
-
- gc_stress_set(objspace, ruby_initial_gc_stress);
-
#if RGENGC_ESTIMATE_OLDMALLOC
objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
#endif
@@ -2418,7 +2412,7 @@ Init_gc_stress(void)
{
rb_objspace_t *objspace = &rb_objspace;
- dont_gc = 0;
+ gc_stress_set(objspace, ruby_initial_gc_stress);
}
typedef int each_obj_callback(void *, void *, size_t, void *);
diff --git a/version.h b/version.h
index c4da852..17bb5c8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.6"
#define RUBY_RELEASE_DATE "2019-08-27"
-#define RUBY_PATCHLEVEL 195
+#define RUBY_PATCHLEVEL 196
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 8