Changeset 47775 in webkit for trunk/JavaScriptCore/runtime/Executable.cpp

Timestamp:

Aug 26, 2009, 12:46:47 AM (16 years ago)

Author:

[email protected]

Message:

How many copies of the parameters do you need?
​https://bugs.webkit.org/show_bug.cgi?id=28701

Reviewed by Darin Adler.

The function parameters in JSC get copied a lot - and unnecessarily so.

Originally this happened due to duplicating FunctionBodyNodes on recompilation,
though the problem has been exacerbated by copying the parameters from the
original function body onto the executable, then back onto the real body that
will be generated (this happens on every function). And this is all made worse
since the data structures in question are a little ugly - C style arrays of C++
objects containing ref counts, so they need a full copy-construct (rather than
a simple memcpy).

This can all be greatly simplified by just punting the parameters off into
their own ref-counted object, and forgoing all the copying.

~no performance change, possible slight progression.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::makeFunction):

• parser/Nodes.cpp:

(JSC::FunctionParameters::FunctionParameters):
(JSC::FunctionBodyNode::FunctionBodyNode):
(JSC::FunctionBodyNode::finishParsing):

• parser/Nodes.h:

(JSC::FunctionBodyNode::parameters):
(JSC::FunctionBodyNode::parameterCount):

• runtime/Executable.cpp:

(JSC::FunctionExecutable::~FunctionExecutable):
(JSC::FunctionExecutable::compile):
(JSC::FunctionExecutable::reparseExceptionInfo):
(JSC::FunctionExecutable::fromGlobalCode):
(JSC::FunctionExecutable::paramString):

• runtime/Executable.h:

(JSC::FunctionExecutable::FunctionExecutable):
(JSC::FunctionExecutable::parameterCount):

File:

• trunk/JavaScriptCore/runtime/Executable.cpp (modified) (4 diffs)

trunk/JavaScriptCore/runtime/Executable.cpp

@@ -57 +57 @@
 FunctionExecutable::~FunctionExecutable()
 {
-    for (int i = 0; i < m_parameterCount; ++i)
-        m_parameters[i].~Identifier();
-    fastFree(m_parameters);
     delete m_codeBlock;
 }
@@ -121 +118 @@
     if (m_forceUsesArguments)
         body->setUsesArguments();
-    body->finishParsing(copyParameters(), m_parameterCount, m_name);
+    body->finishParsing(m_parameters, m_name);
     recordParse(body->features(), body->lineNo(), body->lastLine());
 
@@ -186 +183 @@
     if (m_forceUsesArguments)
         newFunctionBody->setUsesArguments();
-    newFunctionBody->finishParsing(copyParameters(), m_parameterCount, m_name);
+    newFunctionBody->finishParsing(m_parameters, m_name);
 
     ScopeChain scopeChain(scopeChainNode);
@@ -263 +260 @@
     FunctionBodyNode* body = static_cast<FuncExprNode*>(funcExpr)->body();
     ASSERT(body);
-    return adoptRef(new FunctionExecutable(functionName, body->source(), body->usesArguments(), body->copyParameters(), body->parameterCount(), body->lineNo(), body->lastLine()));
-}
-
-Identifier* FunctionExecutable::copyParameters()
-{
-    // This code uses the internal vector copier to make copy-constructed copies of the data in the array
-    // (the array contains Identfiers which reference count Ustring::Reps, which must be ref'ed correctly).
-    Identifier* parameters = static_cast<Identifier*>(fastMalloc(m_parameterCount * sizeof(Identifier)));
-    WTF::VectorCopier<false, Identifier>::uninitializedCopy(m_parameters, m_parameters + m_parameterCount, parameters);
-    return parameters;
+    return FunctionExecutable::create(functionName, body->source(), body->usesArguments(), body->parameters(), body->lineNo(), body->lastLine());
 }
 
 UString FunctionExecutable::paramString() const
 {
+    FunctionParameters& parameters = *m_parameters;
     UString s("");
-    for (int pos = 0; pos < m_parameterCount; ++pos) {
+    for (size_t pos = 0; pos < parameters.size(); ++pos) {
         if (!s.isEmpty())
             s += ", ";
-        s += m_parameters[pos].ustring();
+        s += parameters[pos].ustring();
     }