Make sure the C-API handles are initialized before setting them

voxik · Oct 5, 2012 · 880ecc3 · 880ecc3
1 parent fd6fcea
commit 880ecc3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/vm/capi/handles.cpp b/vm/capi/handles.cpp
@@ -15,6 +15,7 @@ namespace rubinius {
       if(needs_gc) {
         state->memory()->collect_mature_now = true;
       }
+      atomic::memory_barrier();
       return handle;
     }
 
@@ -27,6 +28,7 @@ namespace rubinius {
       if(needs_gc) {
         state->memory()->collect_mature_now = true;
       }
+      atomic::memory_barrier();
       return handle_index;
     }
 

diff --git a/vm/oop.hpp b/vm/oop.hpp
@@ -299,7 +299,7 @@ Object* const cUndef = reinterpret_cast<Object*>(0x22L);
     }
 
     void set_handle(STATE, capi::Handle* handle) {
-      handle_ = handle;
+      atomic::write(&handle_, handle);
     }
 
     unsigned int inc_age() {