Changeset 59811 in webkit for trunk/JavaScriptCore/runtime/JSObject.cpp

Timestamp:

May 19, 2010, 7:38:01 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Bug 39393 - JSFunction need not be a subclass of InternalFunction.

Reviewed by Oliver Hunt.

re-landing r59800.

• JavaScriptCore.exp:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::retrieveCaller):
(JSC::Interpreter::findFunctionCallFrame):

• interpreter/Interpreter.h:
• profiler/Profiler.cpp:

(JSC::Profiler::createCallIdentifier):

• runtime/FunctionPrototype.cpp:

(JSC::functionProtoFuncToString):

• runtime/JSFunction.cpp:

(JSC::):
(JSC::JSFunction::JSFunction):
(JSC::JSFunction::name):
(JSC::JSFunction::displayName):
(JSC::JSFunction::calculatedDisplayName):

• runtime/JSFunction.h:
• runtime/JSObject.cpp:

(JSC::JSObject::putDirectFunction):
(JSC::JSObject::putDirectFunctionWithoutTransition):

• runtime/JSObject.h:
• runtime/Lookup.cpp:

(JSC::setUpStaticFunctionSlot):

WebCore: Rubber Stamped by Sam Weinig.

JSFunctions are no longer a subclass of InternalFunction.

• bindings/js/ScriptCallStack.cpp:

(WebCore::ScriptCallStack::ScriptCallStack):
(WebCore::ScriptCallStack::initialize):

• bindings/js/ScriptCallStack.h:

File:

• trunk/JavaScriptCore/runtime/JSObject.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/JSObject.cpp

@@ -28 +28 @@
 #include "ErrorConstructor.h"
 #include "GetterSetter.h"
+#include "JSFunction.h"
 #include "JSGlobalObject.h"
 #include "NativeErrorConstructor.h"
@@ -510 +511 @@
 }
 
+void JSObject::putDirectFunction(ExecState* exec, JSFunction* function, unsigned attr)
+{
+    putDirectFunction(Identifier(exec, function->name(exec)), function, attr);
+}
+
 void JSObject::putDirectFunctionWithoutTransition(ExecState* exec, InternalFunction* function, unsigned attr)
+{
+    putDirectFunctionWithoutTransition(Identifier(exec, function->name(exec)), function, attr);
+}
+
+void JSObject::putDirectFunctionWithoutTransition(ExecState* exec, JSFunction* function, unsigned attr)
 {
     putDirectFunctionWithoutTransition(Identifier(exec, function->name(exec)), function, attr);