Bug 880565 (part 2) - Remove unnecessary #includes in jsobjinlines.h. r=benjamin.
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 06 Jun 2013 17:48:12 -0700
changeset 135132 7a56133fe3829886d594c8e1ac1768061f0eeaf9
parent 135131 b86a5ad596b74bcffb1615fc332e7b7e2a726408
child 135133 9080f67017333600df504cfb05c8579789c6e347
push id29533
push usernnethercote@mozilla.com
push dateFri, 14 Jun 2013 21:23:50 +0000
treeherdermozilla-inbound@7a56133fe382 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenjamin
bugs880565
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 880565 (part 2) - Remove unnecessary #includes in jsobjinlines.h. r=benjamin.
js/src/builtin/MapObject.cpp
js/src/ion/Ion.cpp
js/src/jsatominlines.h
js/src/jscompartment.cpp
js/src/jsinferinlines.h
js/src/jsobjinlines.h
js/src/jsscriptinlines.h
js/src/jsweakmap.cpp
js/src/vm/GlobalObject.cpp
js/src/vm/ScopeObject.cpp
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -13,16 +13,18 @@
 #include "gc/Marking.h"
 #include "js/Utility.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
 #include "vm/Stack.h"
 
 #include "jsobjinlines.h"
 
+#include "gc/Barrier-inl.h"
+
 using namespace js;
 
 using mozilla::DoubleIsInt32;
 using mozilla::IsNaN;
 
 
 /*** OrderedHashTable ****************************************************************************/
 
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -35,18 +35,22 @@
 #if defined(JS_CPU_X86)
 # include "x86/Lowering-x86.h"
 #elif defined(JS_CPU_X64)
 # include "x64/Lowering-x64.h"
 #elif defined(JS_CPU_ARM)
 # include "arm/Lowering-arm.h"
 #endif
 #include "gc/Marking.h"
+
+#include "jscompartmentinlines.h"
 #include "jsgcinlines.h"
 #include "jsinferinlines.h"
+
+#include "gc/Barrier-inl.h"
 #include "vm/Stack-inl.h"
 #include "ion/IonFrames-inl.h"
 #include "ion/CompilerRoot.h"
 #include "ExecutionModeInlines.h"
 #include "AsmJS.h"
 #include "AsmJSModule.h"
 
 #if JS_TRACE_LOGGING
--- a/js/src/jsatominlines.h
+++ b/js/src/jsatominlines.h
@@ -6,16 +6,17 @@
 
 #ifndef jsatominlines_h___
 #define jsatominlines_h___
 
 #include "mozilla/PodOperations.h"
 #include "mozilla/RangedPtr.h"
 
 #include "jsatom.h"
+#include "jscntxt.h"
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jsstr.h"
 #include "gc/Barrier.h"
 #include "vm/String.h"
 
 inline JSAtom *
 js::AtomStateEntry::asPtr() const
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -20,16 +20,18 @@
 #ifdef JS_ION
 #include "ion/IonCompartment.h"
 #endif
 #include "js/RootingAPI.h"
 
 #include "jsgcinlines.h"
 #include "jsobjinlines.h"
 
+#include "gc/Barrier-inl.h"
+
 using namespace js;
 using namespace js::gc;
 
 using mozilla::DebugOnly;
 
 JSCompartment::JSCompartment(Zone *zone)
   : zone_(zone),
     rt(zone->rt),
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -17,16 +17,18 @@
 #include "jstypedarray.h"
 
 #include "builtin/ParallelArray.h"
 #include "ion/IonFrames.h"
 #include "js/RootingAPI.h"
 #include "vm/GlobalObject.h"
 
 #include "jsanalyzeinlines.h"
