Bug 1186626 - Part 5: Remove AutoShapeVector; r=sfink

--HG--
extra : rebase_source : 3260e796aec30d06853d77df0071834d8d697aa7

js/public/TraceKind.h

@@ -14,6 +14,7 @@ namespace js {
 class BaseShape;
 class LazyScript;
 class ObjectGroup;
+class Shape;
 namespace jit {
 class JitCode;
 } // namespace jit

js/src/gc/RootMarking.cpp

@@ -124,13 +124,6 @@ AutoGCRooter::trace(JSTracer* trc)
         return;
       }
 
-      case SHAPEVECTOR: {
-        AutoShapeVector::VectorImpl& vector = static_cast<js::AutoShapeVector*>(this)->vector;
-        TraceRootRange(trc, vector.length(), const_cast<Shape**>(vector.begin()),
-                       "js::AutoShapeVector.vector");
-        return;
-      }
-
       case OBJVECTOR: {
         AutoObjectVector::VectorImpl& vector = static_cast<AutoObjectVector*>(this)->vector;
         TraceRootRange(trc, vector.length(), vector.begin(), "JS::AutoObjectVector.vector");

js/src/jscntxt.h

@@ -665,7 +665,6 @@ CheckForInterrupt(JSContext* cx)
 
 typedef JS::AutoVectorRooter<JSString*> AutoStringVector;
 typedef JS::AutoVectorRooter<PropertyName*> AutoPropertyNameVector;
-typedef JS::AutoVectorRooter<Shape*> AutoShapeVector;
 
 using ShapeVector = js::TraceableVector<Shape*>;
 

js/src/jspubtd.h

@@ -48,7 +48,6 @@ struct Zone;
 namespace js {
 struct ContextFriendFields;
 class RootLists;
-class Shape;
 } // namespace js
 
 /*
@@ -220,7 +219,6 @@ class JS_PUBLIC_API(AutoGCRooter)
     enum {
         VALARRAY =     -2, /* js::AutoValueArray */
         PARSER =       -3, /* js::frontend::Parser */
-        SHAPEVECTOR =  -4, /* js::AutoShapeVector */
         IDARRAY =      -6, /* js::AutoIdArray */
         VALVECTOR =   -10, /* js::AutoValueVector */
         IDVECTOR =    -11, /* js::AutoIdVector */
@@ -242,7 +240,6 @@ class JS_PUBLIC_API(AutoGCRooter)
     static ptrdiff_t GetTag(JSObject* obj) { return OBJVECTOR; }
     static ptrdiff_t GetTag(JSScript* script) { return SCRIPTVECTOR; }
     static ptrdiff_t GetTag(JSString* string) { return STRINGVECTOR; }
-    static ptrdiff_t GetTag(js::Shape* shape) { return SHAPEVECTOR; }
 
   private:
     AutoGCRooter ** const stackTop;