Unreviewed, rolling out r233347.
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jun 2018 15:24:59 +0000 (15:24 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jun 2018 15:24:59 +0000 (15:24 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233358 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/bmalloc/ChangeLog
Source/bmalloc/bmalloc/IsoTLS.cpp

index 7f6666d..f548aa5 100644 (file)
@@ -1,3 +1,15 @@
+2018-06-29  Ryan Haddad  <ryanhaddad@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  <msaboff@apple.com>
 
         Disable IsoHeaps when Gigacage is off
index 2ace1ac..aca5bf0 100644 (file)
@@ -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 @@ void IsoTLS::determineMallocFallbackState()
         [] {
             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
         });
 }