Attachment 372782 Details for Bug 198518 – proposed patch

[patch] proposed patch

webkit-encodedmatchresult.patch (text/plain), 1013 bytes, created by Eike Rathke on 2019-06-24 12:10:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eike Rathke

Created: 2019-06-24 12:10:47 PDT

Size: 1013 bytes

patch

obsolete

>--- Source/JavaScriptCore/runtime/MatchResult.h.encodedmatchresult   2019-05-22 08:16:48.000000000 +0000
>+++ Source/JavaScriptCore/runtime/MatchResult.h      2019-06-24 18:36:36.947345256 +0000
>@@ -32,11 +32,17 @@ namespace JSC {
> 
> struct MatchResult;
> #if CPU(ARM64) || CPU(X86_64)
>+#define ENCODEDMATCHRESULT_IS_MATCHRESULT 1
> using EncodedMatchResult = MatchResult;
>-#else
>+#elif (defined(SIZE_WIDTH) && (SIZE_WIDTH == 32)) || (SIZE_MAX == 0xffffffff)
>+#define ENCODEDMATCHRESULT_IS_MATCHRESULT 0
> using EncodedMatchResult = uint64_t;
>+#else
>+#define ENCODEDMATCHRESULT_IS_MATCHRESULT 1
>+using EncodedMatchResult = MatchResult;
> #endif
> 
>+
> struct MatchResult {
>     MatchResult()
>         : start(WTF::notFound)
>@@ -50,7 +56,7 @@ struct MatchResult {
>     {
>     }
> 
>-#if !(CPU(ARM64) || CPU(X86_64))
>+#if !ENCODEDMATCHRESULT_IS_MATCHRESULT
>     ALWAYS_INLINE MatchResult(EncodedMatchResult match)
>         : start(bitwise_cast<MatchResult>(match).start)
>         , end(bitwise_cast<MatchResult>(match).end)

Actions: View | Formatted Diff | Diff

Attachments on bug 198518: 372782 | 372790 | 372791