Changeset 92250 in webkit

Timestamp:

Aug 2, 2011 5:41:11 PM (13 years ago)

Author:

oliver@apple.com

Message:

Simplify JSFunction creation for functions written in JS
​https://bugs.webkit.org/show_bug.cgi?id=65422

Reviewed by Gavin Barraclough.

Remove hash lookups used to write name property and transition
function structure by caching the resultant structure and property
offset in JSGlobalObject. This doesn't impact performance, but
we can use this change to make other improvements later.

• runtime/Executable.cpp:

(JSC::FunctionExecutable::FunctionExecutable):

• runtime/Executable.h:

(JSC::ScriptExecutable::ScriptExecutable):
(JSC::FunctionExecutable::jsName):

• runtime/JSFunction.cpp:

(JSC::JSFunction::JSFunction):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::namedFunctionStructure):
(JSC::JSGlobalObject::functionNameOffset):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Executable.cpp (modified) (3 diffs)
• runtime/Executable.h (modified) (3 diffs)
• runtime/JSFunction.cpp (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (1 diff)
• runtime/JSGlobalObject.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-30  Oliver Hunt  <oliver@apple.com>
+
+        Simplify JSFunction creation for functions written in JS
+        https://bugs.webkit.org/show_bug.cgi?id=65422
+
+        Reviewed by Gavin Barraclough.
+
+        Remove hash lookups used to write name property and transition
+        function structure by caching the resultant structure and property
+        offset in JSGlobalObject.  This doesn't impact performance, but
+        we can use this change to make other improvements later.
+
+        * runtime/Executable.cpp:
+        (JSC::FunctionExecutable::FunctionExecutable):
+        * runtime/Executable.h:
+        (JSC::ScriptExecutable::ScriptExecutable):
+        (JSC::FunctionExecutable::jsName):
+        * runtime/JSFunction.cpp:
+        (JSC::JSFunction::JSFunction):
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::reset):
+        * runtime/JSGlobalObject.h:
+        (JSC::JSGlobalObject::namedFunctionStructure):
+        (JSC::JSGlobalObject::functionNameOffset):
+
 2011-08-02  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Executable.cpp

@@ -145 +145 @@
     m_firstLine = firstLine;
     m_lastLine = lastLine;
+    m_nameValue.set(globalData, this, jsString(&globalData, name.ustring()));
 }
 
@@ -157 +158 @@
     m_firstLine = firstLine;
     m_lastLine = lastLine;
+    m_nameValue.set(exec->globalData(), this, jsString(&exec->globalData(), name.ustring()));
 }
 
@@ -440 +442 @@
     ASSERT(structure()->typeInfo().overridesVisitChildren());
     ScriptExecutable::visitChildren(visitor);
+    if (m_nameValue)
+        visitor.append(&m_nameValue);
     if (m_codeBlockForCall)
         m_codeBlockForCall->visitAggregate(visitor);

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -227 +227 @@
 #if ENABLE(CODEBLOCK_SAMPLING)
             if (SamplingTool* sampler = globalData.interpreter->sampler())
-                sampler->notifyOfScope(*globalData, this);
+                sampler->notifyOfScope(globalData, this);
 #else
             UNUSED_PARAM(globalData);
@@ -479 +479 @@
 
         const Identifier& name() { return m_name; }
+        JSString* nameValue() const { return m_nameValue.get(); }
         size_t parameterCount() const { return m_parameters->size(); }
         unsigned capturedVariableCount() const { return m_numCapturedVariables; }
@@ -510 +511 @@
         OwnPtr<FunctionCodeBlock> m_codeBlockForConstruct;
         Identifier m_name;
+        WriteBarrier<JSString> m_nameValue;
         SharedSymbolTable* m_symbolTable;
     };

trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

@@ -91 +91 @@
 {
     ASSERT(inherits(&s_info));
-    const Identifier& name = static_cast<FunctionExecutable*>(m_executable.get())->name();
-    putDirect(exec->globalData(), exec->globalData().propertyNames->name, jsString(exec, name.isNull() ? "" : name.ustring()), DontDelete | ReadOnly | DontEnum);
+    setStructure(exec->globalData(), scopeChainNode->globalObject->namedFunctionStructure());
+    putDirectOffset(exec->globalData(), scopeChainNode->globalObject->functionNameOffset(), executable->nameValue());
 }
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -188 +188 @@
     m_functionPrototype.set(exec->globalData(), this, FunctionPrototype::create(exec, this, FunctionPrototype::createStructure(exec->globalData(), jsNull()))); // The real prototype will be set once ObjectPrototype is created.
     m_functionStructure.set(exec->globalData(), this, JSFunction::createStructure(exec->globalData(), m_functionPrototype.get()));
+    m_namedFunctionStructure.set(exec->globalData(), this, Structure::addPropertyTransition(exec->globalData(), m_functionStructure.get(), exec->globalData().propertyNames->name, DontDelete | ReadOnly | DontEnum, 0, m_functionNameOffset));
     m_internalFunctionStructure.set(exec->globalData(), this, InternalFunction::createStructure(exec->globalData(), m_functionPrototype.get()));
     JSFunction* callFunction = 0;

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -117 +117 @@
         WriteBarrier<Structure> m_errorStructure;
         WriteBarrier<Structure> m_functionStructure;
+        WriteBarrier<Structure> m_namedFunctionStructure;
+        size_t m_functionNameOffset;
         WriteBarrier<Structure> m_numberObjectStructure;
         WriteBarrier<Structure> m_regExpMatchesArrayStructure;
@@ -230 +232 @@
         Structure* errorStructure() const { return m_errorStructure.get(); }
         Structure* functionStructure() const { return m_functionStructure.get(); }
+        Structure* namedFunctionStructure() const { return m_namedFunctionStructure.get(); }
+        size_t functionNameOffset() const { return m_functionNameOffset; }
         Structure* numberObjectStructure() const { return m_numberObjectStructure.get(); }
         Structure* internalFunctionStructure() const { return m_internalFunctionStructure.get(); }