Changeset 246792 in webkit

Timestamp:

Jun 25, 2019 9:08:27 AM (5 years ago)

Author:

Michael Catanzaro

Message:

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/MatchResult.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-25  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 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-06-24  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/runtime/MatchResult.h

@@ -32 +32 @@
 
 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
 
@@ -51 +51 @@
     }
 
-#if !(CPU(ARM64) || CPU(X86_64))
+#if CPU(ADDRESS32)
     ALWAYS_INLINE MatchResult(EncodedMatchResult match)
         : start(bitwise_cast<MatchResult>(match).start)
@@ -80 +80 @@
 };
 
+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");