Back out 331146c93ebe (bug 673125 part 3).
authorJason Orendorff <jorendorff@mozilla.com>
Tue, 23 Aug 2011 15:34:31 -0500
changeset 75770 46dcf0b550eed68464e3a9a9ee942caa1e58a007
parent 75769 7d5ebc4ed8b35e6ef7ee4f91b2e9e6ab70eeb7a8
child 75771 3cbe0a312779fa89bd7d5adbda36494437563c68
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
bugs673125
milestone9.0a1
backs out331146c93ebedb27babefef5321f33bef6806830
Back out 331146c93ebe (bug 673125 part 3).
js/src/jscntxt.h
js/src/jsgc.cpp
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -1477,18 +1477,17 @@ class AutoGCRooter {
         XML =          -9, /* js::AutoXMLRooter */
         OBJECT =      -10, /* js::AutoObjectRooter */
         ID =          -11, /* js::AutoIdRooter */
         VALVECTOR =   -12, /* js::AutoValueVector */
         DESCRIPTOR =  -13, /* js::AutoPropertyDescriptorRooter */
         STRING =      -14, /* js::AutoStringRooter */
         IDVECTOR =    -15, /* js::AutoIdVector */
         BINDINGS =    -16, /* js::Bindings */
-        SHAPEVECTOR = -17, /* js::AutoShapeVector */
-        OBJVECTOR =   -18  /* js::AutoObjectVector */
+        SHAPEVECTOR = -17  /* js::AutoShapeVector */
     };
 
     private:
     /* No copy or assignment semantics. */
     AutoGCRooter(AutoGCRooter &ida);
     void operator=(AutoGCRooter &ida);
 };
 
@@ -2483,29 +2482,16 @@ class AutoValueVector : public AutoVecto
     jsval *jsval_begin() { return Jsvalify(begin()); }
 
     const jsval *jsval_end() const { return Jsvalify(end()); }
     jsval *jsval_end() { return Jsvalify(end()); }
 
     JS_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
-class AutoObjectVector : public AutoVectorRooter<JSObject *>
-{
-  public:
-    explicit AutoObjectVector(JSContext *cx
-                              JS_GUARD_OBJECT_NOTIFIER_PARAM)
-        : AutoVectorRooter<JSObject *>(cx, OBJVECTOR)
-    {
-        JS_GUARD_OBJECT_NOTIFIER_INIT;
-    }
-
-    JS_DECL_USE_GUARD_OBJECT_NOTIFIER
-};
-
 class AutoIdVector : public AutoVectorRooter<jsid>
 {
   public:
     explicit AutoIdVector(JSContext *cx
                           JS_GUARD_OBJECT_NOTIFIER_PARAM)
         : AutoVectorRooter<jsid>(cx, IDVECTOR)
     {
         JS_GUARD_OBJECT_NOTIFIER_INIT;
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1779,22 +1779,16 @@ AutoGCRooter::trace(JSTracer *trc)
         MarkShapeRange(trc, vector.length(), vector.begin(), "js::AutoShapeVector.vector");
         return;
       }
 
       case BINDINGS: {
         static_cast<js::AutoBindingsRooter *>(this)->bindings.trace(trc);
         return;
       }
-
-      case OBJVECTOR: {
-        AutoObjectVector::VectorImpl &vector = static_cast<AutoObjectVector *>(this)->vector;
-        MarkObjectRange(trc, vector.length(), vector.begin(), "js::AutoObjectVector.vector");
-        return;
-      }
     }
 
     JS_ASSERT(tag >= 0);
     MarkValueRange(trc, tag, static_cast<AutoArrayRooter *>(this)->array, "js::AutoArrayRooter.array");
 }
 
 namespace js {