Attachment 372791 Details for Bug 198518 – Patch

[patch] Patch

bug-198518-20190624152440.patch (text/plain), 2.10 KB, created by Michael Catanzaro on 2019-06-24 13:24:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-06-24 13:24:41 PDT

Size: 2.10 KB

patch

obsolete

>Subversion Revision: 246759
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 74bd2ffacdff0ece41da48959c8ba6cefd837c24..98daf7b90f4182c25bfe90f6732e57bfb2d33cf0 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-24  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        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 NOBODY (OOPS!).
>+
>+        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-06-24  Mark Lam  <mark.lam@apple.com>
> 
>         ArraySlice needs to keep the source array alive.
>diff --git a/Source/JavaScriptCore/runtime/MatchResult.h b/Source/JavaScriptCore/runtime/MatchResult.h
>index c4aecaac76a41f94e1849d55c52f79392f1dd7c1..add264e90975b265fd5be10f2632fd75e286c81c 100644
>--- a/Source/JavaScriptCore/runtime/MatchResult.h
>+++ b/Source/JavaScriptCore/runtime/MatchResult.h
>@@ -31,10 +31,10 @@
> namespace JSC {
> 
> struct MatchResult;
>-#if CPU(ARM64) || CPU(X86_64)
>-using EncodedMatchResult = MatchResult;
>-#else
>+#if CPU(ADDRESS32)
> using EncodedMatchResult = uint64_t;
>+#else
>+using EncodedMatchResult = MatchResult;
> #endif
> 
> struct MatchResult {
>@@ -50,7 +50,7 @@ struct MatchResult {
>     {
>     }
> 
>-#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 @@ struct MatchResult {
>     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

Actions: View | Formatted Diff | Diff

Attachments on bug 198518: 372782 | 372790 | 372791