--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3884,32 +3884,32 @@ RemoveFromGrayList(RawObject wrapper)
     unsigned slot = GrayLinkSlot(wrapper);
     if (wrapper->getReservedSlot(slot).isUndefined())
         return false;  /* Not on our list. */
 
     RawObject tail = wrapper->getReservedSlot(slot).toObjectOrNull();
     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;
-    }
-    JS_NOT_REACHED("object not found in gray link list");
+        o = next;
+    }
+    JS_NOT_REACHED();
 }
 
 void
 js::NotifyGCNukeWrapper(RawObject o)
 {
     /*
      * References to target of wrapper are being removed, we no longer have to
      * remember to mark it.