Changeset 110266 in webkit for trunk/Source/JavaScriptCore/runtime/RegExpObject.h

Timestamp:

Mar 8, 2012, 10:49:55 PM (13 years ago)

Author:

[email protected]

Message:

Allocate the RegExpObject's data with the Cell
​https://bugs.webkit.org/show_bug.cgi?id=80654

Patch by Benjamin Poulain <​[email protected]> on 2012-03-08
Reviewed by Gavin Barraclough.

This patch removes the creation of RegExpObject's data to avoid the overhead
create by the allocation and destruction.

We RegExp are created repeatedly, this provides some performance improvment.
The PeaceKeeper test stringDetectBrowser improves by 10%.

• runtime/RegExpObject.cpp:

(JSC::RegExpObject::RegExpObject):
(JSC::RegExpObject::visitChildren):
(JSC::RegExpObject::getOwnPropertyDescriptor):
(JSC::RegExpObject::defineOwnProperty):
(JSC::RegExpObject::match):

• runtime/RegExpObject.h:

(JSC::RegExpObject::setRegExp):
(JSC::RegExpObject::regExp):
(JSC::RegExpObject::setLastIndex):
(JSC::RegExpObject::getLastIndex):
(RegExpObject):

File:

• trunk/Source/JavaScriptCore/runtime/RegExpObject.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/runtime/RegExpObject.h

@@ -1 +1 @@
 /*
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2003, 2007, 2008 Apple Inc. All Rights Reserved.
+ *  Copyright (C) 2003, 2007, 2008, 2012 Apple Inc. All Rights Reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -45 +45 @@
         }
 
-        void setRegExp(JSGlobalData& globalData, RegExp* r) { d->regExp.set(globalData, this, r); }
-        RegExp* regExp() const { return d->regExp.get(); }
+        void setRegExp(JSGlobalData& globalData, RegExp* r) { m_regExp.set(globalData, this, r); }
+        RegExp* regExp() const { return m_regExp.get(); }
 
         void setLastIndex(ExecState* exec, size_t lastIndex)
         {
-            d->lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
-            if (LIKELY(d->lastIndexIsWritable))
-                d->lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
+            m_lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
+            if (LIKELY(m_lastIndexIsWritable))
+                m_lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
             else
                 throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
@@ -58 +58 @@
         void setLastIndex(ExecState* exec, JSValue lastIndex, bool shouldThrow)
         {
-            if (LIKELY(d->lastIndexIsWritable))
-                d->lastIndex.set(exec->globalData(), this, lastIndex);
+            if (LIKELY(m_lastIndexIsWritable))
+                m_lastIndex.set(exec->globalData(), this, lastIndex);
             else if (shouldThrow)
                 throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
@@ -65 +65 @@
         JSValue getLastIndex() const
         {
-            return d->lastIndex.get();
+            return m_lastIndex.get();
         }
 
@@ -85 +85 @@
         JS_EXPORT_PRIVATE RegExpObject(JSGlobalObject*, Structure*, RegExp*);
         JS_EXPORT_PRIVATE void finishCreation(JSGlobalObject*);
-        static void destroy(JSCell*);
 
         static const unsigned StructureFlags = OverridesVisitChildren | OverridesGetOwnPropertySlot | Base::StructureFlags;
@@ -99 +98 @@
         bool match(ExecState*);
 
-        struct RegExpObjectData {
-            WTF_MAKE_FAST_ALLOCATED;
-        public:
-            RegExpObjectData(JSGlobalData& globalData, RegExpObject* owner, RegExp* regExp)
-                : regExp(globalData, owner, regExp)
-                , lastIndexIsWritable(true)
-            {
-                lastIndex.setWithoutWriteBarrier(jsNumber(0));
-            }
-
-            WriteBarrier<RegExp> regExp;
-            WriteBarrier<Unknown> lastIndex;
-            bool lastIndexIsWritable;
-        };
 #if COMPILER(MSVC)
         friend void WTF::deleteOwnedPtr<RegExpObjectData>(RegExpObjectData*);
 #endif
-        OwnPtr<RegExpObjectData> d;
+        WriteBarrier<RegExp> m_regExp;
+        WriteBarrier<Unknown> m_lastIndex;
+        bool m_lastIndexIsWritable;
     };