Backed out changesets fff6b88d59c4 and 1c53e57a11ba (no bug) for OSX 10.8 bc crashes.

This commit is contained in:
Ryan VanderMeulen 2012-11-27 16:44:37 -05:00
parent 69c983597a
commit 3e7d164419

View File

@ -3889,22 +3889,22 @@ RemoveFromGrayList(RawObject wrapper)
wrapper->setReservedSlot(slot, UndefinedValue());
JSCompartment *c = CrossCompartmentPointerReferent(wrapper)->compartment();
RawObject obj = c->gcIncomingGrayPointers;
if (obj == wrapper) {
RawObject o = c->gcIncomingGrayPointers;
if (o == wrapper) {
c->gcIncomingGrayPointers = tail;
return true;
}
while (obj) {
unsigned slot = GrayLinkSlot(obj);
RawObject next = obj->getReservedSlot(slot).toObjectOrNull();
while (o) {
unsigned slot = GrayLinkSlot(o);
RawObject next = o->getReservedSlot(slot).toObjectOrNull();
if (next == wrapper) {
obj->setCrossCompartmentSlot(slot, ObjectOrNullValue(tail));
o->setCrossCompartmentSlot(slot, ObjectOrNullValue(tail));
return true;
}
obj = next;
o = next;
}
JS_NOT_REACHED("object not found in gray link list");
JS_NOT_REACHED();
}
void