From b72ec6d7d5bbaeb1cec8146d5e6a9f71c8bd0a78 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Tue, 27 Nov 2012 12:00:26 -0800
Subject: [PATCH] No bug - Fix macro warning in jsgc.cpp (rs=Waldo)

---
 js/src/jsgc.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index d06905ffcde2..f694271b7bf3 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3889,22 +3889,22 @@ RemoveFromGrayList(RawObject wrapper)
     wrapper->setReservedSlot(slot, UndefinedValue());
 
     JSCompartment *c = CrossCompartmentPointerReferent(wrapper)->compartment();
-    RawObject o = c->gcIncomingGrayPointers;
-    if (o == wrapper) {
+    RawObject obj = c->gcIncomingGrayPointers;
+    if (obj == wrapper) {
         c->gcIncomingGrayPointers = tail;
         return true;
     }
 
-    while (o) {
+    while (obj) {
         unsigned slot = GrayLinkSlot(o);
         RawObject next = o->getReservedSlot(slot).toObjectOrNull();
         if (next == wrapper) {
-            o->setCrossCompartmentSlot(slot, ObjectOrNullValue(tail));
+            obj->setCrossCompartmentSlot(slot, ObjectOrNullValue(tail));
             return true;
         }
-        o = next;
+        obj = next;
     }
-    JS_NOT_REACHED();
+    JS_NOT_REACHED("object not found in gray link list");
 }
 
 void