Attachment 8854573 Details for Bug 1350844

[patch] bug 1350844 backport to esr45

bug1350844-esr45.diff (text/plain), 1.13 KB, created by Steve Fink [:sfink] [:s:]

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Fink [:sfink] [:s:]

Size: 1.13 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 8ae975333fc93e7348caf1d3dfe4ae9f1425d0fd
># Parent  eed8086d0af7f2a76152af1b7893afc149d26e47
>Bug 1350844 - Don't add dead proxy zone edges for zones which are not being collected. r=sfink, a=jcristau
>
>diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
>--- a/js/src/jsgc.cpp
>+++ b/js/src/jsgc.cpp
>@@ -4581,16 +4581,18 @@ 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;
>                 Zone* wrappedZone = static_cast<JSObject*>(e.front().key().wrapped)->zone();
>+                if (!wrappedZone->isGCMarking())
>+                    continue;
>                 if (!wrappedZone->gcZoneGroupEdges.put(zone()))
>                     return false;
>             }
>         }
>     }
> 
>     return true;
> }

Flags:

jcristau: approval-mozilla-esr45+

Actions: View | Diff | Review

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

Bugzilla

Quick Search

Attachment 8854573 Details for Bug 1350844