+
+#include "gc/Barrier-inl.h"
 #include "vm/Stack-inl.h"
 
 #ifndef jsinferinlines_h___
 #define jsinferinlines_h___
 
 inline bool
 js::TaggedProto::isObject() const
 {
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -4,53 +4,26 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef jsobjinlines_h___
 #define jsobjinlines_h___
 
 #include "jsobj.h"
 
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsbool.h"
-#include "jscntxt.h"
-#include "jsfun.h"
-#include "jsiter.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jspropertytree.h"
-#include "jsproxy.h"
-#include "jsstr.h"
-#include "jstypedarray.h"
 #include "jswrapper.h"
 
-#include "builtin/Module.h"
-#include "gc/Barrier.h"
-#include "gc/Marking.h"
-#include "js/MemoryMetrics.h"
-#include "js/RootingAPI.h"
-#include "js/TemplateLib.h"
-#include "vm/BooleanObject.h"
-#include "vm/GlobalObject.h"
-#include "vm/Shape.h"
 #include "vm/NumberObject.h"
 #include "vm/Probes.h"
-#include "vm/RegExpStatics.h"
 #include "vm/StringObject.h"
 
 #include "jsatominlines.h"
-#include "jscompartmentinlines.h"
 #include "jsfuninlines.h"
-#include "jsgcinlines.h"
-#include "jsinferinlines.h"
-#include "gc/Barrier-inl.h"
+
 #include "vm/ObjectImpl-inl.h"
-#include "vm/Shape-inl.h"
-#include "vm/String-inl.h"
 
 /* static */ inline bool
 JSObject::enumerate(JSContext *cx, JS::HandleObject obj, JSIterateOp iterop,
                     JS::MutableHandleValue statep, JS::MutableHandleId idp)
 {
     JSNewEnumerateOp op = obj->getOps()->enumerate;
     return (op ? op : JS_EnumerateState)(cx, obj, iterop, statep, idp);
 }
--- a/js/src/jsscriptinlines.h
+++ b/js/src/jsscriptinlines.h
@@ -13,16 +13,18 @@
 #include "jsopcode.h"
 #include "jsscript.h"
 
 #include "ion/AsmJS.h"
 #include "vm/GlobalObject.h"
 #include "vm/RegExpObject.h"
 #include "vm/Shape.h"
 
+#include "jscompartmentinlines.h"
+
 #include "vm/Shape-inl.h"
 
 namespace js {
 
 inline
 Bindings::Bindings()
     : callObjShape_(NULL), bindingArrayAndFlag_(TEMPORARY_STORAGE_BIT), numArgs_(0), numVars_(0)
 {}
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -12,16 +12,18 @@
 #include "jscntxt.h"
 #include "jsfriendapi.h"
 #include "jsobj.h"
 
 #include "vm/GlobalObject.h"
 
 #include "jsobjinlines.h"
 
+#include "gc/Barrier-inl.h"
+
 using namespace js;
 
 WeakMapBase::WeakMapBase(JSObject *memOf, JSCompartment *c)
   : memberOf(memOf),
     compartment(c),
     next(WeakMapNotInList)
 {
     JS_ASSERT_IF(memberOf, memberOf->compartment() == c);
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -15,16 +15,17 @@
 #include "jsweakmap.h"
 
 #include "builtin/Eval.h"
 #include "builtin/Intl.h"
 #include "builtin/MapObject.h"
 #include "builtin/Object.h"
 #include "builtin/RegExp.h"
 
+#include "jscompartmentinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/GlobalObject-inl.h"
 #include "vm/RegExpObject-inl.h"
 #include "vm/RegExpStatics-inl.h"
 
 using namespace js;
 
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -12,17 +12,18 @@
 #include "GlobalObject.h"
 #include "ScopeObject.h"
 #include "Shape.h"
 #include "Xdr.h"
 
 #include "jsatominlines.h"
 #include "jsobjinlines.h"
 
-#include "ScopeObject-inl.h"
+#include "gc/Barrier-inl.h"
+#include "vm/ScopeObject-inl.h"
 
 using namespace js;
 using namespace js::types;
 
 using mozilla::PodZero;
 
 typedef Rooted<ArgumentsObject *> RootedArgumentsObject;