JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/runtime/CallData.cpp b/runtime/CallData.cpp
index ff71fa0cbb6d52211195b084887e3d3453956757..31c28c3364b2de1294eea2555fbb4f3bed0583b6 100644 (file)
--- a/runtime/CallData.cpp
+++ b/runtime/CallData.cpp
@@ -29,14 +29,26 @@
 #include "Executable.h"
 #include "Interpreter.h"
 #include "JSFunction.h"
 #include "Executable.h"
 #include "Interpreter.h"
 #include "JSFunction.h"

+#include "JSCInlines.h"

 
 namespace JSC {
 
 JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args)
 {
     ASSERT(callType == CallTypeJS || callType == CallTypeHost);
 
 namespace JSC {
 
 JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args)
 {
     ASSERT(callType == CallTypeJS || callType == CallTypeHost);

-    ASSERT(isValidThisObject(thisValue, exec));

     return exec->interpreter()->executeCall(exec, asObject(functionObject), callType, callData, thisValue, args);
 }
 
     return exec->interpreter()->executeCall(exec, asObject(functionObject), callType, callData, thisValue, args);
 }
 

+JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args, NakedPtr<Exception>& returnedException)
+{
+    JSValue result = call(exec, functionObject, callType, callData, thisValue, args);
+    if (exec->hadException()) {
+        returnedException = exec->exception();
+        exec->clearException();
+        return jsUndefined();
+    }
+    RELEASE_ASSERT(result);
+    return result;
+}
+

 } // namespace JSC
 } // namespace JSC