Changeset 59811 in webkit for trunk/JavaScriptCore/runtime/JSFunction.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/JSFunction.cpp (modified) (7 diffs)

trunk/JavaScriptCore/runtime/JSFunction.cpp

@@ -44 +44 @@
 ASSERT_CLASS_FITS_IN_CELL(JSFunction);
 
-const ClassInfo JSFunction::info = { "Function", &InternalFunction::info, 0, 0 };
+const ClassInfo JSFunction::info = { "Function", 0, 0, 0 };
 
 bool JSFunction::isHostFunctionNonInline() const
@@ -59 +59 @@
 
 JSFunction::JSFunction(ExecState* exec, NonNullPassRefPtr<Structure> structure, int length, const Identifier& name, PassRefPtr<NativeExecutable> thunk)
-    : Base(&exec->globalData(), structure, name)
+    : Base(structure)
 #if ENABLE(JIT)
     , m_executable(thunk)
@@ -65 +65 @@
     , m_scopeChain(NoScopeChain())
 {
+    putDirect(exec->globalData().propertyNames->name, jsString(exec, name.isNull() ? "" : name.ustring()), DontDelete | ReadOnly | DontEnum);
 #if ENABLE(JIT)
     putDirect(exec->propertyNames().length, jsNumber(exec, length), DontDelete | ReadOnly | DontEnum);
@@ -75 +76 @@
 
 JSFunction::JSFunction(ExecState* exec, NonNullPassRefPtr<Structure> structure, int length, const Identifier& name, NativeFunction func)
-    : Base(&exec->globalData(), structure, name)
+    : Base(structure)
 #if ENABLE(JIT)
     , m_executable(exec->globalData().getHostFunction(func))
@@ -81 +82 @@
     , m_scopeChain(NoScopeChain())
 {
+    putDirect(exec->globalData().propertyNames->name, jsString(exec, name.isNull() ? "" : name.ustring()), DontDelete | ReadOnly | DontEnum);
 #if ENABLE(JIT)
     putDirect(exec->propertyNames().length, jsNumber(exec, length), DontDelete | ReadOnly | DontEnum);
@@ -91 +93 @@
 
 JSFunction::JSFunction(ExecState* exec, NonNullPassRefPtr<FunctionExecutable> executable, ScopeChainNode* scopeChainNode)
-    : Base(&exec->globalData(), exec->lexicalGlobalObject()->functionStructure(), executable->name())
+    : Base(exec->lexicalGlobalObject()->functionStructure())
     , m_executable(executable)
     , m_scopeChain(scopeChainNode)
 {
+    const Identifier& name = static_cast<FunctionExecutable*>(m_executable.get())->name();
+    putDirect(exec->globalData().propertyNames->name, jsString(exec, name.isNull() ? "" : name.ustring()), DontDelete | ReadOnly | DontEnum);
 }
 
@@ -115 +119 @@
 }
 
+const UString& JSFunction::name(ExecState* exec)
+{
+    return asString(getDirect(exec->globalData().propertyNames->name))->value(exec);
+}
+
+const UString JSFunction::displayName(ExecState* exec)
+{
+    JSValue displayName = getDirect(exec->globalData().propertyNames->displayName);
+    
+    if (displayName && isJSString(&exec->globalData(), displayName))
+        return asString(displayName)->value(exec);
+    
+    return UString::null();
+}
+
+const UString JSFunction::calculatedDisplayName(ExecState* exec)
+{
+    const UString explicitName = displayName(exec);
+    
+    if (!explicitName.isEmpty())
+        return explicitName;
+    
+    return name(exec);
+}
+
 void JSFunction::markChildren(MarkStack& markStack)
 {