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

Timestamp:

Sep 9, 2012, 10:10:21 AM (13 years ago)

Author:

[email protected]

Message:

Rolled out <​http://trac.webkit.org/changeset/127939> because it broke
fast/js/named-function-expression.html.

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

Reviewed by Gavin Barraclough.

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(DeclarationStacks::FunctionDeclaration(decl->body()));
+        m_scope.m_funcDeclarations->data.append(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(DeclarationStacks::VarDeclaration(ident, attrs));
+        m_scope.m_varDeclarations->data.append(std::make_pair(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<VarDeclaration> VarStack;
-        typedef Vector<FunctionDeclaration> FunctionStack;
+        typedef Vector<std::pair<const Identifier*, unsigned> > VarStack;
+        typedef Vector<FunctionBodyNode*> FunctionStack;
     }