Bug 915482 (part 2) - Minimize gc/Barrier-inl.h includes. r=terrence.

--HG--
extra : rebase_source : d4faf130a8022f335ae0ddcd4e02fdc59109d47d

js/src/gc/Barrier-inl.h

@@ -9,13 +9,6 @@
 
 #include "gc/Barrier.h"
 
-#include "jscompartment.h"
-
-#include "gc/Marking.h"
-#include "gc/StoreBuffer.h"
-
-#include "vm/String-inl.h"
-
 namespace js {
 
 inline const Value &

js/src/jsapi-tests/testGCFinalizeCallback.cpp

@@ -9,8 +9,6 @@
 
 #include "jsapi-tests/tests.h"
 
-#include "vm/ObjectImpl-inl.h"
-
 const unsigned BufferSize = 20;
 static unsigned FinalizeCalls = 0;
 static JSFinalizeStatus StatusBuffer[BufferSize];

js/src/jscntxtinlines.h

@@ -8,6 +8,7 @@
 #define jscntxtinlines_h
 
 #include "jscntxt.h"
+#include "jscompartment.h"
 
 #include "jsiter.h"
 #include "jsworkers.h"
@@ -18,8 +19,6 @@
 #include "vm/Interpreter.h"
 #include "vm/ProxyObject.h"
 
-#include "gc/Barrier-inl.h"
-
 namespace js {
 
 #ifdef JS_CRASH_DIAGNOSTICS

js/src/jscompartment.cpp

@@ -29,8 +29,6 @@
 #include "jsgcinlines.h"
 #include "jsinferinlines.h"
 
-#include "gc/Barrier-inl.h"
-
 using namespace js;
 using namespace js::gc;
 

js/src/jscompartmentinlines.h

@@ -9,6 +9,8 @@
 
 #include "jscompartment.h"
 
+#include "gc/Barrier-inl.h"
+
 inline void
 JSCompartment::initGlobal(js::GlobalObject &global)
 {

js/src/jsobjinlines.h

@@ -18,6 +18,7 @@
 
 #include "jsatominlines.h"
 #include "jscompartmentinlines.h"
+#include "jsgcinlines.h"
 #include "jsinferinlines.h"
 
 #include "vm/Shape-inl.h"

js/src/jswatchpoint.cpp

@@ -14,8 +14,6 @@
 
 #include "jsgcinlines.h"
 
-#include "gc/Barrier-inl.h"
-
 using namespace js;
 using namespace js::gc;
 

js/src/jsweakmap.cpp

@@ -19,8 +19,6 @@
 
 #include "jsobjinlines.h"
 
-#include "gc/Barrier-inl.h"
-
 using namespace js;
 
 WeakMapBase::WeakMapBase(JSObject *memOf, JSCompartment *c)

js/src/vm/Interpreter-inl.h

@@ -24,6 +24,7 @@
 #include "jsobjinlines.h"
 
 #include "vm/Stack-inl.h"
+#include "vm/String-inl.h"
 
 namespace js {
 

js/src/vm/ObjectImpl-inl.h

@@ -9,12 +9,11 @@
 
 #include "vm/ObjectImpl.h"
 
+#include "jscntxt.h"
 #include "jsproxy.h"
 
 #include "vm/ProxyObject.h"
 
-#include "gc/Barrier-inl.h"
-
 /* static */ inline bool
 js::ObjectImpl::isExtensible(ExclusiveContext *cx, js::Handle<ObjectImpl*> obj, bool *extensible)
 {

js/src/vm/ScopeObject.cpp

@@ -21,7 +21,6 @@
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
-#include "gc/Barrier-inl.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;