From bbe35a1f304deaad63d2f8c44e8cf57aa221f034 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Wed, 5 Aug 2015 12:09:19 -0700
Subject: [PATCH] Backout 6249e4edb023 (Bug 1191099) for build bustage on a
 CLOSED TREE.

---
 js/src/NamespaceImports.h | 8 ++------
 js/src/frontend/Parser.h  | 4 ++--
 js/src/jsapi.h            | 7 +------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/js/src/NamespaceImports.h b/js/src/NamespaceImports.h
index 6c793e76e0fb..ff110e6e26d7 100644
--- a/js/src/NamespaceImports.h
+++ b/js/src/NamespaceImports.h
@@ -13,7 +13,6 @@
 // These includes are needed these for some typedefs (e.g. HandleValue) and
 // functions (e.g. NullValue())...
 #include "js/CallNonGenericMethod.h"
-#include "js/TraceableVector.h"
 #include "js/TypeDecls.h"
 #include "js/Value.h"
 
@@ -34,6 +33,7 @@ class AutoVectorRooter;
 typedef AutoVectorRooter<Value> AutoValueVector;
 typedef AutoVectorRooter<jsid> AutoIdVector;
 typedef AutoVectorRooter<JSObject*> AutoObjectVector;
+typedef AutoVectorRooter<JSFunction*> AutoFunctionVector;
 typedef AutoVectorRooter<JSScript*> AutoVector;
 
 class AutoIdArray;
@@ -81,13 +81,9 @@ using JS::AutoVectorRooter;
 typedef AutoVectorRooter<Value> AutoValueVector;
 typedef AutoVectorRooter<jsid> AutoIdVector;
 typedef AutoVectorRooter<JSObject*> AutoObjectVector;
+typedef AutoVectorRooter<JSFunction*> AutoFunctionVector;
 typedef AutoVectorRooter<JSScript*> AutoScriptVector;
 
-using ValueVector = TraceableVector<JS::Value>;
-using IdVector = TraceableVector<jsid>;
-using ObjectVector = TraceableVector<JSObject*>;
-using ScriptVector = TraceableVector<JSScript*>;
-
 using JS::AutoIdArray;
 
 using JS::AutoHashMapRooter;
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index e78f8e600b4d..ec10a08b4500 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -232,7 +232,7 @@ struct ParseContext : public GenericParseContext
                                        the same name. */
 
     // All inner functions in this context. Only filled in when parsing syntax.
-    Rooted<TraceableVector<JSFunction*>> innerFunctions;
+    AutoFunctionVector innerFunctions;
 
     // In a function context, points to a Directive struct that can be updated
     // to reflect new directives encountered in the Directive Prologue that
@@ -273,7 +273,7 @@ struct ParseContext : public GenericParseContext
         oldpc(prs->pc),
         lexdeps(prs->context),
         funcStmts(nullptr),
-        innerFunctions(prs->context, TraceableVector<JSFunction*>(prs->context)),
+        innerFunctions(prs->context),
         newDirectives(newDirectives),
         inDeclDestructuring(false)
     {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 376741069e56..4bdaf684ebad 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -28,7 +28,6 @@
 #include "js/Id.h"
 #include "js/Principals.h"
 #include "js/RootingAPI.h"
-#include "js/TraceableVector.h"
 #include "js/TracingAPI.h"
 #include "js/Utility.h"
 #include "js/Value.h"
@@ -215,13 +214,9 @@ class MOZ_STACK_CLASS AutoVectorRooter : public AutoVectorRooterBase<T>
 typedef AutoVectorRooter<Value> AutoValueVector;
 typedef AutoVectorRooter<jsid> AutoIdVector;
 typedef AutoVectorRooter<JSObject*> AutoObjectVector;
+typedef AutoVectorRooter<JSFunction*> AutoFunctionVector;
 typedef AutoVectorRooter<JSScript*> AutoScriptVector;
 
-using ValueVector = js::TraceableVector<JS::Value>;
-using IdVector = js::TraceableVector<jsid>;
-using ObjectVector = js::TraceableVector<JSObject*>;
-using ScriptVector = js::TraceableVector<JSScript*>;
-
 template<class Key, class Value>
 class AutoHashMapRooter : protected AutoGCRooter
 {