Fixed custom call site dispatch.

This abstruse mechanism will be cleaned up with the call site and inline cache rewrite.
rubinius · Apr 3, 2016 · cfd3f08 · cfd3f08
1 parent 90bbc42
commit cfd3f08
Showing 1 changed file with 36 additions and 4 deletions.
diff --git a/machine/builtin/call_site.cpp b/machine/builtin/call_site.cpp
@@ -58,7 +58,15 @@ namespace rubinius {
     Executable* meth = dispatch.method;
     Module* mod = dispatch.module;
 
-    return meth->execute(state, meth, mod, args);
+    if(meth->custom_call_site_p()) {
+      CallSiteInformation info(call_site->executable(), call_site->ip());
+      state->set_call_site_information(&info);
+      Object* res = meth->execute(state, meth, mod, args);
+      state->set_call_site_information(NULL);
+      return res;
+    } else {
+      return meth->execute(state, meth, mod, args);
+    }
   }
 
   Object* CallSite::empty_cache_private(STATE, CallSite* call_site,
@@ -85,7 +93,15 @@ namespace rubinius {
     Executable* meth = dispatch.method;
     Module* mod = dispatch.module;
 
-    return meth->execute(state, meth, mod, args);
+    if(meth->custom_call_site_p()) {
+      CallSiteInformation info(call_site->executable(), call_site->ip());
+      state->set_call_site_information(&info);
+      Object* res = meth->execute(state, meth, mod, args);
+      state->set_call_site_information(NULL);
+      return res;
+    } else {
+      return meth->execute(state, meth, mod, args);
+    }
   }
 
   Object* CallSite::empty_cache_vcall(STATE, CallSite* call_site, Arguments& args) {
@@ -111,7 +127,15 @@ namespace rubinius {
     Executable* meth = dispatch.method;
     Module* mod = dispatch.module;
 
-    return meth->execute(state, meth, mod, args);
+    if(meth->custom_call_site_p()) {
+      CallSiteInformation info(call_site->executable(), call_site->ip());
+      state->set_call_site_information(&info);
+      Object* res = meth->execute(state, meth, mod, args);
+      state->set_call_site_information(NULL);
+      return res;
+    } else {
+      return meth->execute(state, meth, mod, args);
+    }
   }
 
   Object* CallSite::empty_cache_super(STATE, CallSite* call_site,
@@ -163,7 +187,15 @@ namespace rubinius {
     Executable* meth = dispatch.method;
     Module* mod = dispatch.module;
 
-    return meth->execute(state, meth, mod, args);
+    if(meth->custom_call_site_p()) {
+      CallSiteInformation info(call_site->executable(), call_site->ip());
+      state->set_call_site_information(&info);
+      Object* res = meth->execute(state, meth, mod, args);
+      state->set_call_site_information(NULL);
+      return res;
+    } else {
+      return meth->execute(state, meth, mod, args);
+    }
   }
 
   void CallSite::empty_cache_updater(STATE, CallSite* call_site, Class* klass, Dispatch& dispatch) {