Changeset 127939 in webkit for trunk/Source/JavaScriptCore/parser

Timestamp:

Sep 7, 2012, 4:59:10 PM (13 years ago)

Author:

[email protected]

Message:

Refactored bytecode generator initialization to support moving captured vars around
​https://bugs.webkit.org/show_bug.cgi?id=96159

Reviewed by Gavin Barraclough.

This patch separates the stages of allocating registers, declaring identifiers
in the symbol table, and initializing registers, so you can change
allocation decisions without breaking the world.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator): Call a set of helper functions
instead of inlining all the code, to help clarity.

(JSC::BytecodeGenerator::allocateCapturedVars):
(JSC::BytecodeGenerator::allocateUncapturedVars):
(JSC::BytecodeGenerator::allocateActivationVar):
(JSC::BytecodeGenerator::allocateArgumentsVars):
(JSC::BytecodeGenerator::allocateCalleeVarUndeclared):
(JSC::BytecodeGenerator::declareParameters):
(JSC::BytecodeGenerator::declareCallee):
(JSC::BytecodeGenerator::initCalleeVar):
(JSC::BytecodeGenerator::initArgumentsVars):
(JSC::BytecodeGenerator::initActivationVar):
(JSC::BytecodeGenerator::initThisParameter):
(JSC::BytecodeGenerator::initFunctionDeclarations):
(JSC::BytecodeGenerator::declareParameter):
(JSC::BytecodeGenerator::createLazyRegisterIfNecessary):
(JSC::BytecodeGenerator::createActivationIfNecessary): Factored these
helper functions out from pre-existing code.

• bytecompiler/BytecodeGenerator.h:

(BytecodeGenerator):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createFuncDeclStatement):
(JSC::ASTBuilder::addVar):

• parser/Nodes.h:

(JSC::DeclarationStacks::VarDeclaration::VarDeclaration):
(VarDeclaration):
(JSC::DeclarationStacks::FunctionDeclaration::FunctionDeclaration):
(FunctionDeclaration): Declaration stacks get a little more data now,
to support allocating registers before putting things in the symbol
table. I'm convinced that we should eventually just expand the symbol
table to understand these things.

Location:

trunk/Source/JavaScriptCore/parser

Files:

• ASTBuilder.h (modified) (2 diffs)
• Nodes.h (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/ASTBuilder.h

@@ -315 +315 @@
         if (*name == m_globalData->propertyNames->arguments)
             usesArguments();
-        m_scope.m_funcDeclarations->data.append(decl->body());
+        m_scope.m_funcDeclarations->data.append(DeclarationStacks::FunctionDeclaration(decl->body()));
         body->setLoc(bodyStartLine, bodyEndLine, location.column);
         return decl;
@@ -509 +509 @@
         if (m_globalData->propertyNames->arguments == *ident)
             usesArguments();
-        m_scope.m_varDeclarations->data.append(std::make_pair(ident, attrs));
+        m_scope.m_varDeclarations->data.append(DeclarationStacks::VarDeclaration(ident, attrs));
     }
 

trunk/Source/JavaScriptCore/parser/Nodes.h

@@ -86 +86 @@
 
     namespace DeclarationStacks {
+        struct VarDeclaration {
+            VarDeclaration(const Identifier* name, unsigned attributes)
+                : name(name)
+                , attributes(attributes)
+                , reg(0)
+            {
+            }
+            const Identifier* name;
+            unsigned attributes;
+            RegisterID* reg;
+        };
+        struct FunctionDeclaration {
+            explicit FunctionDeclaration(FunctionBodyNode* node)
+                : node(node)
+                , reg(0)
+            {
+            }
+            FunctionBodyNode* node;
+            RegisterID* reg;
+        };
         enum VarAttrs { IsConstant = 1, HasInitializer = 2 };
-        typedef Vector<std::pair<const Identifier*, unsigned> > VarStack;
-        typedef Vector<FunctionBodyNode*> FunctionStack;
+        typedef Vector<VarDeclaration> VarStack;
+        typedef Vector<FunctionDeclaration> FunctionStack;
     }