Changeset 43661 in webkit for trunk/JavaScriptCore/parser/NodeConstructors.h

Timestamp:

May 13, 2009, 2:53:59 PM (16 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2009-05-13 Darin Adler <Darin Adler>

Revert the parser arena change. It was a slowdown, not a speedup.
Better luck next time (I'll break it up into pieces).

WebCore:

2009-05-13 Darin Adler <Darin Adler>

Revert the parser arena change. It was a slowdown, not a speedup.
Better luck next time (I'll break it up into pieces).

WebKit/mac:

2009-05-13 Darin Adler <Darin Adler>

Revert the parser arena change. It was a slowdown, not a speedup.
Better luck next time (I'll break it up into pieces).

File:

• trunk/JavaScriptCore/parser/NodeConstructors.h (modified) (7 diffs)

trunk/JavaScriptCore/parser/NodeConstructors.h

@@ -28 +28 @@
 namespace JSC {
 
-    inline void* ParserArenaFreeable::operator new(size_t size, JSGlobalData* globalData)
-    {
-        return globalData->parser->arena().allocateFreeable(size);
-    }
-
     inline void* ParserArenaDeletable::operator new(size_t size, JSGlobalData* globalData)
     {
-        return globalData->parser->arena().allocateDeletable(size);
+        ParserArenaDeletable* deletable = static_cast<ParserArenaDeletable*>(fastMalloc(size));
+        globalData->parser->arena().deleteWithArena(deletable);
+        return deletable;
+    }
+
+    inline void* ParserArenaDeletable::operator new(size_t size)
+    {
+        return fastMalloc(size);
     }
 
@@ -77 +79 @@
     }
 
-    inline StringNode::StringNode(JSGlobalData* globalData, const Identifier& value)
+    inline StringNode::StringNode(JSGlobalData* globalData, const Identifier& v)
         : ExpressionNode(globalData, ResultType::stringType())
-        , m_value(value)
-    {
-    }
-
-    inline RegExpNode::RegExpNode(JSGlobalData* globalData, const Identifier& pattern, const Identifier& flags)
+        , m_value(v)
+    {
+    }
+
+    inline RegExpNode::RegExpNode(JSGlobalData* globalData, const UString& pattern, const UString& flags)
         : ExpressionNode(globalData)
         , m_pattern(pattern)
@@ -143 +145 @@
     inline PropertyNode::PropertyNode(JSGlobalData*, const Identifier& name, ExpressionNode* assign, Type type)
         : m_name(name)
-        , m_assign(assign)
-        , m_type(type)
-    {
-    }
-
-    inline PropertyNode::PropertyNode(JSGlobalData* globalData, double name, ExpressionNode* assign, Type type)
-        : m_name(globalData->parser->arena().makeNumericIdentifier(globalData, name))
         , m_assign(assign)
         , m_type(type)
@@ -742 +737 @@
     inline ContinueNode::ContinueNode(JSGlobalData* globalData)
         : StatementNode(globalData)
-        , m_ident(globalData->propertyNames->nullIdentifier)
     {
     }
@@ -754 +748 @@
     inline BreakNode::BreakNode(JSGlobalData* globalData)
         : StatementNode(globalData)
-        , m_ident(globalData->propertyNames->nullIdentifier)
     {
     }
@@ -833 +826 @@
     }
 
-    inline CaseClauseNode::CaseClauseNode(JSGlobalData*, ExpressionNode* expr, SourceElements* statements)
+    inline CaseClauseNode::CaseClauseNode(JSGlobalData*, ExpressionNode* expr)
         : m_expr(expr)
-        , m_statements(statements)
-    {
+    {
+    }
+
+    inline CaseClauseNode::CaseClauseNode(JSGlobalData*, ExpressionNode* expr, SourceElements* children)
+        : m_expr(expr)
+    {
+        if (children)
+            children->releaseContentsIntoVector(m_children);
     }
 
@@ -874 +873 @@
     }
 
-    inline BlockNode::BlockNode(JSGlobalData* globalData, SourceElements* statements)
-        : StatementNode(globalData)
-        , m_statements(statements)
-    {
+    inline BlockNode::BlockNode(JSGlobalData* globalData, SourceElements* children)
+        : StatementNode(globalData)
+    {
+        if (children)
+            children->releaseContentsIntoVector(m_children);
     }
 
     inline ForInNode::ForInNode(JSGlobalData* globalData, ExpressionNode* l, ExpressionNode* expr, StatementNode* statement)
         : StatementNode(globalData)
-        , m_ident(globalData->propertyNames->nullIdentifier)
         , m_init(0)
         , m_lexpr(l)