Changeset 227738 in webkit for trunk/Source/JavaScriptCore/runtime/RegExp.cpp

Timestamp:

Jan 29, 2018, 9:47:30 AM (7 years ago)

Author:

Matt Lewis

Message:

Unreviewed, rolling out r227725.

This caused internal failures.

Reverted changeset:

"JSC Sampling Profiler: Detect tester and testee when sampling
in RegExp JIT"
​https://bugs.webkit.org/show_bug.cgi?id=152729
​https://trac.webkit.org/changeset/227725

File:

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

trunk/Source/JavaScriptCore/runtime/RegExp.cpp

@@ -308 +308 @@
 #if ENABLE(YARR_JIT)
     if (!pattern.m_containsBackreferences && !pattern.containsUnsignedLengthPattern() && VM::canUseRegExpJIT()) {
-        Yarr::jitCompile(pattern, charSize, m_regExpJITCode);
+        Yarr::jitCompile(pattern, charSize, vm, m_regExpJITCode);
         if (!m_regExpJITCode.failureReason()) {
             m_state = JITCode;
@@ -327 +327 @@
 int RegExp::match(VM& vm, const String& s, unsigned startOffset, Vector<int>& ovector)
 {
-    return matchInline(vm, Concurrency::MainThread, s, startOffset, ovector);
+    return matchInline(vm, s, startOffset, ovector);
 }
 
@@ -338 +338 @@
         return false;
 
-    position = matchInline(vm, Concurrency::Concurrent, s, startOffset, ovector);
+    position = match(vm, s, startOffset, ovector);
     return true;
 }
@@ -364 +364 @@
 #if ENABLE(YARR_JIT)
     if (!pattern.m_containsBackreferences && !pattern.containsUnsignedLengthPattern() && VM::canUseRegExpJIT()) {
-        Yarr::jitCompile(pattern, charSize, m_regExpJITCode, Yarr::MatchOnly);
+        Yarr::jitCompile(pattern, charSize, vm, m_regExpJITCode, Yarr::MatchOnly);
         if (!m_regExpJITCode.failureReason()) {
             m_state = JITCode;
@@ -383 +383 @@
 MatchResult RegExp::match(VM& vm, const String& s, unsigned startOffset)
 {
-    return matchInline(vm, Concurrency::MainThread, s, startOffset);
+    return matchInline(vm, s, startOffset);
 }
 
@@ -393 +393 @@
         return false;
 
-    result = matchInline(vm, Concurrency::Concurrent, s, startOffset);
+    result = match(vm, s, startOffset);
     return true;
 }
@@ -408 +408 @@
 #endif
     m_regExpBytecode = nullptr;
-}
-
-String RegExp::toSourceString() const
-{
-    char postfix[8] = { '/', 0, 0, 0, 0, 0, 0, 0 };
-    int index = 1;
-    if (global())
-        postfix[index++] = 'g';
-    if (ignoreCase())
-        postfix[index++] = 'i';
-    if (multiline())
-        postfix[index++] = 'm';
-    if (dotAll())
-        postfix[index++] = 's';
-    if (unicode())
-        postfix[index++] = 'u';
-    if (sticky())
-        postfix[index++] = 'y';
-
-    return makeString("/", pattern(), postfix);
 }