Bug 850074 - Move SpiderMonkey stack rooting infrastructure to RootingAPI.h; r=billm

--HG--
rename : js/src/gc/Root.h => js/public/RootingAPI.h
extra : rebase_source : 52027c9c887f686a86097e5465179fa69fac9d6c

js/public/Value.h

@@ -16,8 +16,8 @@
 
 #include <limits> /* for std::numeric_limits */
 
-#include "gc/Root.h"
 #include "js/Anchor.h"
+#include "js/RootingAPI.h"
 #include "js/Utility.h"
 
 namespace JS { class Value; }

js/src/Makefile.in

@@ -176,16 +176,12 @@ INSTALLED_HEADERS = \
 # BEGIN exported headers that are only exported
 #       because of inclusion by an INSTALLED_HEADER
 #
-EXPORTS_NAMESPACES += ds gc
+EXPORTS_NAMESPACES += ds
 
 EXPORTS_ds = \
 		BitArray.h \
 		$(NULL)
 
-EXPORTS_gc = \
-		Root.h \
-		$(NULL)
-
 ######################################################
 # BEGIN include exported headers from the JS engine
 #
@@ -212,6 +208,7 @@ EXPORTS_js = \
 		MemoryMetrics.h \
 		PropertyKey.h \
 		RequiredDefines.h \
+		RootingAPI.h \
 		TemplateLib.h \
 		Utility.h \
 		Value.h \

js/src/assembler/assembler/AssemblerBuffer.h

@@ -43,9 +43,9 @@
 #include "jsfriendapi.h"
 #include "jsopcode.h"
 
-#include "gc/Root.h"
-#include "methodjit/Logging.h"
 #include "ion/IonSpewer.h"
+#include "js/RootingAPI.h"
+#include "methodjit/Logging.h"
 
 #define PRETTY_PRINT_OFFSET(os) (((os)<0)?"-":""), (((os)<0)?-(os):(os))
 

js/src/builtin/Intl.h

@@ -7,7 +7,7 @@
 #ifndef Intl_h___
 #define Intl_h___
 
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 
 struct JSContext;
 class JSObject;

js/src/gc/Barrier.h

@@ -11,8 +11,8 @@
 #include "jsapi.h"
 
 #include "gc/Heap.h"
-#include "gc/Root.h"
 #include "js/HashTable.h"
