Changeset 43259 in webkit for trunk/JavaScriptCore/parser/Nodes.h

Timestamp:

May 5, 2009, 4:09:52 PM (16 years ago)

Author:

Darin Adler

Message:

2009-05-05 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

Bug 25569: make ParserRefCounted use conventional reference counting
​https://bugs.webkit.org/show_bug.cgi?id=25569

SunSpider speedup of about 1.6%.

• JavaScriptCore.exp: Updated.

• parser/Nodes.cpp: (JSC::NodeReleaser::releaseAllNodes): ALWAYS_INLINE. (JSC::NodeReleaser::adopt): Ditto. (JSC::ParserRefCounted::ParserRefCounted): Removed most of the code. Add the object to a Vector<RefPtr> that gets cleared after parsing. (JSC::ParserRefCounted::~ParserRefCounted): Removed most of the code.

• parser/Nodes.h: Made ParserRefCounted inherit from RefCounted and made inline versions of the constructor and destructor. Made the Node constructor inline.

• parser/Parser.cpp: (JSC::Parser::parse): Call globalData->parserObjects.shrink(0) after parsing, where it used to call ParserRefCounted::deleteNewObjects.

• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData): Eliminated code to manage the newParserObjects and parserObjectExtraRefCounts. (JSC::JSGlobalData::~JSGlobalData): Ditto.

• runtime/JSGlobalData.h: Replaced the HashSet and HashCountedSet with a Vector.

• wtf/PassRefPtr.h: (WTF::PassRefPtr::~PassRefPtr): The most common thing to do with a PassRefPtr in hot code is to pass it and then destroy it once it's set to zero. Help the optimizer by telling it that's true.

File:

• trunk/JavaScriptCore/parser/Nodes.h (modified) (4 diffs)

trunk/JavaScriptCore/parser/Nodes.h

@@ -29 +29 @@
 #include "Error.h"
 #include "JITCode.h"
+#include "Lexer.h"
 #include "Opcode.h"
 #include "ResultType.h"
@@ -35 +36 @@
 #include <wtf/MathExtras.h>
 #include <wtf/OwnPtr.h>
-#include <wtf/Vector.h>
 
 #if PLATFORM(X86) && COMPILER(GCC)
@@ -103 +103 @@
     };
 
-    class ParserRefCounted : Noncopyable {
+    class ParserRefCounted : public RefCounted<ParserRefCounted> {
     protected:
         ParserRefCounted(JSGlobalData*) JSC_FAST_CALL;
@@ -112 +112 @@
         // Nonrecursive destruction.
         virtual void releaseNodes(NodeReleaser&);
-
-        void ref() JSC_FAST_CALL;
-        void deref() JSC_FAST_CALL;
-        bool hasOneRef() JSC_FAST_CALL;
-
-        static void deleteNewObjects(JSGlobalData*) JSC_FAST_CALL;
-
-    private:
-        JSGlobalData* m_globalData;
-    };
+    };
+
+#ifdef NDEBUG
+    inline ParserRefCounted::ParserRefCounted(JSGlobalData* globalData)
+    {
+        globalData->parserObjects.append(adoptRef(this));
+    }
+
+    inline ParserRefCounted::~ParserRefCounted()
+    {
+    }
+#endif
 
     class Node : public ParserRefCounted {
     public:
-        Node(JSGlobalData*) JSC_FAST_CALL;
+        Node(JSGlobalData* globalData) JSC_FAST_CALL
+            : ParserRefCounted(globalData)
+            , m_line(globalData->lexer->lineNumber())
+        {
+        }
 
         /*