Changeset 66936 in webkit for trunk/JavaScriptCore/runtime/RegExp.cpp

Timestamp:

Sep 7, 2010, 5:33:15 PM (15 years ago)

Author:

[email protected]

Message:

2010-09-07 Mihai Parparita <​[email protected]>

Reviewed by Oliver Hunt.

pushState and replaceState do not clone RegExp objects correctly
​https://bugs.webkit.org/show_bug.cgi?id=44718

Move internal representation of JSC::RegExp (which depends on wether
YARR and YARR_JIT is enabled) into RegExpRepresentation which can live
in the implementation only. This makes it feasible to use RegExp in
WebCore without bringing in all of YARR.

• JavaScriptCore.exp: Export RegExp and RegExpObject functions that are needed inside WebCore's JSC bindings.
• runtime/RegExp.cpp: (JSC::RegExpRepresentation::~RegExpRepresentation): (JSC::RegExp::RegExp): (JSC::RegExp::~RegExp): (JSC::RegExp::compile): (JSC::RegExp::match):
• runtime/RegExp.h:

2010-09-07 Mihai Parparita <​[email protected]>

Reviewed by Oliver Hunt.

pushState and replaceState do not clone RegExp objects correctly
​https://bugs.webkit.org/show_bug.cgi?id=44718

Make RegExp test of pushstate-object-types.html actually test a RegExp
value with flags.

Also adds ImageData since it can be serialized as of r54646.

• fast/loader/stateobjects/pushstate-object-types-expected.txt:
• fast/loader/stateobjects/pushstate-object-types.html:

2010-09-07 Mihai Parparita <​[email protected]>

Reviewed by Oliver Hunt.

pushState and replaceState do not clone RegExp objects correctly
​https://bugs.webkit.org/show_bug.cgi?id=44718

Add RegExp support to the JSC implementation of SerializedScriptValue
(it stores the pattern and flags read from a RegExpObject, and creates
a new one on deserialization).

Tests: fast/loader/stateobjects/pushstate-object-types.html

• ForwardingHeaders/runtime/RegExp.h: Added.
• ForwardingHeaders/runtime/RegExpObject.h: Added.
• bindings/js/SerializedScriptValue.cpp: (WebCore::CloneSerializer::dumpIfTerminal): (WebCore::CloneDeserializer::readTerminal):

File:

• trunk/JavaScriptCore/runtime/RegExp.cpp (modified) (9 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -47 +47 @@
 namespace JSC {
 
+struct RegExpRepresentation {
+#if ENABLE(YARR_JIT)
+    Yarr::RegexCodeBlock m_regExpJITCode;
+#elif ENABLE(YARR)
+    OwnPtr<Yarr::BytecodePattern> m_regExpBytecode;
+#else
+    JSRegExp* m_regExp;
+#endif
+
+#if !ENABLE(YARR)
+    ~RegExpRepresentation()
+    {
+        jsRegExpFree(m_regExp);
+    }
+#endif
+};
+
 inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags)
     : m_pattern(pattern)
@@ -52 +69 @@
     , m_constructionError(0)
     , m_numSubpatterns(0)
+    , m_representation(adoptPtr(new RegExpRepresentation))
 {
     // NOTE: The global flag is handled on a case-by-case basis by functions like
@@ -66 +84 @@
 }
 
-#if !ENABLE(YARR)
 RegExp::~RegExp()
 {
-    jsRegExpFree(m_regExp);
-}
-#endif
+}
 
 PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern, const UString& flags)
@@ -83 +98 @@
 {
 #if ENABLE(YARR_JIT)
-    Yarr::jitCompileRegex(globalData, m_regExpJITCode, m_pattern, m_numSubpatterns, m_constructionError, ignoreCase(), multiline());
-#else
-    m_regExpBytecode = Yarr::byteCompileRegex(m_pattern, m_numSubpatterns, m_constructionError, &globalData->m_regexAllocator, ignoreCase(), multiline());
+    Yarr::jitCompileRegex(globalData, m_representation->m_regExpJITCode, m_pattern, m_numSubpatterns, m_constructionError, ignoreCase(), multiline());
+#else
+    m_representation->m_regExpBytecode = Yarr::byteCompileRegex(m_pattern, m_numSubpatterns, m_constructionError, &globalData->m_regexAllocator, ignoreCase(), multiline());
 #endif
 }
@@ -100 +115 @@
 
 #if ENABLE(YARR_JIT)
-    if (!!m_regExpJITCode) {
-#else
-    if (m_regExpBytecode) {
+    if (!!m_representation->m_regExpJITCode) {
+#else
+    if (m_representation->m_regExpBytecode) {
 #endif
         int offsetVectorSize = (m_numSubpatterns + 1) * 3; // FIXME: should be 2 - but adding temporary fallback to pcre.
@@ -120 +135 @@
 
 #if ENABLE(YARR_JIT)
-        int result = Yarr::executeRegex(m_regExpJITCode, s.characters(), startOffset, s.length(), offsetVector, offsetVectorSize);
-#else
-        int result = Yarr::interpretRegex(m_regExpBytecode.get(), s.characters(), startOffset, s.length(), offsetVector);
+        int result = Yarr::executeRegex(m_representation->m_regExpJITCode, s.characters(), startOffset, s.length(), offsetVector, offsetVectorSize);
+#else
+        int result = Yarr::interpretRegex(m_representation->m_regExpBytecode.get(), s.characters(), startOffset, s.length(), offsetVector);
 #endif
 
@@ -145 +160 @@
 void RegExp::compile(JSGlobalData*)
 {
-    m_regExp = 0;
+    m_representation->m_regExp = 0;
     JSRegExpIgnoreCaseOption ignoreCaseOption = ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase;
     JSRegExpMultilineOption multilineOption = multiline() ? JSRegExpMultiline : JSRegExpSingleLine;
-    m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(m_pattern.characters()), m_pattern.length(), ignoreCaseOption, multilineOption, &m_numSubpatterns, &m_constructionError);
+    m_representation->m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(m_pattern.characters()), m_pattern.length(), ignoreCaseOption, multilineOption, &m_numSubpatterns, &m_constructionError);
 }
 
@@ -161 +176 @@
         return -1;
 
-    if (m_regExp) {
+    if (m_representation->m_regExp) {
         // Set up the offset vector for the result.
         // First 2/3 used for result, the last third used by PCRE.
@@ -176 +191 @@
         }
 
-        int numMatches = jsRegExpExecute(m_regExp, reinterpret_cast<const UChar*>(s.characters()), s.length(), startOffset, offsetVector, offsetVectorSize);
+        int numMatches = jsRegExpExecute(m_representation->m_regExp, reinterpret_cast<const UChar*>(s.characters()), s.length(), startOffset, offsetVector, offsetVectorSize);
     
         if (numMatches < 0) {