Modified: releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog (259955 => 259956)
--- releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog 2020-04-12 13:03:35 UTC (rev 259955)
+++ releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog 2020-04-12 13:03:40 UTC (rev 259956)
@@ -1,3 +1,12 @@
+2020-02-28 Saam Barati <sbar...@apple.com>
+
+ Clean up code with how we choose Gigacage sizes and whether or not to use Wasm fast memory
+ https://bugs.webkit.org/show_bug.cgi?id=208392
+
+ Reviewed by Yusuke Suzuki.
+
+ * runtime/OptionsList.h:
+
2020-03-19 Yusuke Suzuki <ysuz...@apple.com>
Unreviewed, build fix after r258717
Modified: releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/OptionsList.h (259955 => 259956)
--- releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/OptionsList.h 2020-04-12 13:03:35 UTC (rev 259955)
+++ releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/OptionsList.h 2020-04-12 13:03:40 UTC (rev 259956)
@@ -458,7 +458,7 @@
v(Int32, omgTierUpCounterIncrementForLoop, 1, Normal, "The amount the tier up counter is incremented on each loop backedge.") \
v(Int32, omgTierUpCounterIncrementForEntry, 15, Normal, "The amount the tier up counter is incremented on each function entry.") \
/* FIXME: enable fast memories on iOS and pre-allocate them. https://bugs.webkit.org/show_bug.cgi?id=170774 */ \
- v(Bool, useWebAssemblyFastMemory, !isIOS(), Normal, "If true, we will try to use a 32-bit address space with a signal handler to bounds check wasm memory.") \
+ v(Bool, useWebAssemblyFastMemory, OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH) >= 48, Normal, "If true, we will try to use a 32-bit address space with a signal handler to bounds check wasm memory.") \
v(Bool, logWebAssemblyMemory, false, Normal, nullptr) \
v(Unsigned, webAssemblyFastMemoryRedzonePages, 128, Normal, "WebAssembly fast memories use 4GiB virtual allocations, plus a redzone (counted as multiple of 64KiB WebAssembly pages) at the end to catch reg+imm accesses which exceed 32-bit, anything beyond the redzone is explicitly bounds-checked") \
v(Bool, crashIfWebAssemblyCantFastMemory, false, Normal, "If true, we will crash if we can't obtain fast memory for wasm.") \
Modified: releases/WebKitGTK/webkit-2.28/Source/bmalloc/ChangeLog (259955 => 259956)
--- releases/WebKitGTK/webkit-2.28/Source/bmalloc/ChangeLog 2020-04-12 13:03:35 UTC (rev 259955)
+++ releases/WebKitGTK/webkit-2.28/Source/bmalloc/ChangeLog 2020-04-12 13:03:40 UTC (rev 259956)
@@ -1,3 +1,12 @@
+2020-02-28 Saam Barati <sbar...@apple.com>
+
+ Clean up code with how we choose Gigacage sizes and whether or not to use Wasm fast memory
+ https://bugs.webkit.org/show_bug.cgi?id=208392
+
+ Reviewed by Yusuke Suzuki.
+
+ * bmalloc/Gigacage.h:
+
2020-03-09 Mike Gorse <mgo...@suse.com>
Build failure on ppc64le if __unix is undefined
Modified: releases/WebKitGTK/webkit-2.28/Source/bmalloc/bmalloc/Gigacage.h (259955 => 259956)
--- releases/WebKitGTK/webkit-2.28/Source/bmalloc/bmalloc/Gigacage.h 2020-04-12 13:03:35 UTC (rev 259955)
+++ releases/WebKitGTK/webkit-2.28/Source/bmalloc/bmalloc/Gigacage.h 2020-04-12 13:03:40 UTC (rev 259956)
@@ -66,7 +66,7 @@
#if GIGACAGE_ENABLED
-#if BCPU(ARM64)
+#if BOS_EFFECTIVE_ADDRESS_WIDTH < 48
constexpr size_t primitiveGigacageSize = 2 * bmalloc::Sizes::GB;
constexpr size_t jsValueGigacageSize = 2 * bmalloc::Sizes::GB;
constexpr size_t maximumCageSizeReductionForSlide = bmalloc::Sizes::GB / 4;
