Bug 921130 - Minimize the #includes in js/src/jit; r=luke

js/public/CharacterEncoding.h

@@ -10,10 +10,13 @@
 #include "mozilla/NullPtr.h"
 #include "mozilla/Range.h"
 
-#include "jspubtd.h"
-
+#include "js/TypeDecls.h"
 #include "js/Utility.h"
 
+namespace js {
+struct ThreadSafeContext;
+}
+
 namespace JS {
 
 /*

js/src/assembler/assembler/MacroAssemblerCodeRef.h

@@ -30,6 +30,7 @@
 #ifndef assembler_assembler_MacroAssemblerCodeRef_h
 #define assembler_assembler_MacroAssemblerCodeRef_h
 
+#include "assembler/wtf/Assertions.h"
 #include "assembler/wtf/Platform.h"
 #include "assembler/jit/ExecutableAllocator.h"
 

js/src/builtin/Intl.h

@@ -9,8 +9,6 @@
 
 #include "NamespaceImports.h"
 
-#include "js/RootingAPI.h"
-
 /*
  * The Intl module specified by standard ECMA-402,
  * ECMAScript Internationalization API Specification.

js/src/builtin/Object.h

@@ -7,7 +7,8 @@
 #ifndef builtin_Object_h
 #define builtin_Object_h
 
-#include "jsobj.h"
+#include "jsapi.h"
+#include "js/Value.h"
 
 namespace js {
 
@@ -16,12 +17,12 @@ extern const JSFunctionSpec object_static_methods[];
 
 // Object constructor native. Exposed only so the JIT can know its address.
 bool
-obj_construct(JSContext *cx, unsigned argc, js::Value *vp);
+obj_construct(JSContext *cx, unsigned argc, JS::Value *vp);
 
 #if JS_HAS_TOSOURCE
 // Object.prototype.toSource. Function.prototype.toSource and uneval use this.
 JSString *
-ObjectToSource(JSContext *cx, HandleObject obj);
+ObjectToSource(JSContext *cx, JS::HandleObject obj);
 #endif // JS_HAS_TOSOURCE
 
 } /* namespace js */

js/src/builtin/ParallelArray.h

@@ -9,8 +9,6 @@
 
 #include "jsobj.h"
 
-#include "jit/Ion.h"
-
 namespace js {
 
 class ParallelArrayObject : public JSObject

js/src/builtin/Profilers.cpp

@@ -11,12 +11,16 @@
 #include <stdarg.h>
 
 #ifdef MOZ_CALLGRIND
-#include <valgrind/callgrind.h>
+# include <valgrind/callgrind.h>
 #endif
 
 #ifdef __APPLE__
-#include "devtools/Instruments.h"
-#include "devtools/sharkctl.h"
+#ifdef MOZ_INSTRUMENTS
+# include "devtools/Instruments.h"
+#endif
+#ifdef MOZ_SHARK
+# include "devtools/sharkctl.h"
+#endif
 #endif
 
 #include "vm/Probes.h"

js/src/ctypes/CTypes.cpp

@@ -31,13 +31,11 @@
 #include <windows.h>
 #endif
 
-#include "jscompartment.h"
 #include "jsnum.h"
 #include "jsprf.h"
 
 #include "builtin/TypeRepresentation.h"
 #include "ctypes/Library.h"
-#include "vm/TypedArrayObject.h"
 
 using namespace std;
 

js/src/ctypes/CTypes.h

@@ -7,10 +7,12 @@
 #define ctypes_CTypes_h
 
 #include "ffi.h"
-#include "jscntxt.h"
+#include "jsalloc.h"
 #include "prlink.h"
 
 #include "js/HashTable.h"
+#include "js/Vector.h"
+#include "vm/String.h"
 
 namespace js {
 namespace ctypes {

js/src/ctypes/Library.cpp

@@ -6,8 +6,6 @@
 
 #include "ctypes/Library.h"
 
-#include "jscntxt.h"
-#include "jsstr.h"
 #include "prlink.h"
 
 #include "ctypes/CTypes.h"

js/src/frontend/BytecodeEmitter.cpp

@@ -33,13 +33,11 @@
 #include "vm/Debugger.h"
 
 #include "jsatominlines.h"
-#include "jsfuninlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "frontend/ParseMaps-inl.h"
 #include "frontend/ParseNode-inl.h"
-#include "vm/ScopeObject-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/frontend/ParseMaps.h

@@ -12,7 +12,6 @@
 
 #include "ds/InlineMap.h"
 #include "gc/Barrier.h"
-#include "js/HashTable.h"
 #include "js/Vector.h"
 
 class JSAtom;

js/src/frontend/ParseNode.h

@@ -9,8 +9,6 @@
 
 #include "mozilla/Attributes.h"
 
-#include "jsscript.h"
-
 #include "builtin/Module.h"
 #include "frontend/TokenStream.h"
 

js/src/gc/Barrier.h

@@ -10,7 +10,9 @@
 #include "NamespaceImports.h"
 
 #include "gc/Heap.h"
-#include "gc/StoreBuffer.h"
+#ifdef JSGC_GENERATIONAL
+# include "gc/StoreBuffer.h"
+#endif
 #include "js/HashTable.h"
 #include "js/Id.h"
 #include "js/RootingAPI.h"

js/src/gc/FindSCCs.h

@@ -7,6 +7,7 @@
 #ifndef gc_FindSCCs_h
 #define gc_FindSCCs_h
 
+#include "jsfriendapi.h"
 #include "jsutil.h"
 
 namespace js {

js/src/gc/Marking.cpp

@@ -17,7 +17,9 @@
 #include "jscompartmentinlines.h"
 #include "jsinferinlines.h"
 
-#include "gc/Nursery-inl.h"
+#ifdef JSGC_GENERATIONAL
+# include "gc/Nursery-inl.h"
+#endif
 #include "vm/String-inl.h"
 
 using namespace js;

js/src/gc/Marking.h

@@ -8,7 +8,6 @@
 #define gc_Marking_h
 
 #include "gc/Barrier.h"
-#include "js/TypeDecls.h"
 
 class JSAtom;
 class JSLinearString;

js/src/gc/RootMarking.cpp

@@ -4,7 +4,6 @@
  * 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/. */
 
-#include "mozilla/DebugOnly.h"
 #include "mozilla/Util.h"
 
 #ifdef MOZ_VALGRIND
@@ -23,7 +22,6 @@
 #include "gc/GCInternals.h"
 #include "gc/Marking.h"
 #ifdef JS_ION
-# include "jit/IonFrameIterator.h"
 # include "jit/IonMacroAssembler.h"
 #endif
 #include "js/HashTable.h"

js/src/jit/AsmJS.cpp

@@ -16,6 +16,7 @@
 #include "jsworkers.h"
 #include "prmjtime.h"
 
+#include "assembler/assembler/MacroAssembler.h"
 #include "frontend/Parser.h"
 #include "jit/AsmJSLink.h"
 #include "jit/AsmJSModule.h"

js/src/jit/AsmJSModule.h

@@ -18,6 +18,7 @@
 #include "jit/IonMacroAssembler.h"
 #include "jit/PerfSpewer.h"
 #include "jit/RegisterSets.h"
+#include "vm/TypedArrayObject.h"
 
 namespace js {
 
@@ -405,7 +406,7 @@ class AsmJSModule
             perfProfiledBlocksFunctions_[i].trace(trc);
 #endif
         if (maybeHeap_)
-            MarkObject(trc, &maybeHeap_, "asm.js heap");
+            gc::MarkObject(trc, &maybeHeap_, "asm.js heap");
 
         if (globalArgumentName_)
             MarkStringUnbarriered(trc, &globalArgumentName_, "asm.js global argument name");

js/src/jit/BacktrackingAllocator.cpp

@@ -5,8 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jit/BacktrackingAllocator.h"
-
 #include "jsprf.h"
+#include "jit/BitSet.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/BaselineBailouts.cpp

@@ -4,14 +4,12 @@
  * 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/. */
 
-#include "jit/BaselineCompiler.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
 #include "jit/CompileInfo.h"
 #include "jit/IonSpewer.h"
 #include "vm/ArgumentsObject.h"
 
-#include "jsfuninlines.h"
 #include "jsscriptinlines.h"
 
 #include "jit/IonFrames-inl.h"

js/src/jit/BaselineCompiler.cpp

@@ -12,7 +12,6 @@
 #include "jit/FixedList.h"
 #include "jit/IonLinker.h"
 #include "jit/IonSpewer.h"
-#include "jit/PerfSpewer.h"
 #include "jit/VMFunctions.h"
 
 #include "jsscriptinlines.h"

js/src/jit/BaselineCompiler.h

@@ -9,12 +9,7 @@
 
 #ifdef JS_ION
 
-#include "jit/BaselineIC.h"
-#include "jit/BaselineJIT.h"
-#include "jit/BytecodeAnalysis.h"
 #include "jit/FixedList.h"
-#include "jit/IonAllocPolicy.h"
-#include "jit/IonCode.h"
 #if defined(JS_CPU_X86)
 # include "jit/x86/BaselineCompiler-x86.h"
 #elif defined(JS_CPU_X64)

js/src/jit/BaselineFrame-inl.h

@@ -14,7 +14,6 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "jit/IonFrames.h"
 #include "vm/ScopeObject.h"
 
 namespace js {

js/src/jit/BaselineFrame.cpp

@@ -6,7 +6,6 @@
 
 #include "jit/BaselineFrame-inl.h"
 
-#include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
 #include "jit/Ion.h"
 #include "vm/Debugger.h"

js/src/jit/BaselineFrame.h

@@ -9,9 +9,6 @@
 
 #ifdef JS_ION
 
-#include "jscntxt.h"
-#include "jscompartment.h"
-
 #include "jit/IonFrames.h"
 #include "vm/Stack.h"
 

js/src/jit/BaselineFrameInfo.cpp

@@ -6,8 +6,9 @@
 
 #include "jit/BaselineFrameInfo.h"
 
-#include "jit/IonSpewer.h"
-#include "jit/shared/BaselineCompiler-shared.h"
+#ifdef DEBUG
+# include "jit/BytecodeAnalysis.h"
+#endif
 
 using namespace js;
 using namespace js::jit;

js/src/jit/BaselineFrameInfo.h

@@ -12,15 +12,15 @@
 #include "mozilla/Alignment.h"
 
 #include "jit/BaselineFrame.h"
-#include "jit/BaselineJIT.h"
 #include "jit/BaselineRegisters.h"
-#include "jit/BytecodeAnalysis.h"
 #include "jit/FixedList.h"
 #include "jit/IonMacroAssembler.h"
 
 namespace js {
 namespace jit {
 
+struct BytecodeInfo;
+
 // FrameInfo overview.
 //
 // FrameInfo is used by the compiler to track values stored in the frame. This
@@ -160,8 +160,6 @@ class StackValue
 
 enum StackAdjustment { AdjustStack, DontAdjustStack };
 
-class BaselineCompilerShared;
-
 class FrameInfo
 {
     RootedScript script;

js/src/jit/BaselineIC.cpp

@@ -10,13 +10,11 @@
 #include "jslibmath.h"
 
 #include "builtin/Eval.h"
-#include "jit/BaselineCompiler.h"
 #include "jit/BaselineHelpers.h"
 #include "jit/BaselineJIT.h"
 #include "jit/IonLinker.h"
 #include "jit/IonSpewer.h"
 #include "jit/Lowering.h"
-#include "jit/PerfSpewer.h"
 #include "jit/VMFunctions.h"
 
 #include "jsboolinlines.h"

js/src/jit/BytecodeAnalysis.cpp

@@ -7,7 +7,7 @@
 #include "jit/BytecodeAnalysis.h"
 
 #include "jsopcode.h"
-
+#include "jit/IonSpewer.h"
 #include "jsopcodeinlines.h"
 
 using namespace js;

js/src/jit/BytecodeAnalysis.h

@@ -7,6 +7,7 @@
 #ifndef jit_BytecodeAnalysis_h
 #define jit_BytecodeAnalysis_h
 
+#include "jsscript.h"
 #include "jit/IonAllocPolicy.h"
 #include "js/Vector.h"
 

js/src/jit/C1Spewer.cpp

@@ -10,8 +10,6 @@
 
 #include <time.h>
 
-#include "jit/Ion.h"
-#include "jit/IonBuilder.h"
 #include "jit/LinearScan.h"
 #include "jit/LIR.h"
 #include "jit/MIRGraph.h"

js/src/jit/CodeGenerator.cpp

@@ -9,7 +9,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/Util.h"
 
 #include "jslibmath.h"
 #include "jsmath.h"
@@ -17,16 +16,17 @@
 
 #include "builtin/Eval.h"
 #include "builtin/TypedObject.h"
-#include "gc/Nursery.h"
+#ifdef JSGC_GENERATIONAL
+# include "gc/Nursery.h"
+#endif
 #include "jit/ExecutionModeInlines.h"
+#include "jit/IonCaches.h"
 #include "jit/IonLinker.h"
 #include "jit/IonSpewer.h"
-#include "jit/Lowering.h"
 #include "jit/MIRGenerator.h"
 #include "jit/MoveEmitter.h"
 #include "jit/ParallelFunctions.h"
 #include "jit/ParallelSafetyAnalysis.h"
-#include "jit/PerfSpewer.h"
 #include "jit/RangeAnalysis.h"
 #include "vm/ForkJoin.h"
 

js/src/jit/CodeGenerator.h

@@ -7,7 +7,10 @@
 #ifndef jit_CodeGenerator_h
 #define jit_CodeGenerator_h
 
-#include "jit/PerfSpewer.h"
+#include "jit/IonCaches.h"
+#if defined(JS_ION_PERF)
+# include "jit/PerfSpewer.h"
+#endif
 
 #if defined(JS_CPU_X86)
 # include "jit/x86/CodeGenerator-x86.h"

js/src/jit/EdgeCaseAnalysis.cpp

@@ -6,9 +6,6 @@
 
 #include "jit/EdgeCaseAnalysis.h"
 
-#include "jit/Ion.h"
-#include "jit/IonBuilder.h"
-#include "jit/IonSpewer.h"
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 

js/src/jit/EffectiveAddressAnalysis.cpp

@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jit/EffectiveAddressAnalysis.h"
+#include "jit/MIR.h"
+#include "jit/MIRGraph.h"
 
 using namespace js;
 using namespace jit;

js/src/jit/EffectiveAddressAnalysis.h

@@ -7,12 +7,11 @@
 #ifndef jit_EffectiveAddressAnalysis_h
 #define jit_EffectiveAddressAnalysis_h
 
-#include "jit/MIR.h"
-#include "jit/MIRGraph.h"
-
 namespace js {
 namespace jit {
 
+class MIRGraph;
+
 class EffectiveAddressAnalysis
 {
     MIRGraph &graph_;

js/src/jit/Ion.cpp

@@ -17,37 +17,28 @@
 #include "gc/Marking.h"
 #include "jit/AliasAnalysis.h"
 #include "jit/AsmJSModule.h"
-#include "jit/AsmJSSignalHandlers.h"
 #include "jit/BacktrackingAllocator.h"
-#include "jit/BaselineCompiler.h"
+#include "jit/BaselineFrame.h"
 #include "jit/BaselineInspector.h"
 #include "jit/BaselineJIT.h"
 #include "jit/CodeGenerator.h"
-#include "jit/CompilerRoot.h"
 #include "jit/EdgeCaseAnalysis.h"
 #include "jit/EffectiveAddressAnalysis.h"
 #include "jit/ExecutionModeInlines.h"
 #include "jit/IonAnalysis.h"
 #include "jit/IonBuilder.h"
 #include "jit/IonCompartment.h"
-#include "jit/IonLinker.h"
 #include "jit/IonSpewer.h"
 #include "jit/LICM.h"
 #include "jit/LinearScan.h"
 #include "jit/LIR.h"
+#include "jit/Lowering.h"
 #include "jit/ParallelSafetyAnalysis.h"
 #include "jit/PerfSpewer.h"
 #include "jit/RangeAnalysis.h"
 #include "jit/StupidAllocator.h"
 #include "jit/UnreachableCodeElimination.h"
 #include "jit/ValueNumbering.h"
-#if defined(JS_CPU_X86)
-# include "jit/x86/Lowering-x86.h"
-#elif defined(JS_CPU_X64)
-# include "jit/x64/Lowering-x64.h"
-#elif defined(JS_CPU_ARM)
-# include "jit/arm/Lowering-arm.h"
-#endif
 #include "vm/ForkJoin.h"
 
 #include "jscompartmentinlines.h"

js/src/jit/Ion.h

@@ -15,7 +15,6 @@
 #include "jscompartment.h"
 
 #include "jit/CompileInfo.h"
-#include "jit/IonCode.h"
 
 namespace js {
 namespace jit {

js/src/jit/IonBuilder.cpp

@@ -18,7 +18,6 @@
 #include "jit/BaselineInspector.h"
 #include "jit/ExecutionModeInlines.h"
 #include "jit/Ion.h"
-#include "jit/IonAnalysis.h"
 #include "jit/IonSpewer.h"
 #include "jit/Lowering.h"
 #include "jit/MIRGraph.h"

js/src/jit/IonBuilder.h

@@ -14,6 +14,7 @@
 
 #include "jit/BytecodeAnalysis.h"
 #include "jit/MIR.h"
+#include "jit/MIRGenerator.h"
 #include "jit/MIRGraph.h"
 #include "jit/TypeRepresentationSet.h"
 

js/src/jit/IonCaches.cpp

@@ -11,12 +11,10 @@
 #include "jsproxy.h"
 
 #include "builtin/TypeRepresentation.h"
-#include "jit/CodeGenerator.h"
 #include "jit/Ion.h"
 #include "jit/IonLinker.h"
 #include "jit/IonSpewer.h"
 #include "jit/Lowering.h"
-#include "jit/PerfSpewer.h"
 #include "jit/VMFunctions.h"
 #include "vm/Shape.h"
 

js/src/jit/IonCaches.h

@@ -10,7 +10,6 @@
 #ifdef JS_CPU_ARM
 # include "jit/arm/Assembler-arm.h"
 #endif
-#include "jit/IonCode.h"
 #include "jit/Registers.h"
 #include "jit/shared/Assembler-shared.h"
 

js/src/jit/IonFrames.cpp

@@ -18,14 +18,14 @@
 #include "jit/IonCompartment.h"
 #include "jit/IonMacroAssembler.h"
 #include "jit/IonSpewer.h"
+#include "jit/ParallelFunctions.h"
 #include "jit/PcScriptCache.h"
 #include "jit/Safepoints.h"
 #include "jit/SnapshotReader.h"
 #include "jit/VMFunctions.h"
+#include "vm/ForkJoin.h"
 #include "vm/Interpreter.h"
 
-#include "jsfuninlines.h"
-
 #include "jit/IonFrameIterator-inl.h"
 #include "vm/Probes-inl.h"
 

js/src/jit/IonFrames.h

@@ -13,12 +13,8 @@
 
 #include "jscntxt.h"
 #include "jsfun.h"
-#include "jstypes.h"
-#include "jsutil.h"
 
-#include "jit/IonCode.h"
 #include "jit/IonFrameIterator.h"
-#include "jit/Registers.h"
 
 namespace js {
 namespace jit {

js/src/jit/IonMacroAssembler.cpp

@@ -14,12 +14,14 @@
 #include "jit/BaselineFrame.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
-#include "jit/BaselineRegisters.h"
 #include "jit/Lowering.h"
 #include "jit/MIR.h"
+#include "jit/ParallelFunctions.h"
 #include "vm/ForkJoin.h"
 
-#include "jsgcinlines.h"
+#ifdef JSGC_GENERATIONAL
+# include "jsgcinlines.h"
+#endif
 #include "jsinferinlines.h"
 
 using namespace js;

js/src/jit/IonMacroAssembler.h

@@ -20,11 +20,9 @@
 #endif
 #include "jit/IonCompartment.h"
 #include "jit/IonInstrumentation.h"
-#include "jit/ParallelFunctions.h"
 #include "jit/VMFunctions.h"
 #include "vm/ProxyObject.h"
 #include "vm/Shape.h"
-#include "vm/TypedArrayObject.h"
 
 namespace js {
 namespace jit {

js/src/jit/IonSpewer.h

@@ -13,6 +13,7 @@
 
 #include "jit/C1Spewer.h"
 #include "jit/JSONSpewer.h"
+#include "js/RootingAPI.h"
 
 namespace js {
 namespace jit {
@@ -94,7 +95,7 @@ class IonSpewer
 {
   private:
     MIRGraph *graph;
-    HandleScript function;
+    JS::HandleScript function;
     C1Spewer c1Spewer;
     JSONSpewer jsonSpewer;
     bool inited_;
@@ -108,14 +109,14 @@ class IonSpewer
     ~IonSpewer();
 
     bool init();
-    void beginFunction(MIRGraph *graph, HandleScript);
+    void beginFunction(MIRGraph *graph, JS::HandleScript);
     bool isSpewingFunction() const;
     void spewPass(const char *pass);
     void spewPass(const char *pass, LinearScanAllocator *ra);
     void endFunction();
 };
 
-void IonSpewNewFunction(MIRGraph *graph, HandleScript function);
+void IonSpewNewFunction(MIRGraph *graph, JS::HandleScript function);
 void IonSpewPass(const char *pass);
 void IonSpewPass(const char *pass, LinearScanAllocator *ra);
 void IonSpewEndFunction();
@@ -138,7 +139,7 @@ void EnableIonDebugLogging();
 
 #else
 
-static inline void IonSpewNewFunction(MIRGraph *graph, HandleScript function)
+static inline void IonSpewNewFunction(MIRGraph *graph, JS::HandleScript function)
 { }
 static inline void IonSpewPass(const char *pass)
 { }

js/src/jit/LICM.cpp

@@ -8,10 +8,9 @@
 
 #include <stdio.h>
 
-#include "jit/Ion.h"
-#include "jit/IonBuilder.h"
 #include "jit/IonSpewer.h"
 #include "jit/MIR.h"
+#include "jit/MIRGenerator.h"
 #include "jit/MIRGraph.h"
 
 using namespace js;

js/src/jit/LICM.h

@@ -7,16 +7,14 @@
 #ifndef jit_LICM_h
 #define jit_LICM_h
 
-#include "jit/IonAllocPolicy.h"
-#include "jit/IonAnalysis.h"
-#include "jit/MIR.h"
-#include "jit/MIRGraph.h"
-
 // This file represents the Loop Invariant Code Motion optimization pass
 
 namespace js {
 namespace jit {
 
+class MIRGenerator;
+class MIRGraph;
+
 class LICM
 {
     MIRGenerator *mir;

js/src/jit/LIR.cpp

@@ -12,8 +12,7 @@
 
 #include "jit/IonSpewer.h"
 #include "jit/MIR.h"
-#include "jit/MIRGraph.h"
-#include "jit/shared/CodeGenerator-shared.h"
+#include "jit/MIRGenerator.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/LIR.h

@@ -20,8 +20,6 @@
 #include "jit/MIRGraph.h"
 #include "jit/Registers.h"
 #include "jit/Safepoints.h"
-#include "jit/shared/Assembler-shared.h"
-#include "jit/VMFunctions.h"
 
 namespace js {
 namespace jit {

js/src/jit/LinearScan.cpp

@@ -9,7 +9,6 @@
 #include "mozilla/DebugOnly.h"
 
 #include "jit/BitSet.h"
-#include "jit/IonBuilder.h"
 #include "jit/IonSpewer.h"
 
 using namespace js;

js/src/jit/LinearScan.h

@@ -7,7 +7,6 @@
 #ifndef jit_LinearScan_h
 #define jit_LinearScan_h
 
-#include "jit/BitSet.h"
 #include "jit/LiveRangeAllocator.h"
 #include "js/Vector.h"
 

js/src/jit/LiveRangeAllocator.cpp

@@ -5,10 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jit/LiveRangeAllocator.h"
-
 #include "mozilla/DebugOnly.h"
-
 #include "jit/BacktrackingAllocator.h"
+#include "jit/BitSet.h"
 #include "jit/LinearScan.h"
 
 using namespace js;

js/src/jit/Lowering.cpp

@@ -14,7 +14,6 @@
 #include "jit/LIR.h"
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
-#include "jit/RangeAnalysis.h"
 
 #include "jsinferinlines.h"
 

js/src/jit/Lowering.h

@@ -10,9 +10,7 @@
 // This file declares the structures that are used for attaching LIR to a
 // MIRGraph.
 
-#include "jit/IonAllocPolicy.h"
 #include "jit/LIR.h"
-#include "jit/MOpcodes.h"
 #if defined(JS_CPU_X86)
 # include "jit/x86/Lowering-x86.h"
 #elif defined(JS_CPU_X64)

js/src/jit/MIR.cpp

@@ -14,10 +14,8 @@
 #include "jsstr.h"
 
 #include "jit/BaselineInspector.h"
-#include "jit/EdgeCaseAnalysis.h"
 #include "jit/IonBuilder.h"
 #include "jit/IonSpewer.h"
-#include "jit/LICM.h" // For LinearSum
 #include "jit/MIRGraph.h"
 #include "jit/RangeAnalysis.h"
 

js/src/jit/MIR.h

@@ -16,7 +16,6 @@
 
 #include "jsinfer.h"
 
-#include "jit/Bailouts.h"
 #include "jit/CompilerRoot.h"
 #include "jit/FixedList.h"
 #include "jit/InlineList.h"
@@ -26,6 +25,7 @@
 #include "jit/TypePolicy.h"
 #include "jit/TypeRepresentationSet.h"
 #include "vm/ScopeObject.h"
+#include "vm/TypedArrayObject.h"
 
 namespace js {
 

js/src/jit/MIRGraph.cpp

@@ -6,15 +6,12 @@
 
 #include "jit/MIRGraph.h"
 
-#include "jsanalyze.h"
-
 #include "jit/AsmJS.h"
+#include "jit/BytecodeAnalysis.h"
 #include "jit/Ion.h"
-#include "jit/IonBuilder.h"
 #include "jit/IonSpewer.h"
 #include "jit/MIR.h"
-
-#include "jsinferinlines.h"
+#include "jit/MIRGenerator.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/MIRGraph.h

@@ -13,7 +13,6 @@
 #include "jit/FixedList.h"
 #include "jit/IonAllocPolicy.h"
 #include "jit/MIR.h"
-#include "jit/MIRGenerator.h"
 
 namespace js {
 namespace jit {

js/src/jit/ParallelFunctions.cpp

@@ -6,7 +6,6 @@
 
 #include "jit/ParallelFunctions.h"
 
-#include "jit/IonSpewer.h"
 #include "vm/ArrayObject.h"
 
 #include "jsgcinlines.h"

js/src/jit/ParallelSafetyAnalysis.cpp

@@ -10,6 +10,7 @@
 #include "jit/IonAnalysis.h"
 #include "jit/IonSpewer.h"
 #include "jit/MIR.h"
+#include "jit/MIRGenerator.h"
 #include "jit/MIRGraph.h"
 #include "jit/UnreachableCodeElimination.h"
 

js/src/jit/ParallelSafetyAnalysis.h

@@ -7,7 +7,6 @@
 #ifndef jit_ParallelSafetyAnalysis_h
 #define jit_ParallelSafetyAnalysis_h
 
-#include "jit/CompileInfo.h"
 #include "jit/MIR.h"
 
 namespace js {

js/src/jit/PerfSpewer.cpp

@@ -10,11 +10,13 @@
 # include <unistd.h>
 #endif
 
-#include "jit/IonSpewer.h"
-#include "jit/LinearScan.h"
-#include "jit/LIR.h"
-#include "jit/MIR.h"
-#include "jit/MIRGraph.h"
+#ifdef JS_ION_PERF
+# include "jit/IonSpewer.h"
+# include "jit/LinearScan.h"
+# include "jit/LIR.h"
+# include "jit/MIR.h"
+# include "jit/MIRGraph.h"
+#endif
 
 // perf expects its data to be in a file /tmp/perf-PID.map, but for Android
 // and B2G the map files are written to /data/local/tmp/perf-PID.map

js/src/jit/PerfSpewer.h

@@ -7,9 +7,10 @@
 #ifndef jit_PerfSpewer_h
 #define jit_PerfSpewer_h
 
-#include <stdio.h>
-
-#include "jit/IonMacroAssembler.h"
+#ifdef JS_ION_PERF
+# include <stdio.h>
+# include "jit/IonMacroAssembler.h"
+#endif
 
 namespace js {
 namespace jit {

js/src/jit/RangeAnalysis.cpp

@@ -14,6 +14,7 @@
 #include "jit/IonAnalysis.h"
 #include "jit/IonSpewer.h"
 #include "jit/MIR.h"
+#include "jit/MIRGenerator.h"
 #include "jit/MIRGraph.h"
 #include "vm/NumericConversions.h"
 

js/src/jit/RangeAnalysis.h

@@ -10,7 +10,6 @@
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
 
-#include "jit/CompileInfo.h"
 #include "jit/IonAnalysis.h"
 #include "jit/MIR.h"
 

js/src/jit/RegisterAllocator.h

@@ -9,11 +9,8 @@
 
 #include "mozilla/Attributes.h"
 
-#include "jit/InlineList.h"
-#include "jit/Ion.h"
 #include "jit/LIR.h"
-#include "jit/Lowering.h"
-#include "jit/MIR.h"
+#include "jit/MIRGenerator.h"
 #include "jit/MIRGraph.h"
 
 // Generic structures and functions for use by register allocators.
@@ -21,6 +18,8 @@
 namespace js {
 namespace jit {
 
+class LIRGenerator;
+
 // Structure for running a liveness analysis on a finished register allocation.
 // This analysis can be used for two purposes:
 //

js/src/jit/Safepoints.cpp

@@ -8,6 +8,7 @@
 
 #include "mozilla/MathAlgorithms.h"
 
+#include "jit/BitSet.h"
 #include "jit/IonSpewer.h"
 #include "jit/LIR.h"
 

js/src/jit/Safepoints.h

@@ -7,14 +7,13 @@
 #ifndef jit_Safepoints_h
 #define jit_Safepoints_h
 
-#include "jit/BitSet.h"
 #include "jit/CompactBuffer.h"
-#include "jit/Registers.h"
 #include "jit/shared/Assembler-shared.h"
 
 namespace js {
 namespace jit {
 
+class BitSet;
 struct SafepointNunboxEntry;
 class LAllocation;
 class LSafepoint;

js/src/jit/Snapshots.cpp

@@ -6,14 +6,11 @@
 
 #include "jsscript.h"
 
-#include "jit/IonFrames.h"
-#include "jit/IonLinker.h"
 #include "jit/IonSpewer.h"
 #ifdef TRACK_SNAPSHOTS
 #include "jit/LIR.h"
 #include "jit/MIR.h"
 #endif
-#include "jit/MIRGenerator.h"
 #include "jit/SnapshotReader.h"
 #include "jit/SnapshotWriter.h"
 

js/src/jit/TypeRepresentationSet.cpp

@@ -10,8 +10,6 @@
 
 #include "jit/IonBuilder.h"
 
-#include "jsinferinlines.h"
-
 using namespace js;
 using namespace jit;
 

js/src/jit/UnreachableCodeElimination.cpp

@@ -8,6 +8,7 @@
 
 #include "jit/AliasAnalysis.h"
 #include "jit/IonAnalysis.h"
+#include "jit/MIRGenerator.h"
 #include "jit/ValueNumbering.h"
 
 using namespace js;

js/src/jit/UnreachableCodeElimination.h

@@ -7,7 +7,6 @@
 #ifndef jit_UnreachableCodeElimination_h
 #define jit_UnreachableCodeElimination_h
 
-#include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 
 namespace js {

js/src/jit/VMFunctions.cpp

@@ -10,7 +10,6 @@
 #include "builtin/TypedObject.h"
 #include "frontend/BytecodeCompiler.h"
 #include "jit/BaselineIC.h"
-#include "jit/Ion.h"
 #include "jit/IonCompartment.h"
 #include "jit/IonFrames.h"
 #include "vm/ArrayObject.h"

js/src/jit/VMFunctions.h

@@ -10,7 +10,6 @@
 #include "jspubtd.h"
 
 #include "jit/CompileInfo.h"
-#include "jit/Ion.h"
 #include "jit/IonFrames.h"
 
 namespace js {

js/src/jit/ValueNumbering.cpp

@@ -6,10 +6,9 @@
 
 #include "jit/ValueNumbering.h"
 
-#include "jit/CompileInfo.h"
-#include "jit/Ion.h"
-#include "jit/IonBuilder.h"
 #include "jit/IonSpewer.h"
+#include "jit/MIRGenerator.h"
+#include "jit/MIRGraph.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/ValueNumbering.h

@@ -7,9 +7,7 @@
 #ifndef jit_ValueNumbering_h
 #define jit_ValueNumbering_h
 
-#include "jit/CompileInfo.h"
 #include "jit/MIR.h"
-#include "jit/MIRGraph.h"
 
 namespace js {
 namespace jit {

js/src/jit/shared/Assembler-x86-shared.cpp

@@ -5,7 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gc/Marking.h"
-#include "jit/IonMacroAssembler.h"
+#include "jit/IonCompartment.h"
+#if defined(JS_CPU_X86)
+# include "jit/x86/MacroAssembler-x86.h"
+#elif defined(JS_CPU_X64)
+# include "jit/x64/MacroAssembler-x64.h"
+#elif defined(JS_CPU_ARM)
+# include "jit/arm/MacroAssembler-arm.h"
+#endif
 
 using namespace js;
 using namespace js::jit;

js/src/jit/shared/BaselineCompiler-shared.h

@@ -9,9 +9,8 @@
 
 #include "jit/BaselineFrameInfo.h"
 #include "jit/BaselineIC.h"
-#include "jit/IonInstrumentation.h"
+#include "jit/BytecodeAnalysis.h"
 #include "jit/IonMacroAssembler.h"
-#include "jit/IonSpewer.h"
 
 namespace js {
 namespace jit {

js/src/jit/shared/BaselineIC-x86-shared.cpp

@@ -4,11 +4,8 @@
  * 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/. */
 
-#include "jit/BaselineCompiler.h"
 #include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
-#include "jit/BaselineJIT.h"
-#include "jit/IonLinker.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/shared/CodeGenerator-shared.cpp

@@ -8,6 +8,7 @@
 
 #include "mozilla/DebugOnly.h"
 
+#include "jit/IonCaches.h"
 #include "jit/IonMacroAssembler.h"
 #include "jit/IonSpewer.h"
 #include "jit/MIR.h"

js/src/jit/shared/CodeGenerator-shared.h

@@ -8,17 +8,16 @@
 #define jit_shared_CodeGenerator_shared_h
 
 #include "mozilla/Alignment.h"
-#include "mozilla/Util.h"
 
-#include "jit/IonCaches.h"
 #include "jit/IonFrames.h"
 #include "jit/IonMacroAssembler.h"
 #include "jit/LIR.h"
-#include "jit/MIR.h"
+#include "jit/MIRGenerator.h"
 #include "jit/MIRGraph.h"
 #include "jit/Safepoints.h"
 #include "jit/SnapshotWriter.h"
 #include "jit/VMFunctions.h"
+#include "vm/ForkJoin.h"
 
 namespace js {
 namespace jit {

js/src/jit/shared/CodeGenerator-x86-shared.cpp

@@ -11,7 +11,6 @@
 
 #include "jit/IonCompartment.h"
 #include "jit/IonFrames.h"
-#include "jit/ParallelFunctions.h"
 #include "jit/RangeAnalysis.h"
 
 #include "jit/shared/CodeGenerator-shared-inl.h"

js/src/jit/shared/IonFrames-x86-shared.cpp

@@ -4,7 +4,6 @@
  * 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/. */
 
-#include "jit/Ion.h"
 #include "jit/IonFrames.h"
 
 using namespace js;

js/src/jit/shared/Lowering-shared-inl.h

@@ -10,7 +10,7 @@
 #include "jit/shared/Lowering-shared.h"
 
 #include "jit/MIR.h"
-#include "jit/MIRGraph.h"
+#include "jit/MIRGenerator.h"
 
 namespace js {
 namespace jit {

js/src/jit/shared/Lowering-shared.cpp

@@ -8,7 +8,6 @@
 
 #include "jit/LIR.h"
 #include "jit/MIR.h"
-#include "jit/MIRGraph.h"
 
 using namespace js;
 using namespace jit;

js/src/jit/shared/Lowering-shared.h

@@ -10,7 +10,6 @@
 // This file declares the structures that are used for attaching LIR to a
 // MIRGraph.
 
-#include "jit/IonAllocPolicy.h"
 #include "jit/LIR.h"
 
 namespace js {

js/src/jit/shared/Lowering-x86-shared.cpp

@@ -8,7 +8,6 @@
 
 #include "mozilla/MathAlgorithms.h"
 
-#include "jit/Lowering.h"
 #include "jit/MIR.h"
 
 #include "jit/shared/Lowering-shared-inl.h"

js/src/jit/shared/MoveEmitter-x86-shared.h

@@ -7,7 +7,13 @@
 #ifndef jit_MoveEmitter_x86_shared_h
 #define jit_MoveEmitter_x86_shared_h
 
-#include "jit/IonMacroAssembler.h"
+#if defined(JS_CPU_X86)
+# include "jit/x86/MacroAssembler-x86.h"
+#elif defined(JS_CPU_X64)
+# include "jit/x64/MacroAssembler-x64.h"
+#elif defined(JS_CPU_ARM)
+# include "jit/arm/MacroAssembler-arm.h"
+#endif
 #include "jit/MoveResolver.h"
 
 namespace js {

js/src/jit/x64/Assembler-x64.cpp

@@ -7,7 +7,6 @@
 #include "jit/x64/Assembler-x64.h"
 
 #include "gc/Marking.h"
-#include "jit/LIR.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/x64/Assembler-x64.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/Util.h"
 
-#include "jit/CompactBuffer.h"
 #include "jit/IonCode.h"
 #include "jit/shared/Assembler-shared.h"
 

js/src/jit/x64/Bailouts-x64.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jit/Bailouts.h"
-#include "jit/IonCompartment.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/x64/BaselineIC-x64.cpp

@@ -4,11 +4,8 @@
  * 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/. */
 
-#include "jit/BaselineCompiler.h"
 #include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
-#include "jit/BaselineJIT.h"
-#include "jit/IonLinker.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/x64/CodeGenerator-x64.cpp

@@ -6,8 +6,8 @@
 
 #include "jit/x64/CodeGenerator-x64.h"
 
+#include "jit/IonCaches.h"
 #include "jit/MIR.h"
-#include "jit/MIRGraph.h"
 
 #include "jsscriptinlines.h"
 

js/src/jit/x64/CodeGenerator-x64.h

@@ -8,7 +8,6 @@
 #define jit_x64_CodeGenerator_x64_h
 
 #include "jit/shared/CodeGenerator-x86-shared.h"
-#include "jit/x64/Assembler-x64.h"
 
 namespace js {
 namespace jit {

js/src/jit/x64/MacroAssembler-x64.cpp

@@ -8,6 +8,7 @@
 
 #include "jit/Bailouts.h"
 #include "jit/BaselineFrame.h"
+#include "jit/IonCompartment.h"
 #include "jit/IonFrames.h"
 #include "jit/MoveEmitter.h"
 

js/src/jit/x64/Trampoline-x64.cpp

@@ -4,14 +4,10 @@
  * 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/. */
 
-#include "assembler/assembler/MacroAssembler.h"
 #include "jit/Bailouts.h"
-#include "jit/ExecutionModeInlines.h"
 #include "jit/IonCompartment.h"
 #include "jit/IonFrames.h"
 #include "jit/IonLinker.h"
-#include "jit/IonSpewer.h"
-#include "jit/PerfSpewer.h"
 #include "jit/VMFunctions.h"
 #include "jit/x64/BaselineHelpers-x64.h"
 

js/src/jit/x86/CodeGenerator-x86.cpp

@@ -11,6 +11,7 @@
 #include "jsnum.h"
 
 #include "jit/ExecutionModeInlines.h"
+#include "jit/IonCaches.h"
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 #include "vm/Shape.h"