JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / bindings / ScriptFunctionCall.cpp

diff --git a/bindings/ScriptFunctionCall.cpp b/bindings/ScriptFunctionCall.cpp
index 2df7876410e78cf9fabf241786e60242fe4eee09..f7254d9a89b16a596fab30fac41b2ba2d9e5d91e 100644 (file)
--- a/bindings/ScriptFunctionCall.cpp
+++ b/bindings/ScriptFunctionCall.cpp
@@ -121,7 +121,7 @@ Deprecated::ScriptValue ScriptFunctionCall::call(bool& hadException)
 
     JSLockHolder lock(m_exec);
 
-    JSValue function = thisObject->get(m_exec, Identifier(m_exec, m_name));
+    JSValue function = thisObject->get(m_exec, Identifier::fromString(m_exec, m_name));
     if (m_exec->hadException()) {
         hadException = true;
         return Deprecated::ScriptValue();
@@ -133,11 +133,11 @@ Deprecated::ScriptValue ScriptFunctionCall::call(bool& hadException)
         return Deprecated::ScriptValue();
 
     JSValue result;
-    JSValue exception;
+    NakedPtr<Exception> exception;
     if (m_callHandler)
-        result = m_callHandler(m_exec, function, callType, callData, thisObject, m_arguments, &exception);
+        result = m_callHandler(m_exec, function, callType, callData, thisObject, m_arguments, exception);
     else
-        result = JSC::call(m_exec, function, callType, callData, thisObject, m_arguments, &exception);
+        result = JSC::call(m_exec, function, callType, callData, thisObject, m_arguments, exception);
 
     if (exception) {
         hadException = true;