summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-27 15:20:01 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-27 15:20:01 +0000
commitd76ab40bea1532214e8f22c46da7109b9e4c4766 (patch)
tree67dbd42d733a1685af430b7da550267580e56b86 /vm.c
parent787cde7f9ab12edafe7559f501a8e21d89e72d72 (diff)
* vm_core.h, thread.c: It is now prohibited to use Data_Get_Struct in
*_free against an object that is going to be free'ed. So, change type of thread_t#keeping_mutexes from VALUE to mutex_t. * vm.c: remove mark to keeping_mutexes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vm.c b/vm.c
index 5cc4658290..6636a52258 100644
--- a/vm.c
+++ b/vm.c
@@ -1478,7 +1478,7 @@ thread_free(void *ptr)
if (th->locking_mutex != Qfalse) {
rb_bug("thread_free: locking_mutex must be NULL (%p:%ld)", th, th->locking_mutex);
}
- if (th->keeping_mutexes != Qfalse) {
+ if (th->keeping_mutexes != NULL) {
rb_bug("thread_free: keeping_mutexes must be NULL (%p:%ld)", th, th->locking_mutex);
}
@@ -1551,7 +1551,6 @@ rb_thread_mark(void *ptr)
RUBY_MARK_UNLESS_NULL(th->last_status);
RUBY_MARK_UNLESS_NULL(th->locking_mutex);
- RUBY_MARK_UNLESS_NULL(th->keeping_mutexes);
rb_mark_tbl(th->local_storage);