0
@@ -5,6 +5,8 @@
0
 #include "idhash.h"
0
 #include "jsdbgapi.h"
0
 
0
+extern int gc_phase;
0
+
0
 // callback for JS_SetErrorReporter
0
 static void report_js_error(JSContext* js, const char* message, JSErrorReport* UNUSED(report))
0
 {
0
@@ -90,11 +92,13 @@ initialize_native(VALUE self, VALUE rb_runtime, VALUE UNUSED(options))
0
 ///////////////////////////////////////////////////////////////////////////
0
 
0
 static void deallocate(JohnsonContext *context) {
0
+  ENTER_GC_PHASE;
0
   JS_SetContextPrivate(context->js, 0);
0
   /*
0
   JS_DestroyContext(context->js);
0
   free(context);
0
   */
0
+  LEAVE_GC_PHASE;
0
 }
0
 
0
 static VALUE allocate(VALUE klass)

0
@@ -1,6 +1,8 @@
0
 #include "ruby_land_proxy.h"
0
 #include "conversions.h"
0
 
0
+extern int gc_phase;
0
+
0
 DECLARE_RUBY_WRAPPER(rb_call_super, int argc; const VALUE* argv)
0
 DEFINE_RUBY_WRAPPER(rb_call_super, rb_call_super, ARGLIST2(argc, argv))
0
 
0
@@ -447,6 +449,8 @@ static VALUE to_s(VALUE self)
0
 
0
 static void finalize(RubyLandProxy* proxy)
0
 {
0
+  ENTER_GC_PHASE;
0
+
0
   // could get finalized after the context has been freed
0
   if (proxy->runtime && proxy->runtime->jsids)
0
   {
0
@@ -463,6 +467,8 @@ static void finalize(RubyLandProxy* proxy)
0
   }
0
 
0
   free(proxy);
0
+
0
+  LEAVE_GC_PHASE;
0
 }
0
 
0
 bool ruby_value_is_proxy(VALUE maybe_proxy)

0
@@ -6,6 +6,8 @@
0
 #include "jroot.h"
0
 #include "ruby_land_proxy.h"
0
 
0
+extern int gc_phase;
0
+
0
 /*
0
  * call-seq:
0
  *   global
0
@@ -217,6 +219,8 @@ JSBool gc_callback(JSContext *context, JSGCStatus status)
0
 {
0
   if(status == JSGC_BEGIN) {
0
     VALUE ruby_runtime = (VALUE)JS_GetRuntimePrivate(JS_GetRuntime(context));
0
+    if(gc_phase > 0)
0
+      return JS_FALSE;
0
     if(rb_funcall(ruby_runtime, rb_intern("should_sm_gc?"), 0) == Qtrue)
0
       return JS_TRUE;
0
   }
0
@@ -240,7 +244,7 @@ initialize_native(VALUE self, VALUE UNUSED(options))
0
     JSContext* context = johnson_get_current_context(runtime);
0
     if(
0
         (runtime->global = JS_GetGlobalObject(context))
0
-        && (JS_AddNamedRoot(context, &(runtime->global), "runtime->global"))
0
+        && (JS_AddNamedRootRT(runtime->js, &(runtime->global), "runtime->global"))
0
     ) {
0
       return self;
0
     }
0
@@ -270,18 +274,25 @@ JSContext* johnson_get_current_context(JohnsonRuntime * runtime)
0
 
0
 static void deallocate(JohnsonRuntime* runtime)
0
 {
0
-  JS_RemoveRoot(johnson_get_current_context(runtime), &(runtime->global));
0
-  
0
+  ENTER_GC_PHASE;
0
+
0
   JSContext *context = NULL;
0
   JSContext *iterator = NULL;
0
 
0
   while ((context = JS_ContextIterator(runtime->js, &iterator)) != NULL) {
0
+    if (runtime->global) {
0
+      JS_RemoveRootRT(runtime->js, &(runtime->global));
0
+      runtime->global = NULL;
0
+    }
0
+
0
     JS_DestroyContext(iterator);
0
     iterator = NULL;
0
   }
0
   
0
   JS_DestroyRuntime(runtime->js);
0
   free(runtime);
0
+
0
+  LEAVE_GC_PHASE;
0
 }
0
 
0
 static VALUE allocate(VALUE klass)

0
@@ -4,6 +4,8 @@
0
 #include "debugger.h"
0
 #include "immutable_node.h"
0
 
0
+int gc_phase = 0;
0
+
0
 void Init_spidermonkey()
0
 {
0
   VALUE johnson = rb_define_module("Johnson"); // FIXME: this belongs outside the extension

0
@@ -26,4 +26,7 @@
0
 # endif
0
 #endif
0
 
0
+#define ENTER_GC_PHASE do { gc_phase++; } while(0)
0
+#define LEAVE_GC_PHASE do { gc_phase--; } while(0)
0
+
0
 #endif