Title: [225413] trunk/Source/bmalloc
- Revision
- 225413
- Author
- msab...@apple.com
- Date
- 2017-12-01 14:12:01 -0800 (Fri, 01 Dec 2017)
Log Message
Gigacage should not be enabled for ARM64_32
https://bugs.webkit.org/show_bug.cgi?id=180265
Reviewed by Saam Barati.
Disabled Gigacage for ARM64_32.
In the process, restructured Gigacage::shouldBeEnabled() with GIGACAGE_ENABLED set
to 0 to avoid a dead code compiler warning.
* bmalloc/Gigacage.cpp:
(Gigacage::shouldBeEnabled):
* bmalloc/Gigacage.h:
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (225412 => 225413)
--- trunk/Source/bmalloc/ChangeLog 2017-12-01 22:09:19 UTC (rev 225412)
+++ trunk/Source/bmalloc/ChangeLog 2017-12-01 22:12:01 UTC (rev 225413)
@@ -1,3 +1,18 @@
+2017-12-01 Michael Saboff <msab...@apple.com>
+
+ Gigacage should not be enabled for ARM64_32
+ https://bugs.webkit.org/show_bug.cgi?id=180265
+
+ Reviewed by Saam Barati.
+
+ Disabled Gigacage for ARM64_32.
+ In the process, restructured Gigacage::shouldBeEnabled() with GIGACAGE_ENABLED set
+ to 0 to avoid a dead code compiler warning.
+
+ * bmalloc/Gigacage.cpp:
+ (Gigacage::shouldBeEnabled):
+ * bmalloc/Gigacage.h:
+
2017-11-29 JF Bastien <jfbast...@apple.com>
WTF / bmalloc: don't write to 0xbbadbeef when ASAN is looking
Modified: trunk/Source/bmalloc/bmalloc/Gigacage.cpp (225412 => 225413)
--- trunk/Source/bmalloc/bmalloc/Gigacage.cpp 2017-12-01 22:09:19 UTC (rev 225412)
+++ trunk/Source/bmalloc/bmalloc/Gigacage.cpp 2017-12-01 22:12:01 UTC (rev 225413)
@@ -244,17 +244,14 @@
bool shouldBeEnabled()
{
+ static bool cached = false;
+
+#if GIGACAGE_ENABLED
static std::once_flag onceFlag;
- static bool cached = false;
std::call_once(
onceFlag,
[] {
-#if BCPU(ARM64)
- // FIXME: Make WasmBench run with gigacage on iOS and re-enable on ARM64:
- // https://bugs.webkit.org/show_bug.cgi?id=178557
- return;
-#endif
- bool result = GIGACAGE_ENABLED && !PerProcess<Environment>::get()->isDebugHeapEnabled();
+ bool result = !PerProcess<Environment>::get()->isDebugHeapEnabled();
if (!result)
return;
@@ -268,6 +265,7 @@
cached = true;
});
+#endif // GIGACAGE_ENABLED
return cached;
}
Modified: trunk/Source/bmalloc/bmalloc/Gigacage.h (225412 => 225413)
--- trunk/Source/bmalloc/bmalloc/Gigacage.h 2017-12-01 22:09:19 UTC (rev 225412)
+++ trunk/Source/bmalloc/bmalloc/Gigacage.h 2017-12-01 22:12:01 UTC (rev 225413)
@@ -52,7 +52,9 @@
#define JSVALUE_GIGACAGE_MASK GIGACAGE_SIZE_TO_MASK(JSVALUE_GIGACAGE_SIZE)
#define STRING_GIGACAGE_MASK GIGACAGE_SIZE_TO_MASK(STRING_GIGACAGE_SIZE)
-#if (BOS(DARWIN) || BOS(LINUX)) && (BCPU(ARM64) || BCPU(X86_64))
+// FIXME: Make WasmBench run with gigacage on iOS and re-enable on ARM64:
+// https://bugs.webkit.org/show_bug.cgi?id=178557
+#if (BOS(DARWIN) || BOS(LINUX)) && (/* (BCPU(ARM64) && !defined(__ILP32__)) || */ BCPU(X86_64))
#define GIGACAGE_ENABLED 1
#else
#define GIGACAGE_ENABLED 0
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