+#include "js/RootingAPI.h"
 
 /*
  * A write barrier is a mechanism used by incremental or generation GCs to

js/src/ion/C1Spewer.h

@@ -10,9 +10,10 @@
 #ifndef jsion_c1spewer_h__
 #define jsion_c1spewer_h__
 
-#include "gc/Root.h"
 #include "jsscript.h"
 
+#include "js/RootingAPI.h"
+
 namespace js {
 namespace ion {
 

js/src/ion/CompilerRoot.h

@@ -9,7 +9,8 @@
 #define jsion_ion_gc_h__
 
 #include "jscntxt.h"
-#include "gc/Root.h"
+
+#include "js/RootingAPI.h"
 
 namespace js {
 namespace ion {

js/src/ion/IonMacroAssembler.cpp

@@ -6,12 +6,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsinfer.h"
-#include "jsinferinlines.h"
-#include "IonMacroAssembler.h"
-#include "gc/Root.h"
-#include "Bailouts.h"
+
+#include "ion/Bailouts.h"
+#include "ion/IonMacroAssembler.h"
+#include "js/RootingAPI.h"
 #include "vm/ForkJoin.h"
 
+#include "jsinferinlines.h"
+
 using namespace js;
 using namespace js::ion;
 

js/src/ion/JSONSpewer.h

@@ -10,9 +10,10 @@
 
 #include <stdio.h>
 
-#include "gc/Root.h"
 #include "jsscript.h"
 
+#include "js/RootingAPI.h"
+
 class JSScript;
 
 namespace js {

js/src/jsapi-tests/tests.cpp

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "tests.h"
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 #include "jsobj.h"
 #include <stdio.h>
 

js/src/jsapi.h

@@ -25,11 +25,11 @@
 #include "jspubtd.h"
 #include "jsutil.h"
 
-#include "gc/Root.h"
 #include "js/Anchor.h"
 #include "js/CharacterEncoding.h"
 #include "js/HashTable.h"
 #include "js/PropertyKey.h"
+#include "js/RootingAPI.h"
 #include "js/Utility.h"
 #include "js/Value.h"
 #include "js/Vector.h"

js/src/jsboolinlines.h

@@ -10,7 +10,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
 
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 
 #include "jsobjinlines.h"
 

js/src/jscompartment.cpp

@@ -22,12 +22,12 @@
 #endif
 #include "assembler/wtf/Platform.h"
 #include "gc/Marking.h"
-#include "gc/Root.h"
 #ifdef JS_ION
 #include "ion/IonCompartment.h"
 #include "ion/Ion.h"
 #endif
 #include "js/MemoryMetrics.h"
+#include "js/RootingAPI.h"
 #include "methodjit/MethodJIT.h"
 #include "methodjit/PolyIC.h"
 #include "methodjit/MonoIC.h"

js/src/jsgcinlines.h

@@ -12,7 +12,7 @@
 #include "jscompartment.h"
 #include "jslock.h"
 
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 #include "js/TemplateLib.h"
 #include "vm/Shape.h"
 

js/src/jsinferinlines.h

@@ -12,11 +12,11 @@
 #include "jsinfer.h"
 #include "jsprf.h"
 
-#include "gc/Root.h"
-#include "vm/GlobalObject.h"
 #ifdef JS_ION
 #include "ion/IonFrames.h"
 #endif
+#include "js/RootingAPI.h"
+#include "vm/GlobalObject.h"
 
 #include "vm/Stack-inl.h"
 

js/src/jsobjinlines.h

@@ -28,8 +28,8 @@
 #include "builtin/Iterator-inl.h"
 #include "gc/Barrier.h"
 #include "gc/Marking.h"
-#include "gc/Root.h"
 #include "js/MemoryMetrics.h"
+#include "js/RootingAPI.h"
 #include "js/TemplateLib.h"
 #include "vm/BooleanObject.h"
 #include "vm/GlobalObject.h"

js/src/jsscript.h

@@ -10,12 +10,13 @@
 /*
  * JS script descriptor.
  */
+
 #include "jsdbgapi.h"
 #include "jsinfer.h"
 #include "jsopcode.h"
 
 #include "gc/Barrier.h"
-#include "gc/Root.h"
+#include "js/RootingAPI.h"
 #include "vm/Shape.h"
 
 ForwardDeclareJS(Script);

js/src/vm/PropertyKey.cpp

@@ -8,8 +8,8 @@
 
 #include "mozilla/Assertions.h"
 
-#include "gc/Root.h"
 #include "js/PropertyKey.h"
+#include "js/RootingAPI.h"
 #include "js/Value.h"
 #include "vm/String.h"
 

js/src/vm/Shape.h

@@ -15,9 +15,9 @@
 #include "jspropertytree.h"
 #include "jstypes.h"
 
-#include "js/HashTable.h"
 #include "gc/Heap.h"
-#include "gc/Root.h"
+#include "js/HashTable.h"
+#include "js/RootingAPI.h"
 
 #ifdef _MSC_VER
 #pragma warning(push)

js/src/vm/String.h

@@ -11,8 +11,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/GuardObjects.h"
 
-#include "js/CharacterEncoding.h"
-
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jsfriendapi.h"
@@ -20,7 +18,8 @@
 
 #include "gc/Barrier.h"
 #include "gc/Heap.h"
-#include "gc/Root.h"
+#include "js/CharacterEncoding.h"
+#include "js/RootingAPI.h"
 
 ForwardDeclareJS(String);
 class JSDependentString;