Title: [233358] trunk/Source/bmalloc
- Revision
- 233358
- Author
- ryanhad...@apple.com
- Date
- 2018-06-29 08:24:59 -0700 (Fri, 29 Jun 2018)
Log Message
Unreviewed, rolling out r233347.
Causes crashes during WK1 tests.
Reverted changeset:
"Disable IsoHeaps when Gigacage is off"
https://bugs.webkit.org/show_bug.cgi?id=187160
https://trac.webkit.org/changeset/233347
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (233357 => 233358)
--- trunk/Source/bmalloc/ChangeLog 2018-06-29 15:20:47 UTC (rev 233357)
+++ trunk/Source/bmalloc/ChangeLog 2018-06-29 15:24:59 UTC (rev 233358)
@@ -1,3 +1,15 @@
+2018-06-29 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r233347.
+
+ Causes crashes during WK1 tests.
+
+ Reverted changeset:
+
+ "Disable IsoHeaps when Gigacage is off"
+ https://bugs.webkit.org/show_bug.cgi?id=187160
+ https://trac.webkit.org/changeset/233347
+
2018-06-28 Michael Saboff <msab...@apple.com>
Disable IsoHeaps when Gigacage is off
Modified: trunk/Source/bmalloc/bmalloc/IsoTLS.cpp (233357 => 233358)
--- trunk/Source/bmalloc/bmalloc/IsoTLS.cpp 2018-06-29 15:20:47 UTC (rev 233357)
+++ trunk/Source/bmalloc/bmalloc/IsoTLS.cpp 2018-06-29 15:24:59 UTC (rev 233358)
@@ -27,7 +27,6 @@
#include "DebugHeap.h"
#include "Environment.h"
-#include "Gigacage.h"
#include "IsoTLSEntryInlines.h"
#include "IsoTLSInlines.h"
#include "IsoTLSLayout.h"
@@ -202,21 +201,12 @@
[] {
if (s_mallocFallbackState != MallocFallbackState::Undecided)
return;
-
-#if GIGACAGE_ENABLED
- if (!Gigacage::shouldBeEnabled()) {
- s_mallocFallbackState = MallocFallbackState::FallBackToMalloc;
- return;
- }
-
+
const char* env = getenv("bmalloc_IsoHeap");
if (env && (!strcasecmp(env, "false") || !strcasecmp(env, "no") || !strcmp(env, "0")))
s_mallocFallbackState = MallocFallbackState::FallBackToMalloc;
else
s_mallocFallbackState = MallocFallbackState::DoNotFallBack;
-#else
- s_mallocFallbackState = MallocFallbackState::FallBackToMalloc;
-#endif
});
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
