Changeset 175929 in webkit

Timestamp:

Nov 11, 2014, 8:14:15 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175372 - Unreviewed assertion fix.

RegExpCachedResult::m_reified is now the dedicated member that knows whether
the result was reified into an array or not. Check that instead of m_result
which is now single-purpose.

• runtime/RegExpCachedResult.cpp:

(JSC::RegExpCachedResult::setInput):

Location:

releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/RegExpCachedResult.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-10-30  Andreas Kling  <akling@apple.com>
+
+        Unreviewed assertion fix.
+
+        RegExpCachedResult::m_reified is now the dedicated member that knows whether
+        the result was reified into an array or not. Check that instead of m_result
+        which is now single-purpose.
+
+        * runtime/RegExpCachedResult.cpp:
+        (JSC::RegExpCachedResult::setInput):
+
 2014-10-29  Andreas Kling  <akling@apple.com>
 

releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/runtime/RegExpCachedResult.cpp

@@ -76 +76 @@
     // Make sure we're reified, otherwise m_reifiedInput will be ignored.
     lastResult(exec, owner);
-    ASSERT(!m_result);
+    ASSERT(m_reified);
     m_reifiedInput.set(exec->vm(), owner, input);
 }