Fix GC issue when profiling

We need to guard these objects on the stack when we profile. This is
because the profiler should see them properly. When we GC in a
checkpoint we have to make sure to update the references for the
profiler.

vm/builtin/block_environment.cpp

@@ -314,15 +314,6 @@ namespace rubinius {
       }
     }
 
-    // Check the stack and interrupts here rather than in the interpreter
-    // loop itself.
-
-    GCTokenImpl gct;
-
-    if(!state->check_interrupts(gct, frame, frame)) return NULL;
-
-    state->checkpoint(gct, frame);
-
 #ifdef RBX_PROFILER
     if(unlikely(state->vm()->tooling())) {
       Module* mod = scope->module();
@@ -332,12 +323,39 @@ namespace rubinius {
         }
       }
 
+      OnStack<2> os(state, env, mod);
+
+      // Check the stack and interrupts here rather than in the interpreter
+      // loop itself.
+
+      GCTokenImpl gct;
+
+      if(!state->check_interrupts(gct, frame, frame)) return NULL;
+
+      state->checkpoint(gct, frame);
+
       tooling::BlockEntry method(state, env, mod);
       return (*mcode->run)(state, mcode, frame);
     } else {
+      // Check the stack and interrupts here rather than in the interpreter
+      // loop itself.
+
+      GCTokenImpl gct;
+
+      if(!state->check_interrupts(gct, frame, frame)) return NULL;
+
+      state->checkpoint(gct, frame);
       return (*mcode->run)(state, mcode, frame);
     }
 #else
+    // Check the stack and interrupts here rather than in the interpreter
+    // loop itself.
+
+    GCTokenImpl gct;
+
+    if(!state->check_interrupts(gct, frame, frame)) return NULL;
+
+    state->checkpoint(gct, frame);
     return (*mcode->run)(state, mcode, frame);
 #endif
   }

vm/builtin/nativefunction.cpp

@@ -93,6 +93,7 @@ namespace rubinius {
 
 #ifdef RBX_PROFILER
       if(unlikely(state->vm()->tooling())) {
+        OnStack<2> os(state, exec, mod);
         tooling::MethodEntry method(state, exec, mod, args);
         return nfunc->call(state, args, call_frame);
       } else {

vm/builtin/nativemethod.cpp

@@ -695,6 +695,7 @@ namespace rubinius {
     // trying to de-dup it.
 
     if(unlikely(state->vm()->tooling())) {
+      OnStack<2> os(state, exec, mod);
       tooling::MethodEntry method(state, exec, mod, args);
       PLACE_EXCEPTION_POINT(ep);
 

vm/codegen/field_extract.rb

@@ -70,6 +70,7 @@ def output_call(str, call, args)
     str << "  try {\n"
     str << "#ifdef RBX_PROFILER\n"
     str << "    if(unlikely(state->vm()->tooling())) {\n"
+    str << "      OnStack<2> os(state, exec, mod);\n"
     str << "      tooling::MethodEntry method(state, exec, mod, args);\n"
     str << "      ret = #{call}(#{args.join(', ')});\n"
     str << "    } else {\n"

vm/machine_code.cpp

@@ -615,20 +615,27 @@ namespace rubinius {
       }
 #endif
 
-      // Check the stack and interrupts here rather than in the interpreter
-      // loop itself.
-      if(!state->check_interrupts(gct, frame, frame)) return NULL;
-
-      state->checkpoint(gct, frame);
-
 #ifdef RBX_PROFILER
       if(unlikely(state->vm()->tooling())) {
+        OnStack<3> os(state, exec, mod, code);
+        // Check the stack and interrupts here rather than in the interpreter
+        // loop itself.
+        //if(!state->check_interrupts(gct, frame, frame)) return NULL;
+
+        //state->checkpoint(gct, frame);
+
         tooling::MethodEntry method(state, exec, mod, args, code);
         return (*mcode->run)(state, mcode, frame);
       } else {
+        if(!state->check_interrupts(gct, frame, frame)) return NULL;
+
+        state->checkpoint(gct, frame);
         return (*mcode->run)(state, mcode, frame);
       }
 #else
+      if(!state->check_interrupts(gct, frame, frame)) return NULL;
+
+      state->checkpoint(gct, frame);
       return (*mcode->run)(state, mcode, frame);
 #endif
     }

vm/method_primitives.cpp

@@ -4,6 +4,7 @@
 #include "gen/includes.hpp"
 #include "arguments.hpp"
 #include "call_frame.hpp"
+#include "on_stack.hpp"
 
 #include "instruments/tooling.hpp"