Attachment 8853509 Details for Bug 1350844

[patch] bug1350844-aurora

bug1350844-aurora (text/plain), 1.25 KB, created by Jon Coppeard (:jonco) (PTO until 24th June)

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Coppeard (:jonco) (PTO until 24th June)

Size: 1.25 KB

patch

obsolete

># HG changeset patch
># User Jon Coppeard <jcoppeard@mozilla.com>
># Date 1490955402 -3600
>#      Fri Mar 31 11:16:42 2017 +0100
># Node ID 773f4dd4aa0284a14b7c661dc0520991d8101907
># Parent  bd329aa7dbcd8a9c3ee467d393b3c606f347419f
>Bug 1350844 - Don't add dead proxy zone edges for zones which are not being collected r=sfink a=abillings
>
>diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
>--- a/js/src/jsgc.cpp
>+++ b/js/src/jsgc.cpp
>@@ -4459,17 +4459,20 @@ JSCompartment::findDeadProxyZoneEdges(bo
>     // wrappers do not need to be scanned.
>     *foundAny = false;
>     for (js::WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront()) {
>         Value value = e.front().value().get();
>         if (value.isObject()) {
>             if (IsDeadProxyObject(&value.toObject())) {
>                 *foundAny = true;
>                 CrossCompartmentKey& key = e.front().mutableKey();
>-                if (!key.as<JSObject*>()->zone()->gcZoneGroupEdges().put(zone()))
>+                Zone* wrapperZone = key.as<JSObject*>()->zone();
>+                if (!wrapperZone->isGCMarking())
>+                    continue;
>+                if (!wrapperZone->gcZoneGroupEdges().put(zone()))
>                     return false;
>             }
>         }
>     }
> 
>     return true;
> }
>

Flags:

gchang: approval-mozilla-aurora+

Actions: View | Diff | Review

Attachments on bug 1350844: 8851578 | 8853509 | 8853510 | 8854573

Bugzilla

Quick Search

Attachment 8853509 Details for Bug 1350844