From 32761a6cee1d0dee366b885b7b9c777e67885688 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Sun, 10 Apr 2016 09:28:39 +0000 Subject: webkitgtk-2.4.11 --- Source/JavaScriptCore/runtime/CallData.cpp | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'Source/JavaScriptCore/runtime/CallData.cpp') diff --git a/Source/JavaScriptCore/runtime/CallData.cpp b/Source/JavaScriptCore/runtime/CallData.cpp index 42c80ddb6..cf0ba7992 100644 --- a/Source/JavaScriptCore/runtime/CallData.cpp +++ b/Source/JavaScriptCore/runtime/CallData.cpp @@ -28,9 +28,8 @@ #include "Executable.h" #include "Interpreter.h" -#include "JSCInlines.h" #include "JSFunction.h" -#include "ScriptProfilingScope.h" +#include "Operations.h" namespace JSC { @@ -40,28 +39,4 @@ JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const C 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& 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; -} - -JSValue profiledCall(ExecState* exec, ProfilingReason reason, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args) -{ - ScriptProfilingScope profilingScope(exec->vmEntryGlobalObject(), reason); - return call(exec, functionObject, callType, callData, thisValue, args); -} - -JSValue profiledCall(ExecState* exec, ProfilingReason reason, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args, NakedPtr& returnedException) -{ - ScriptProfilingScope profilingScope(exec->vmEntryGlobalObject(), reason); - return call(exec, functionObject, callType, callData, thisValue, args, returnedException); -} - } // namespace JSC -- cgit v1.2.1