Title: [175929] releases/WebKitGTK/webkit-2.6/Source/_javascript_Core
- Revision
- 175929
- Author
- [email protected]
- Date
- 2014-11-11 08:14:15 -0800 (Tue, 11 Nov 2014)
Log 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog (175928 => 175929)
--- releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog 2014-11-11 16:13:22 UTC (rev 175928)
+++ releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog 2014-11-11 16:14:15 UTC (rev 175929)
@@ -1,3 +1,14 @@
+2014-10-30 Andreas Kling <[email protected]>
+
+ 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 <[email protected]>
Use plain JSArray for RegExp matches instead of a lazily populated custom object.
Modified: releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/runtime/RegExpCachedResult.cpp (175928 => 175929)
--- releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/runtime/RegExpCachedResult.cpp 2014-11-11 16:13:22 UTC (rev 175928)
+++ releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/runtime/RegExpCachedResult.cpp 2014-11-11 16:14:15 UTC (rev 175929)
@@ -75,7 +75,7 @@
{
// 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);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
