Merge pull request #30 from ruby/sync-ruby-core

Sync with ruby core

Author: peterzhu2118

gc/mmtk/mmtk.c

@@ -973,6 +973,8 @@ rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
 
     RBASIC(obj)->flags |= FL_FINALIZE;
 
+    int lev = rb_gc_vm_lock();
+
     if (st_lookup(objspace->finalizer_table, obj, &data)) {
         table = (VALUE)data;
 
@@ -984,6 +986,7 @@ rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
             for (i = 0; i < len; i++) {
                 VALUE recv = RARRAY_AREF(table, i);
                 if (rb_equal(recv, block)) {
+                    rb_gc_vm_unlock(lev);
                     return recv;
                 }
             }
@@ -997,6 +1000,8 @@ rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
         st_add_direct(objspace->finalizer_table, obj, table);
     }
 
+    rb_gc_vm_unlock(lev);
+
     return block;
 }