Index: /Source/JavaScriptCore/runtime/JSCConfig.cpp
===================================================================
--- /Source/JavaScriptCore/runtime/JSCConfig.cpp (revision 258459)
+++ /Source/JavaScriptCore/runtime/JSCConfig.cpp (revision 258460)
@@ -38,5 +38,5 @@
namespace JSC {
-alignas(PageSize) JS_EXPORT_PRIVATE Config g_jscConfig;
+alignas(ConfigSizeToProtect) JS_EXPORT_PRIVATE Config g_jscConfig;
void Config::disableFreezingForTesting()
Index: /Source/JavaScriptCore/runtime/JSCConfig.h
===================================================================
--- /Source/JavaScriptCore/runtime/JSCConfig.h (revision 258459)
+++ /Source/JavaScriptCore/runtime/JSCConfig.h (revision 258460)
@@ -35,11 +35,5 @@
class VM;
-#if CPU(ARM64) || PLATFORM(WATCHOS)
-constexpr size_t PageSize = 16 * KB;
-#else
-constexpr size_t PageSize = 4 * KB;
-#endif
-
-constexpr size_t ConfigSizeToProtect = PageSize;
+constexpr size_t ConfigSizeToProtect = 16 * KB;
#if ENABLE(SEPARATED_WX_HEAP)
@@ -91,8 +85,7 @@
};
-extern "C" alignas(PageSize) JS_EXPORT_PRIVATE Config g_jscConfig;
+extern "C" alignas(ConfigSizeToProtect) JS_EXPORT_PRIVATE Config g_jscConfig;
static_assert(sizeof(Config) == ConfigSizeToProtect, "");
-static_assert(roundUpToMultipleOf<PageSize>(ConfigSizeToProtect) == ConfigSizeToProtect, "");
} // namespace JSC
Index: /Source/bmalloc/bmalloc/Gigacage.h
===================================================================
--- /Source/bmalloc/bmalloc/Gigacage.h (revision 258459)
+++ /Source/bmalloc/bmalloc/Gigacage.h (revision 258460)
@@ -67,14 +67,14 @@
#if GIGACAGE_ENABLED
+constexpr size_t configSizeToProtect = 16 * bmalloc::Sizes::kB;
+
#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;
-constexpr size_t configSizeToProtect = 16 * bmalloc::Sizes::kB;
#else
constexpr size_t primitiveGigacageSize = 32 * bmalloc::Sizes::GB;
constexpr size_t jsValueGigacageSize = 16 * bmalloc::Sizes::GB;
constexpr size_t maximumCageSizeReductionForSlide = 4 * bmalloc::Sizes::GB;
-constexpr size_t configSizeToProtect = 4 * bmalloc::Sizes::kB;
#endif