Attachment 343858 Details for Bug 187160 – Patch

[patch] Patch

187160.patch (text/plain), 1.80 KB, created by Michael Saboff on 2018-06-28 15:12:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Saboff

Created: 2018-06-28 15:12:05 PDT

Size: 1.80 KB

patch

obsolete

>Index: Source/bmalloc/ChangeLog
>===================================================================
>--- Source/bmalloc/ChangeLog	(revision 233331)
>+++ Source/bmalloc/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-06-28  Michael Saboff  <msaboff@apple.com>
>+
>+        Disable IsoHeaps when Gigacage is off
>+        https://bugs.webkit.org/show_bug.cgi?id=187160
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * bmalloc/IsoTLS.cpp:
>+        (bmalloc::IsoTLS::determineMallocFallbackState):
>+
> 2018-06-27  Simon Fraser  <simon.fraser@apple.com>
> 
>         https://hackernoon.com/ uses lots of layer backing store
>Index: Source/bmalloc/bmalloc/IsoTLS.cpp
>===================================================================
>--- Source/bmalloc/bmalloc/IsoTLS.cpp	(revision 233200)
>+++ Source/bmalloc/bmalloc/IsoTLS.cpp	(working copy)
>@@ -27,6 +27,7 @@
> 
> #include "DebugHeap.h"
> #include "Environment.h"
>+#include "Gigacage.h"
> #include "IsoTLSEntryInlines.h"
> #include "IsoTLSInlines.h"
> #include "IsoTLSLayout.h"
>@@ -201,12 +202,21 @@ void IsoTLS::determineMallocFallbackStat
>         [] {
>             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
>         });
> }
>

Flags:

saam: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 187160: 343858 | 343879 | 344241 | 344260 | 344365 | 377045