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

Timestamp:

Aug 20, 2009, 11:04:37 AM (16 years ago)

Author:

[email protected]

Message:

Roll out r47571 and related build fixes as it caused us to leak the world without warning.

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);
+    }
+
+    inline void ParserArenaDeletable::operator delete(void* p)
+    {
+        fastFree(p);
     }
 
@@ -71 +78 @@
     }
 
-    inline NumberNode::NumberNode(JSGlobalData* globalData, double value)
+    inline NumberNode::NumberNode(JSGlobalData* globalData, double v)
         : ExpressionNode(globalData, ResultType::numberType())
-        , m_value(value)
-    {
-    }
-
-    inline StringNode::StringNode(JSGlobalData* globalData, const Identifier& value)
+        , m_double(v)
+    {
+    }
+
+    inline StringNode::StringNode(JSGlobalData* globalData, const Identifier& v)
         : ExpressionNode(globalData, ResultType::stringType())
-        , m_value(value)
+        , m_value(v)
     {
     }
@@ -149 +156 @@
 
     inline PropertyNode::PropertyNode(JSGlobalData* globalData, double name, ExpressionNode* assign, Type type)
-        : m_name(globalData->parser->arena().identifierArena().makeNumericIdentifier(globalData, name))
+        : m_name(Identifier(globalData, UString::from(name)))
         , m_assign(assign)
         , m_type(type)
@@ -742 +749 @@
     inline ContinueNode::ContinueNode(JSGlobalData* globalData)
         : StatementNode(globalData)
-        , m_ident(globalData->propertyNames->nullIdentifier)
     {
     }
@@ -754 +760 @@
     inline BreakNode::BreakNode(JSGlobalData* globalData)
         : StatementNode(globalData)
-        , m_ident(globalData->propertyNames->nullIdentifier)
     {
     }
@@ -829 +834 @@
     }
 
-    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);
     }
 
@@ -870 +881 @@
     }
 
-    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)