Attachment 359532 Details for Bug 193523 – Patch to fix the builds when re-landing

[patch] Patch to fix the builds when re-landing

0001-Follow-up-Gigacages-should-start-allocations-from-a-.patch (text/plain), 1.98 KB, created by David Kilzer (:ddkilzer) on 2019-01-18 13:36:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2019-01-18 13:36:47 PST

Size: 1.98 KB

patch

obsolete

>From 1388086d3f70684f5482d9863767cacec8319442 Mon Sep 17 00:00:00 2001
>From: David Kilzer <ddkilzer@apple.com>
>Date: Fri, 18 Jan 2019 13:33:59 -0800
>Subject: [PATCH] Follow-up: Gigacages should start allocations from a slide
> <https://bugs.webkit.org/show_bug.cgi?id=193523> <rdar://problem/44958707>
>
>* ftl/FTLLowerDFGToB3.cpp:
>(JSC::FTL::DFG::LowerDFGToB3::caged): Return `ptr` when
>GIGACAGE_ENABLED is 0.
>---
> Source/JavaScriptCore/ChangeLog               | 10 ++++++++++
> Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp |  4 ++++
> 2 files changed, 14 insertions(+)
>
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index d33e18223d8..dbcc1563731 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-18  David Kilzer  <ddkilzer@apple.com>
>+
>+        Follow-up: Gigacages should start allocations from a slide
>+        <https://bugs.webkit.org/show_bug.cgi?id=193523>
>+        <rdar://problem/44958707>
>+
>+        * ftl/FTLLowerDFGToB3.cpp:
>+        (JSC::FTL::DFG::LowerDFGToB3::caged): Return `ptr` when
>+        GIGACAGE_ENABLED is 0.
>+
> 2019-01-18  Matt Lewis  <jlewis3@apple.com>
> 
>         Unreviewed, rolling out r240160.
>diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
>index 2a941af383d..9086f83858a 100644
>--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
>+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
>@@ -13852,6 +13852,7 @@ private:
>     
>     LValue caged(Gigacage::Kind kind, LValue ptr)
>     {
>+#if GIGACAGE_ENABLED
>         if (!Gigacage::isEnabled(kind))
>             return ptr;
>         
>@@ -13880,6 +13881,9 @@ private:
>         // and possibly other smart things if we want to be able to remove this opaque.
>         // https://bugs.webkit.org/show_bug.cgi?id=175493
>         return m_out.opaque(result);
>+#else
>+        return ptr;
>+#endif
>     }
>     
>     void buildSwitch(SwitchData* data, LType type, LValue switchValue)
>-- 
>2.17.2 (Apple Git-113)
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193523: 359341 | 359396 | 359409 | 359410 | 359425 | 359430 | 359501 | 359532