Changeset 233358 in webkit

Timestamp:

Jun 29, 2018 8:24:59 AM (6 years ago)

Author:

Ryan Haddad

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

Location:

trunk/Source/bmalloc

Files:

• ChangeLog (modified) (1 diff)
• bmalloc/IsoTLS.cpp (modified) (3 diffs)

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/bmalloc/bmalloc/IsoTLS.cpp

@@ -28 +28 @@
 #include "DebugHeap.h"
 #include "Environment.h"
-#include "Gigacage.h"
 #include "IsoTLSEntryInlines.h"
 #include "IsoTLSInlines.h"
@@ -203 +202 @@
             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")))
@@ -215 +208 @@
             else
                 s_mallocFallbackState = MallocFallbackState::DoNotFallBack;
-#else
-            s_mallocFallbackState = MallocFallbackState::FallBackToMalloc;
-#endif
         });
 }