JavaScriptCore-1218.35.tar.gz

[apple/javascriptcore.git] / runtime / CallData.cpp

diff --git a/runtime/CallData.cpp b/runtime/CallData.cpp
index 62e42fef5ca59d78190167382c42109179b26900..8e1d1948636d638d8fc5d7f8615d2cfccc149dce 100644 (file)
--- a/runtime/CallData.cpp
+++ b/runtime/CallData.cpp
@@ -26,17 +26,18 @@
 #include "config.h"
 #include "CallData.h"
 
 #include "config.h"
 #include "CallData.h"
 

+#include "Executable.h"
+#include "Interpreter.h"

 #include "JSFunction.h"
 #include "JSFunction.h"

+#include "Operations.h"

 
 namespace JSC {
 
 JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args)
 {
 
 namespace JSC {
 
 JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args)
 {

-    if (callType == CallTypeHost)
-        return callData.native.function(exec, asObject(functionObject), thisValue, args);
-    ASSERT(callType == CallTypeJS);
-    // FIXME: Can this be done more efficiently using the callData?
-    return asFunction(functionObject)->call(exec, thisValue, args);
+    ASSERT(callType == CallTypeJS || callType == CallTypeHost);
+    ASSERT(isValidThisObject(thisValue, exec));
+    return exec->interpreter()->executeCall(exec, asObject(functionObject), callType, callData, thisValue, args);

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC