Title: [259957] releases/WebKitGTK/webkit-2.28/Source
- Revision
- 259957
- Author
- [email protected]
- Date
- 2020-04-12 06:03:44 -0700 (Sun, 12 Apr 2020)
Log Message
Merge r258460 - configSizeToProtect should be 16KB
https://bugs.webkit.org/show_bug.cgi?id=209068
Reviewed by Keith Miller.
Source/bmalloc:
* bmalloc/Gigacage.h:
Source/_javascript_Core:
* runtime/JSCConfig.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog (259956 => 259957)
--- releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog 2020-04-12 13:03:40 UTC (rev 259956)
+++ releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog 2020-04-12 13:03:44 UTC (rev 259957)
@@ -1,3 +1,12 @@
+2020-03-13 Saam Barati <[email protected]>
+
+ configSizeToProtect should be 16KB
+ https://bugs.webkit.org/show_bug.cgi?id=209068
+
+ Reviewed by Keith Miller.
+
+ * runtime/JSCConfig.h:
+
2020-02-28 Saam Barati <[email protected]>
Clean up code with how we choose Gigacage sizes and whether or not to use Wasm fast memory
Modified: releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/JSCConfig.cpp (259956 => 259957)
--- releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/JSCConfig.cpp 2020-04-12 13:03:40 UTC (rev 259956)
+++ releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/JSCConfig.cpp 2020-04-12 13:03:44 UTC (rev 259957)
@@ -37,7 +37,7 @@
namespace JSC {
-alignas(PageSize) JS_EXPORT_PRIVATE Config g_jscConfig;
+alignas(ConfigSizeToProtect) JS_EXPORT_PRIVATE Config g_jscConfig;
void Config::disableFreezingForTesting()
{
Modified: releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/JSCConfig.h (259956 => 259957)
--- releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/JSCConfig.h 2020-04-12 13:03:40 UTC (rev 259956)
+++ releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/runtime/JSCConfig.h 2020-04-12 13:03:44 UTC (rev 259957)
@@ -34,14 +34,8 @@
class FixedVMPoolExecutableAllocator;
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 = 16 * KB;
-constexpr size_t ConfigSizeToProtect = PageSize;
-
#if ENABLE(SEPARATED_WX_HEAP)
using JITWriteSeparateHeapsFunction = void (*)(off_t, const void*, size_t);
#endif
@@ -90,9 +84,8 @@
};
};
-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
Modified: releases/WebKitGTK/webkit-2.28/Source/bmalloc/ChangeLog (259956 => 259957)
--- releases/WebKitGTK/webkit-2.28/Source/bmalloc/ChangeLog 2020-04-12 13:03:40 UTC (rev 259956)
+++ releases/WebKitGTK/webkit-2.28/Source/bmalloc/ChangeLog 2020-04-12 13:03:44 UTC (rev 259957)
@@ -1,3 +1,12 @@
+2020-03-13 Saam Barati <[email protected]>
+
+ configSizeToProtect should be 16KB
+ https://bugs.webkit.org/show_bug.cgi?id=209068
+
+ Reviewed by Keith Miller.
+
+ * bmalloc/Gigacage.h:
+
2020-02-28 Saam Barati <[email protected]>
Clean up code with how we choose Gigacage sizes and whether or not to use Wasm fast memory
Modified: releases/WebKitGTK/webkit-2.28/Source/bmalloc/bmalloc/Gigacage.h (259956 => 259957)
--- releases/WebKitGTK/webkit-2.28/Source/bmalloc/bmalloc/Gigacage.h 2020-04-12 13:03:40 UTC (rev 259956)
+++ releases/WebKitGTK/webkit-2.28/Source/bmalloc/bmalloc/Gigacage.h 2020-04-12 13:03:44 UTC (rev 259957)
@@ -66,16 +66,16 @@
#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
// In Linux, if `vm.overcommit_memory = 2` is specified, mmap with large size can fail if it exceeds the size of RAM.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
