Title: [248230] releases/WebKitGTK/webkit-2.24/Source/_javascript_Core
- Revision
- 248230
- Author
- [email protected]
- Date
- 2019-08-03 20:23:06 -0700 (Sat, 03 Aug 2019)
Log Message
Merge r246792 - REGRESSION(r245586): static assertion failed: Match result and EncodedMatchResult should be the same size
https://bugs.webkit.org/show_bug.cgi?id=198518
Reviewed by Keith Miller.
r245586 made some bad assumptions about the size of size_t, which we can solve using the
CPU(ADDRESS32) guard that I didn't know about.
This solution was developed by Mark Lam and Keith Miller. I'm just preparing the patch.
* runtime/MatchResult.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog (248229 => 248230)
--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog 2019-08-04 03:23:04 UTC (rev 248229)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog 2019-08-04 03:23:06 UTC (rev 248230)
@@ -1,3 +1,17 @@
+2019-06-25 Michael Catanzaro <[email protected]>
+
+ REGRESSION(r245586): static assertion failed: Match result and EncodedMatchResult should be the same size
+ https://bugs.webkit.org/show_bug.cgi?id=198518
+
+ Reviewed by Keith Miller.
+
+ r245586 made some bad assumptions about the size of size_t, which we can solve using the
+ CPU(ADDRESS32) guard that I didn't know about.
+
+ This solution was developed by Mark Lam and Keith Miller. I'm just preparing the patch.
+
+ * runtime/MatchResult.h:
+
2019-05-28 Michael Saboff <[email protected]>
[YARR] Properly handle RegExp's that require large ParenContext space
Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/MatchResult.h (248229 => 248230)
--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/MatchResult.h 2019-08-04 03:23:04 UTC (rev 248229)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/runtime/MatchResult.h 2019-08-04 03:23:06 UTC (rev 248230)
@@ -31,10 +31,10 @@
namespace JSC {
struct MatchResult;
-#if CPU(ARM64) || CPU(X86_64)
+#if CPU(ADDRESS32)
+using EncodedMatchResult = uint64_t;
+#else
using EncodedMatchResult = MatchResult;
-#else
-using EncodedMatchResult = uint64_t;
#endif
struct MatchResult {
@@ -50,7 +50,7 @@
{
}
-#if !(CPU(ARM64) || CPU(X86_64))
+#if CPU(ADDRESS32)
ALWAYS_INLINE MatchResult(EncodedMatchResult match)
: start(bitwise_cast<MatchResult>(match).start)
, end(bitwise_cast<MatchResult>(match).end)
@@ -79,6 +79,7 @@
size_t end;
};
+static_assert(sizeof(EncodedMatchResult) == 2 * sizeof(size_t), "https://bugs.webkit.org/show_bug.cgi?id=198518#c11");
static_assert(sizeof(MatchResult) == sizeof(EncodedMatchResult), "Match result and EncodedMatchResult should be the same size");
} // namespace JSC
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
