Changeset 34319 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Jun 2, 2008, 1:45:13 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-02 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

A little cleanup in the CodeGenerator.

• VM/CodeGenerator.cpp: A few changes here.

(1) Removed remaining cases of the old hack of putting "this" into the
symbol table; replaced with explicit tracking of m_thisRegister.

(2) Made m_thisRegister behave the same for function, eval, and program
code, removing the static programCodeThis() function.

(3) Added a feature to nix a ScopeNode's declaration stacks when done
compiling, to save memory.

(4) Removed code that copied eval declarations into special vectors: we
just use the originals in the ScopeNode now.

• VM/CodeGenerator.h: Removed unneded parameters from the CodeGenerator constructor: we just use get that data from the ScopeNode now.

• VM/Machine.cpp: (KJS::Machine::execute): When executing an eval node, don't iterate a special copy of its declarations; iterate the originals, instead.

• kjs/nodes.cpp: Moved responsibility for knowing what AST data to throw away into the CodeGenerator. Nodes no longer call shrinkCapacity on their data directly.

• kjs/nodes.h: Changed FunctionStack to ref its contents, so declaration data stays around even after we've thrown away the AST, unless we explicitly throw away the declaration data, too. This is useful for eval code, which needs to reference its declaration data at execution time. (Soon, it will be useful for program code, too, since program code should do the same.)

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (1 diff)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -763 +763 @@
     }
     
-    for (Vector<Identifier>::const_iterator iter = codeBlock->declaredVariableNames.begin(); iter != codeBlock->declaredVariableNames.end(); ++iter) {
-        Identifier ident = *iter;
-        
+    const Node::VarStack& varStack = codeBlock->ownerNode->varStack();
+    Node::VarStack::const_iterator varStackEnd = varStack.end();
+    for (Node::VarStack::const_iterator it = varStack.begin(); it != varStackEnd; ++it) {
+        const Identifier& ident = (*it).first;
         if (!variableObject->hasProperty(exec, ident))
             variableObject->put(exec, ident, jsUndefined());
     }
     
-    ASSERT(codeBlock->functions.size() == codeBlock->declaredFunctionNames.size());
-    for (size_t i = 0; i < codeBlock->functions.size(); ++i)
-        variableObject->put(exec, codeBlock->declaredFunctionNames[i], codeBlock->functions[i]->makeFunction(exec, scopeChain));
+    const Node::FunctionStack& functionStack = codeBlock->ownerNode->functionStack();
+    Node::FunctionStack::const_iterator functionStackEnd = functionStack.end();
+    for (Node::FunctionStack::const_iterator it = functionStack.begin(); it != functionStackEnd; ++it)
+        variableObject->put(exec, (*it)->m_ident, (*it)->makeFunction(exec, scopeChain));
     
     size_t oldSize = registerFile->size();