Changeset 243363 in webkit

Timestamp:

Mar 21, 2019, 10:56:02 PM (7 years ago)

Author:

tpopela@redhat.com

Message:

[JSC] Fix build after r243232 on unsupported 64bit architectures
​https://bugs.webkit.org/show_bug.cgi?id=196072

Reviewed by Keith Miller.

As Keith suggested we already expect 16 free bits at the top of any
pointer for JSValue even for the unsupported 64 bit arches.

• bytecode/CodeOrigin.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeOrigin.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-03-21  Tomas Popela  <tpopela@redhat.com>
+
+        [JSC] Fix build after r243232 on unsupported 64bit architectures
+        https://bugs.webkit.org/show_bug.cgi?id=196072
+
+        Reviewed by Keith Miller.
+
+        As Keith suggested we already expect 16 free bits at the top of any
+        pointer for JSValue even for the unsupported 64 bit arches.
+
+        * bytecode/CodeOrigin.h:
+
 2019-03-21  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeOrigin.h

@@ -233 +233 @@
     }
 
-#if CPU(X86_64) && CPU(ADDRESS64)
+#if CPU(ARM64) && CPU(ADDRESS64)
+    static constexpr unsigned s_freeBitsAtTop = 28;
+    static constexpr uintptr_t s_maskCompositeValueForPointer = 0x0000000ffffffff8;
+#elif CPU(ADDRESS64)
     static constexpr unsigned s_freeBitsAtTop = 16;
     static constexpr uintptr_t s_maskCompositeValueForPointer = 0x0000fffffffffff8;
-#elif CPU(ARM64) && CPU(ADDRESS64)
-    static constexpr unsigned s_freeBitsAtTop = 28;
-    static constexpr uintptr_t s_maskCompositeValueForPointer = 0x0000000ffffffff8;
 #endif
 #if CPU(ADDRESS64)