aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gc.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3542647e93..4cd228948e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 13 18:04:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (rb_gc_finalize_deferred, rb_objspace_call_finalizer):
+ should use ATOMIC_EXCHANGE() to check the previous value.
+ [ruby-dev:44596] [Bug #5439]
+
Wed Oct 12 23:39:58 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
* test/openssl/test_ssl.rb: Move duplicated tests for SSL::Session to
diff --git a/gc.c b/gc.c
index 8840771c2f..ccd74412bd 100644
--- a/gc.c
+++ b/gc.c
@@ -2977,7 +2977,7 @@ void
rb_gc_finalize_deferred(void)
{
rb_objspace_t *objspace = &rb_objspace;
- if (ATOMIC_SET(finalizing, 1)) return;
+ if (ATOMIC_EXCHANGE(finalizing, 1)) return;
finalize_deferred(objspace);
ATOMIC_SET(finalizing, 0);
}
@@ -3031,7 +3031,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
/* run finalizers */
gc_clear_mark_on_sweep_slots(objspace);
- if (ATOMIC_SET(finalizing, 1)) return;
+ if (ATOMIC_EXCHANGE(finalizing, 1)) return;
do {
/* XXX: this loop will make no sense */