Changeset 34319 in webkit for trunk/JavaScriptCore/kjs

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.)

Location:

trunk/JavaScriptCore/kjs

Files:

• nodes.cpp (modified) (5 diffs)
• nodes.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -5851 +5851 @@
     m_code.set(new EvalCodeBlock(this, globalObject));
 
-    CodeGenerator generator(this, globalObject->debugger(), scopeChain, &symbolTable, m_code.get(), m_varStack, m_functionStack);
+    CodeGenerator generator(this, globalObject->debugger(), scopeChain, &symbolTable, m_code.get());
     generator.generate();
-
-    m_children.shrinkCapacity(0);
 }
 
@@ -5891 +5889 @@
     m_code.set(new CodeBlock(this));
 
-    CodeGenerator generator(this, globalObject->debugger(), scopeChain, &m_symbolTable, m_code.get(), m_varStack, m_functionStack, m_parameters);
+    CodeGenerator generator(this, globalObject->debugger(), scopeChain, &m_symbolTable, m_code.get());
     generator.generate();
-
-    m_children.shrinkCapacity(0);
 }
 
@@ -5931 +5927 @@
     CodeGenerator generator(this, globalObject->debugger(), scopeChain, &globalObject->symbolTable(), m_code.get(), m_varStack, m_functionStack, canCreateGlobals);
     generator.generate();
-
-    m_children.shrinkCapacity(0);
 }
 
@@ -6031 +6025 @@
 
     for (size_t i = 0, size = m_functionStack.size(); i < size; ++i) {
-        FuncDeclNode* node = m_functionStack[i];
+        FuncDeclNode* node = m_functionStack[i].get();
         LocalStorageEntry entry = LocalStorageEntry(node->makeFunction(exec, exec->scopeChain().node()), minAttributes);
         size_t index = m_functionIndexes[i];
@@ -6081 +6075 @@
 
     for (i = 0, size = m_functionStack.size(); i < size; ++i) {
-        FuncDeclNode* funcDecl = m_functionStack[i];
+        FuncDeclNode* funcDecl = m_functionStack[i].get();
         variableObject->putWithAttributes(exec, funcDecl->m_ident, funcDecl->makeFunction(exec, exec->scopeChain().node()), 0);
     }

trunk/JavaScriptCore/kjs/nodes.h

@@ -100 +100 @@
         enum { IsConstant = 1, HasInitializer = 2 } VarAttrs;
         typedef Vector<std::pair<Identifier, unsigned>, 16> VarStack;
-        typedef Vector<FuncDeclNode*, 16> FunctionStack;
+        typedef Vector<RefPtr<FuncDeclNode>, 16> FunctionStack;
 
         DeclarationStacks(ExecState* e, NodeStack& n, VarStack& v, FunctionStack& f)
@@ -2621 +2621 @@
         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
 
+        StatementVector& children() { return m_children; }
+
     protected:
         StatementVector m_children;
@@ -2959 +2961 @@
         bool usesEval() const { return m_usesEval; }
         bool needsClosure() const { return m_needsClosure; }
-
+        
+        VarStack& varStack() { return m_varStack; }
+        FunctionStack& functionStack() { return m_functionStack; }
+        
     protected:
         void optimizeVariableAccess(OldInterpreterExecState*) KJS_FAST_CALL;