Title: [243363] trunk/Source/_javascript_Core
- Revision
- 243363
- Author
- [email protected]
- Date
- 2019-03-21 22:56:02 -0700 (Thu, 21 Mar 2019)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (243362 => 243363)
--- trunk/Source/_javascript_Core/ChangeLog 2019-03-22 04:45:26 UTC (rev 243362)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-03-22 05:56:02 UTC (rev 243363)
@@ -1,3 +1,15 @@
+2019-03-21 Tomas Popela <[email protected]>
+
+ [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 <[email protected]>
Remove an invalid assertion in DFG::SpeculativeJIT::nonSpeculativeNonPeepholeCompareNullOrUndefined().
Modified: trunk/Source/_javascript_Core/bytecode/CodeOrigin.h (243362 => 243363)
--- trunk/Source/_javascript_Core/bytecode/CodeOrigin.h 2019-03-22 04:45:26 UTC (rev 243362)
+++ trunk/Source/_javascript_Core/bytecode/CodeOrigin.h 2019-03-22 05:56:02 UTC (rev 243363)
@@ -232,12 +232,12 @@
return bitwise_cast<InlineCallFrame*>(value);
}
-#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)
static uintptr_t buildCompositeValue(InlineCallFrame* inlineCallFrame, unsigned bytecodeIndex)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
