No bug - Fix compile error in jsgc.cpp
☠☠ backed out by 37a54196d003 ☠ ☠
authorBill McCloskey <wmccloskey@mozilla.com>
Tue, 27 Nov 2012 12:04:22 -0800
changeset 114260 fff6b88d59c4a68ad5baec1ef09bbb8e87a04eeb
parent 114259 5b113b89bb19f2f6f127a0f8289556372824410b
child 114261 ed22fe593f97d602594a2af98b94574fa8d54c81
push id23913
push useremorley@mozilla.com
push dateWed, 28 Nov 2012 17:11:31 +0000
treeherdermozilla-central@17c267a881cf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
No bug - Fix compile error in jsgc.cpp
js/src/jsgc.cpp
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3891,18 +3891,18 @@ RemoveFromGrayList(RawObject wrapper)
     JSCompartment *c = CrossCompartmentPointerReferent(wrapper)->compartment();
     RawObject obj = c->gcIncomingGrayPointers;
     if (obj == wrapper) {
         c->gcIncomingGrayPointers = tail;
         return true;
     }
 
     while (obj) {
-        unsigned slot = GrayLinkSlot(o);
-        RawObject next = o->getReservedSlot(slot).toObjectOrNull();
+        unsigned slot = GrayLinkSlot(obj);
+        RawObject next = obj->getReservedSlot(slot).toObjectOrNull();
         if (next == wrapper) {
             obj->setCrossCompartmentSlot(slot, ObjectOrNullValue(tail));
             return true;
         }
         obj = next;
     }
     JS_NOT_REACHED("object not found in gray link list");
 }