Bug 888088 (part 10) - Fix #include ordering in most of js/src/ion/. r=nnethercote.

js/src/ion/AliasAnalysis.cpp

@@ -4,14 +4,15 @@
  * 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 "ion/AliasAnalysis.h"
+
 #include <stdio.h>
 
-#include "ion/MIR.h"
-#include "ion/AliasAnalysis.h"
-#include "ion/MIRGraph.h"
 #include "ion/Ion.h"
 #include "ion/IonBuilder.h"
 #include "ion/IonSpewer.h"
+#include "ion/MIR.h"
+#include "ion/MIRGraph.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/AsmJS.cpp

@@ -8,31 +8,27 @@
 
 #include "mozilla/Move.h"
 
+#ifdef MOZ_VTUNE
+# include "jitprofiling.h"
+#endif
+
 #include "jsmath.h"
 #include "jsworkers.h"
 #include "jswrapper.h"
 #include "prmjtime.h"
 
-#ifdef MOZ_VTUNE
-# include "jitprofiling.h"
-#endif
-
 #include "frontend/Parser.h"
 #include "ion/AsmJSModule.h"
-#include "ion/PerfSpewer.h"
 #include "ion/CodeGenerator.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
+#include "ion/PerfSpewer.h"
 
 #include "jsfuninlines.h"
 
 #include "frontend/ParseMaps-inl.h"
 #include "frontend/ParseNode-inl.h"
 
-#ifdef MOZ_VTUNE
-# include "jitprofiling.h"
-#endif
-
 using namespace js;
 using namespace js::frontend;
 using namespace js::ion;

js/src/ion/AsmJS.h

@@ -8,8 +8,8 @@
 #define ion_AsmJS_h
 
 #ifdef XP_MACOSX
-# include <pthread.h>
 # include <mach/mach.h>
+# include <pthread.h>
 #endif
 
 #include "jstypes.h"

js/src/ion/AsmJSLink.cpp

@@ -4,23 +4,21 @@
  * 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 "jsmath.h"
-#include "jscntxt.h"
-
-#include "ion/AsmJS.h"
-#include "ion/AsmJSModule.h"
-#include "frontend/BytecodeCompiler.h"
-
 #ifdef MOZ_VTUNE
 # include "jitprofiling.h"
 #endif
 
+#include "jscntxt.h"
+#include "jsmath.h"
+
+#include "frontend/BytecodeCompiler.h"
+#include "ion/AsmJS.h"
+#include "ion/AsmJSModule.h"
+#include "ion/Ion.h"
 #ifdef JS_ION_PERF
 # include "ion/PerfSpewer.h"
 #endif
 
-#include "ion/Ion.h"
-
 #include "jsfuninlines.h"
 
 using namespace js;

js/src/ion/AsmJSModule.h

@@ -7,20 +7,18 @@
 #ifndef ion_AsmJSModule_h
 #define ion_AsmJSModule_h
 
-#include "mozilla/MathAlgorithms.h"
-
 #ifdef JS_ION
 
-#include "gc/Marking.h"
-#include "ion/RegisterSets.h"
+#include "mozilla/MathAlgorithms.h"
 
 #include "jsscript.h"
 
+#include "gc/Marking.h"
+#include "ion/IonMacroAssembler.h"
 #if defined(JS_ION_PERF)
 # include "ion/PerfSpewer.h"
 #endif
-
-#include "ion/IonMacroAssembler.h"
+#include "ion/RegisterSets.h"
 
 namespace js {
 

js/src/ion/AsmJSSignalHandlers.cpp

@@ -6,9 +6,9 @@
 
 #include "jscntxt.h"
 
+#include "assembler/assembler/MacroAssembler.h"
 #include "ion/AsmJS.h"
 #include "ion/AsmJSModule.h"
-#include "assembler/assembler/MacroAssembler.h"
 
 #include "vm/ObjectImpl-inl.h"
 

js/src/ion/BacktrackingAllocator.h

@@ -9,10 +9,9 @@
 
 #include "mozilla/Array.h"
 
-#include "ion/LiveRangeAllocator.h"
-
 #include "ds/PriorityQueue.h"
 #include "ds/SplayTree.h"
+#include "ion/LiveRangeAllocator.h"
 
 // Backtracking priority queue based register allocator based on that described
 // in the following blog post:

js/src/ion/Bailouts.cpp

@@ -4,18 +4,19 @@
  * 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 "ion/Bailouts.h"
+
 #include "jsanalyze.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsinfer.h"
 
-#include "ion/Bailouts.h"
-#include "ion/SnapshotReader.h"
+#include "ion/BaselineJIT.h"
 #include "ion/Ion.h"
 #include "ion/IonCompartment.h"
 #include "ion/IonSpewer.h"
+#include "ion/SnapshotReader.h"
 #include "vm/Interpreter.h"
-#include "ion/BaselineJIT.h"
 
 #include "vm/Stack-inl.h"
 

js/src/ion/Bailouts.h

@@ -8,9 +8,10 @@
 #define ion_Bailouts_h
 
 #include "jstypes.h"
-#include "vm/Stack.h"
+
 #include "ion/IonFrameIterator.h"
 #include "ion/IonFrames.h"
+#include "vm/Stack.h"
 
 namespace js {
 namespace ion {

js/src/ion/BaselineBailouts.cpp

@@ -9,10 +9,11 @@
 #include "ion/BaselineJIT.h"
 #include "ion/CompileInfo.h"
 #include "ion/IonSpewer.h"
-#include "ion/IonFrames-inl.h"
 
 #include "jsfuninlines.h"
 
+#include "ion/IonFrames-inl.h"
+
 using namespace js;
 using namespace js::ion;
 

js/src/ion/BaselineCompiler.cpp

@@ -4,10 +4,11 @@
  * 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 "ion/BaselineJIT.h"
-#include "ion/BaselineIC.h"
-#include "ion/BaselineHelpers.h"
 #include "ion/BaselineCompiler.h"
+
+#include "ion/BaselineHelpers.h"
+#include "ion/BaselineIC.h"
+#include "ion/BaselineJIT.h"
 #include "ion/FixedList.h"
 #include "ion/IonLinker.h"
 #include "ion/IonSpewer.h"

js/src/ion/BaselineCompiler.h

@@ -11,17 +11,14 @@
 
 #include "jscntxt.h"
 #include "jscompartment.h"
-#include "ion/IonCode.h"
 #include "jsinfer.h"
 
-#include "vm/Interpreter.h"
-
-#include "ion/IonAllocPolicy.h"
 #include "ion/BaselineJIT.h"
 #include "ion/BaselineIC.h"
-#include "ion/FixedList.h"
 #include "ion/BytecodeAnalysis.h"
-
+#include "ion/FixedList.h"
+#include "ion/IonAllocPolicy.h"
+#include "ion/IonCode.h"
 #if defined(JS_CPU_X86)
 # include "ion/x86/BaselineCompiler-x86.h"
 #elif defined(JS_CPU_X64)
@@ -29,6 +26,7 @@
 #else
 # include "ion/arm/BaselineCompiler-arm.h"
 #endif
+#include "vm/Interpreter.h"
 
 namespace js {
 namespace ion {

js/src/ion/BaselineFrame-inl.h

@@ -15,6 +15,7 @@
 #include "jscompartment.h"
 
 #include "ion/IonFrames.h"
+
 #include "vm/ScopeObject-inl.h"
 
 namespace js {

js/src/ion/BaselineFrame.cpp

@@ -4,15 +4,14 @@
  * 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 "ion/BaselineFrame.h"
+#include "ion/BaselineFrame-inl.h"
+
 #include "ion/BaselineIC.h"
 #include "ion/BaselineJIT.h"
 #include "ion/Ion.h"
-
 #include "vm/Debugger.h"
 #include "vm/ScopeObject.h"
 
-#include "ion/BaselineFrame-inl.h"
 #include "ion/IonFrames-inl.h"
 #include "vm/Stack-inl.h"
 

js/src/ion/BaselineFrameInfo.cpp

@@ -5,11 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ion/BaselineFrameInfo.h"
-#include "ion/IonSpewer.h"
-#include "ion/shared/BaselineCompiler-shared.h"
 
 #include "jsanalyze.h"
 
+#include "ion/IonSpewer.h"
+#include "ion/shared/BaselineCompiler-shared.h"
+
 using namespace js;
 using namespace js::ion;
 

js/src/ion/BaselineFrameInfo.h

@@ -12,12 +12,12 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "ion/BaselineJIT.h"
 #include "ion/BaselineFrame.h"
+#include "ion/BaselineJIT.h"
 #include "ion/BaselineRegisters.h"
 #include "ion/BytecodeAnalysis.h"
-#include "ion/IonMacroAssembler.h"
 #include "ion/FixedList.h"
+#include "ion/IonMacroAssembler.h"
 
 namespace js {
 namespace ion {

js/src/ion/BaselineIC.cpp

@@ -4,12 +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 "ion/BaselineJIT.h"
+#include "ion/BaselineIC.h"
 
 #include "builtin/Eval.h"
 #include "ion/BaselineCompiler.h"
 #include "ion/BaselineHelpers.h"
-#include "ion/BaselineIC.h"
+#include "ion/BaselineJIT.h"
 #include "ion/IonLinker.h"
 #include "ion/IonSpewer.h"
 #include "ion/VMFunctions.h"

js/src/ion/BaselineIC.h

@@ -14,10 +14,10 @@
 #include "jsgc.h"
 #include "jsopcode.h"
 #include "jsproxy.h"
-#include "ion/BaselineJIT.h"
-#include "ion/BaselineRegisters.h"
 
 #include "gc/Heap.h"
+#include "ion/BaselineJIT.h"
+#include "ion/BaselineRegisters.h"
 
 namespace js {
 namespace ion {

js/src/ion/BaselineInspector.cpp

@@ -4,9 +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 "ion/BaselineIC.h"
 #include "ion/BaselineInspector.h"
 
+#include "ion/BaselineIC.h"
+
 using namespace js;
 using namespace js::ion;
 

js/src/ion/BaselineInspector.h

@@ -12,8 +12,8 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "ion/BaselineJIT.h"
 #include "ion/BaselineIC.h"
+#include "ion/BaselineJIT.h"
 #include "ion/MIR.h"
 
 namespace js {

js/src/ion/BaselineJIT.cpp

@@ -4,19 +4,20 @@
  * 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 "ion/BaselineJIT.h"
+
 #include "mozilla/MemoryReporting.h"
 
 #include "ion/BaselineCompiler.h"
 #include "ion/BaselineIC.h"
-#include "ion/BaselineJIT.h"
 #include "ion/CompileInfo.h"
 #include "ion/IonSpewer.h"
-#include "ion/IonFrames-inl.h"
-
-#include "vm/Stack-inl.h"
 
 #include "jsopcodeinlines.h"
 
+#include "ion/IonFrames-inl.h"
+#include "vm/Stack-inl.h"
+
 using namespace js;
 using namespace js::ion;
 

js/src/ion/BaselineJIT.h

@@ -14,11 +14,10 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 
+#include "ds/LifoAlloc.h"
+#include "ion/Bailouts.h"
 #include "ion/IonCode.h"
 #include "ion/IonMacroAssembler.h"
-#include "ion/Bailouts.h"
-
-#include "ds/LifoAlloc.h"
 
 namespace js {
 namespace ion {

js/src/ion/BitSet.cpp

@@ -4,9 +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 "jsutil.h"
 #include "ion/BitSet.h"
 
+#include "jsutil.h"
+
 using namespace js;
 using namespace js::ion;
 

js/src/ion/BytecodeAnalysis.cpp

@@ -5,7 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ion/BytecodeAnalysis.h"
+
 #include "jsopcode.h"
+
 #include "jsopcodeinlines.h"
 
 using namespace js;

js/src/ion/C1Spewer.cpp

@@ -6,15 +6,16 @@
 
 #ifdef DEBUG
 
+#include "ion/C1Spewer.h"
+
 #include <stdarg.h>
 #include <time.h>
 
-#include "ion/IonBuilder.h"
 #include "ion/Ion.h"
-#include "ion/C1Spewer.h"
-#include "ion/MIRGraph.h"
-#include "ion/LIR.h"
+#include "ion/IonBuilder.h"
 #include "ion/LinearScan.h"
+#include "ion/LIR.h"
+#include "ion/MIRGraph.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/CodeGenerator.cpp

@@ -4,27 +4,29 @@
  * 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 "ion/CodeGenerator.h"
+
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Util.h"
 
-#include "ion/PerfSpewer.h"
-#include "ion/CodeGenerator.h"
+#include "jsmath.h"
+#include "jsnum.h"
+
+#include "builtin/Eval.h"
+#include "gc/Nursery.h"
+#include "ion/ExecutionModeInlines.h"
 #include "ion/IonLinker.h"
 #include "ion/IonSpewer.h"
 #include "ion/MIRGenerator.h"
-#include "ion/shared/CodeGenerator-shared-inl.h"
 #include "ion/MoveEmitter.h"
-#include "jsnum.h"
-#include "jsmath.h"
 #include "ion/ParallelFunctions.h"
-#include "ion/ExecutionModeInlines.h"
-#include "builtin/Eval.h"
-#include "gc/Nursery.h"
-#include "vm/ForkJoin.h"
 #include "ion/ParallelSafetyAnalysis.h"
+#include "ion/PerfSpewer.h"
+#include "vm/ForkJoin.h"
 
+#include "ion/shared/CodeGenerator-shared-inl.h"
 #include "vm/Interpreter-inl.h"
 
 using namespace js;

js/src/ion/CodeGenerator.h

@@ -7,6 +7,8 @@
 #ifndef ion_CodeGenerator_h
 #define ion_CodeGenerator_h
 
+#include "ion/PerfSpewer.h"
+
 #if defined(JS_CPU_X86)
 # include "ion/x86/CodeGenerator-x86.h"
 #elif defined(JS_CPU_X64)

js/src/ion/CompactBuffer.h

@@ -7,9 +7,10 @@
 #ifndef ion_Compactbuffer_h
 #define ion_Compactbuffer_h
 
-#include "js/Vector.h"
 #include "jsalloc.h"
+
 #include "ion/IonTypes.h"
+#include "js/Vector.h"
 
 namespace js {
 namespace ion {

js/src/ion/CompileInfo-inl.h

@@ -8,6 +8,7 @@
 #define ion_CompileInfo_inl_h
 
 #include "ion/CompileInfo.h"
+
 #include "jsscriptinlines.h"
 
 using namespace js;

js/src/ion/CompileInfo.h

@@ -7,6 +7,8 @@
 #ifndef ion_CompileInfo_h
 #define ion_CompileInfo_h
 
+#include "jsfun.h"
+
 #include "ion/Registers.h"
 
 namespace js {

js/src/ion/CompilerRoot.h

@@ -11,6 +11,8 @@
 
 #include "jscntxt.h"
 
+#include "ion/Ion.h"
+#include "ion/IonAllocPolicy.h"
 #include "js/RootingAPI.h"
 
 namespace js {

js/src/ion/EdgeCaseAnalysis.cpp

@@ -4,12 +4,13 @@
  * 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 "ion/EdgeCaseAnalysis.h"
+
 #include <stdio.h>
 
 #include "ion/Ion.h"
 #include "ion/IonBuilder.h"
 #include "ion/IonSpewer.h"
-#include "ion/EdgeCaseAnalysis.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
 

js/src/ion/EdgeCaseAnalysis.h

@@ -7,6 +7,8 @@
 #ifndef ion_EdgeCaseAnalysis_h
 #define ion_EdgeCaseAnalysis_h
 
+#include "ion/MIRGenerator.h"
+
 namespace js {
 namespace ion {
 

js/src/ion/ExecutionModeInlines.h

@@ -9,6 +9,8 @@
 
 #ifdef JS_ION
 
+#include "ion/CompileInfo.h"
+
 namespace js {
 namespace ion {
 

js/src/ion/FixedList.h

@@ -7,6 +7,11 @@
 #ifndef ion_FixedList_h
 #define ion_FixedList_h
 
+#include <stddef.h>
+
+#include "ion/Ion.h"
+#include "ion/IonAllocPolicy.h"
+
 namespace js {
 namespace ion {
 

js/src/ion/Ion.cpp

@@ -4,36 +4,43 @@
  * 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 "ion/Ion.h"
+
 #include "mozilla/MemoryReporting.h"
 
-#include "ion/BaselineJIT.h"
+#include "jscompartment.h"
+#include "jsworkers.h"
+#if JS_TRACE_LOGGING
+#include "TraceLogging.h"
+#endif
+
+#include "gc/Marking.h"
+#include "ion/AliasAnalysis.h"
+#include "ion/AsmJS.h"
+#include "ion/AsmJSModule.h"
+#include "ion/BacktrackingAllocator.h"
 #include "ion/BaselineCompiler.h"
 #include "ion/BaselineInspector.h"
-#include "ion/Ion.h"
+#include "ion/BaselineJIT.h"
+#include "ion/CodeGenerator.h"
+#include "ion/CompilerRoot.h"
+#include "ion/EdgeCaseAnalysis.h"
+#include "ion/EffectiveAddressAnalysis.h"
+#include "ion/ExecutionModeInlines.h"
 #include "ion/IonAnalysis.h"
 #include "ion/IonBuilder.h"
+#include "ion/IonCompartment.h"
 #include "ion/IonLinker.h"
 #include "ion/IonSpewer.h"
-#include "ion/LIR.h"
-#include "ion/AliasAnalysis.h"
 #include "ion/LICM.h"
-#include "ion/ValueNumbering.h"
-#include "ion/EdgeCaseAnalysis.h"
-#include "ion/RangeAnalysis.h"
 #include "ion/LinearScan.h"
+#include "ion/LIR.h"
 #include "ion/ParallelSafetyAnalysis.h"
-#include "jscompartment.h"
-#include "vm/ThreadPool.h"
-#include "vm/ForkJoin.h"
-#include "ion/IonCompartment.h"
 #include "ion/PerfSpewer.h"
-#include "ion/CodeGenerator.h"
-#include "jsworkers.h"
-#include "ion/BacktrackingAllocator.h"
+#include "ion/RangeAnalysis.h"
 #include "ion/StupidAllocator.h"
 #include "ion/UnreachableCodeElimination.h"
-#include "ion/EffectiveAddressAnalysis.h"
-
+#include "ion/ValueNumbering.h"
 #if defined(JS_CPU_X86)
 # include "ion/x86/Lowering-x86.h"
 #elif defined(JS_CPU_X64)
@@ -41,21 +48,14 @@
 #elif defined(JS_CPU_ARM)
 # include "ion/arm/Lowering-arm.h"
 #endif
-#include "gc/Marking.h"
+#include "vm/ForkJoin.h"
+#include "vm/ThreadPool.h"
 
 #include "jscompartmentinlines.h"
 #include "jsgcinlines.h"
 #include "jsinferinlines.h"
 
 #include "vm/Stack-inl.h"
-#include "ion/CompilerRoot.h"
-#include "ion/ExecutionModeInlines.h"
-#include "ion/AsmJS.h"
-#include "ion/AsmJSModule.h"
-
-#if JS_TRACE_LOGGING
-#include "TraceLogging.h"
-#endif
 
 using namespace js;
 using namespace js::ion;

js/src/ion/Ion.h

@@ -13,10 +13,10 @@
 
 #include "jscntxt.h"
 #include "jscompartment.h"
-#include "ion/IonCode.h"
-#include "ion/CompileInfo.h"
 #include "jsinfer.h"
 
+#include "ion/CompileInfo.h"
+#include "ion/IonCode.h"
 #include "vm/Interpreter.h"
 
 namespace js {

js/src/ion/IonAllocPolicy.h

@@ -10,10 +10,10 @@
 #include "mozilla/GuardObjects.h"
 
 #include "jscntxt.h"
-#include "ds/LifoAlloc.h"
 
-#include "ion/Ion.h"
+#include "ds/LifoAlloc.h"
 #include "ion/InlineList.h"
+#include "ion/Ion.h"
 
 namespace js {
 namespace ion {

js/src/ion/IonAnalysis.cpp

@@ -4,13 +4,14 @@
  * 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 "ion/IonAnalysis.h"
+
 #include "jsanalyze.h"
 
-#include "ion/IonBuilder.h"
-#include "ion/MIRGraph.h"
 #include "ion/Ion.h"
-#include "ion/IonAnalysis.h"
+#include "ion/IonBuilder.h"
 #include "ion/LIR.h"
+#include "ion/MIRGraph.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/IonBuilder.cpp

@@ -12,9 +12,9 @@
 #include "frontend/SourceNotes.h"
 #include "ion/BaselineFrame.h"
 #include "ion/BaselineInspector.h"
+#include "ion/ExecutionModeInlines.h"
 #include "ion/Ion.h"
 #include "ion/IonAnalysis.h"
-#include "ion/IonAnalysis.h"
 #include "ion/IonSpewer.h"
 #include "ion/Lowering.h"
 #include "ion/MIRGraph.h"
@@ -24,7 +24,6 @@
 #include "jsscriptinlines.h"
 
 #include "ion/CompileInfo-inl.h"
-#include "ion/ExecutionModeInlines.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/IonCaches.cpp

@@ -4,16 +4,16 @@
  * 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 "ion/IonCaches.h"
+
 #include "mozilla/DebugOnly.h"
 
-#include "ion/PerfSpewer.h"
 #include "ion/CodeGenerator.h"
 #include "ion/Ion.h"
-#include "ion/IonCaches.h"
 #include "ion/IonLinker.h"
 #include "ion/IonSpewer.h"
+#include "ion/PerfSpewer.h"
 #include "ion/VMFunctions.h"
-
 #include "vm/Shape.h"
 
 #include "vm/Interpreter-inl.h"

js/src/ion/IonCaches.h

@@ -9,7 +9,10 @@
 
 #include "ion/IonCode.h"
 #include "ion/Registers.h"
-
+#include "ion/shared/Assembler-shared.h"
+#ifdef JS_CPU_ARM
+# include "ion/arm/Assembler-arm.h"
+#endif
 #include "vm/ForkJoin.h"
 
 class JSFunction;

js/src/ion/IonCode.h

@@ -10,13 +10,12 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
 
-#include "ion/IonTypes.h"
-#include "ion/AsmJS.h"
-#include "gc/Heap.h"
-
-// For RecompileInfo
 #include "jsinfer.h"
 
+#include "gc/Heap.h"
+#include "ion/AsmJS.h"
+#include "ion/IonTypes.h"
+
 namespace JSC {
     class ExecutablePool;
 }

js/src/ion/IonCompartment.h

@@ -11,12 +11,13 @@
 
 #include "mozilla/MemoryReporting.h"
 
-#include "ion/IonCode.h"
 #include "jsweakcache.h"
+
+#include "ion/CompileInfo.h"
+#include "ion/IonCode.h"
+#include "ion/IonFrames.h"
 #include "js/Value.h"
 #include "vm/Stack.h"
-#include "ion/IonFrames.h"
-#include "ion/CompileInfo.h"
 
 namespace js {
 namespace ion {

js/src/ion/IonFrameIterator-inl.h

@@ -9,9 +9,10 @@
 
 #ifdef JS_ION
 
-#include "ion/BaselineFrame.h"
 #include "ion/IonFrameIterator.h"
+
 #include "ion/Bailouts.h"
+#include "ion/BaselineFrame.h"
 
 namespace js {
 namespace ion {

js/src/ion/IonFrameIterator.h

@@ -9,13 +9,12 @@
 
 #ifdef JS_ION
 
+#include "jsscript.h"
 #include "jstypes.h"
+
 #include "ion/IonCode.h"
 #include "ion/SnapshotReader.h"
 
-class JSFunction;
-class JSScript;
-
 namespace js {
     class ActivationIterator;
 };

js/src/ion/IonFrames-inl.h

@@ -10,6 +10,7 @@
 #ifdef JS_ION
 
 #include "ion/IonFrames.h"
+
 #include "ion/IonFrameIterator.h"
 #include "ion/LIR.h"
 

js/src/ion/IonFrames.cpp

@@ -4,11 +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 "ion/IonFrames.h"
+#include "ion/IonFrames-inl.h"
 
+#include "jsfun.h"
 #include "jsobj.h"
 #include "jsscript.h"
-#include "jsfun.h"
+
 #include "gc/Marking.h"
 #include "ion/BaselineFrame.h"
 #include "ion/BaselineIC.h"
@@ -25,7 +26,6 @@
 #include "jsfuninlines.h"
 
 #include "ion/IonFrameIterator-inl.h"
-#include "ion/IonFrames-inl.h"
 #include "vm/Probes-inl.h"
 
 namespace js {

js/src/ion/IonFrames.h

@@ -15,9 +15,10 @@
 #include "jsfun.h"
 #include "jstypes.h"
 #include "jsutil.h"
-#include "ion/Registers.h"
+
 #include "ion/IonCode.h"
 #include "ion/IonFrameIterator.h"
+#include "ion/Registers.h"
 
 class JSFunction;
 class JSScript;

js/src/ion/IonLinker.h

@@ -10,9 +10,10 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsgc.h"
+
+#include "assembler/jit/ExecutableAllocator.h"
 #include "ion/IonCode.h"
 #include "ion/IonCompartment.h"
-#include "assembler/jit/ExecutableAllocator.h"
 #include "ion/IonMacroAssembler.h"
 
 namespace js {

js/src/ion/IonMacroAssembler.cpp

@@ -14,7 +14,6 @@
 #include "ion/BaselineIC.h"
 #include "ion/BaselineJIT.h"
 #include "ion/BaselineRegisters.h"
-#include "ion/IonMacroAssembler.h"
 #include "ion/MIR.h"
 #include "js/RootingAPI.h"
 #include "vm/ForkJoin.h"

js/src/ion/IonSpewer.cpp

@@ -6,9 +6,10 @@
 
 #ifdef DEBUG
 
-#include "ion/Ion.h"
 #include "ion/IonSpewer.h"
 
+#include "ion/Ion.h"
+
 #ifndef ION_SPEW_DIR
 # if defined(_WIN32)
 #  define ION_SPEW_DIR ""

js/src/ion/IonSpewer.h

@@ -7,10 +7,10 @@
 #ifndef ion_IonSpewer_h
 #define ion_IonSpewer_h
 
-#include <stdarg.h>
-
 #include "mozilla/DebugOnly.h"
 
+#include <stdarg.h>
+
 #include "ion/C1Spewer.h"
 #include "ion/JSONSpewer.h"
 

js/src/ion/IonTypes.h

@@ -7,9 +7,10 @@
 #ifndef ion_IonTypes_h
 #define ion_IonTypes_h
 
-#include "js/Value.h"
 #include "jstypes.h"
 
+#include "js/Value.h"
+
 namespace js {
 namespace ion {
 

js/src/ion/JSONSpewer.cpp

@@ -4,13 +4,14 @@
  * 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 "ion/JSONSpewer.h"
+
 #include <stdarg.h>
 
-#include "ion/JSONSpewer.h"
+#include "ion/LinearScan.h"
 #include "ion/LIR.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "ion/LinearScan.h"
 #include "ion/RangeAnalysis.h"
 
 using namespace js;

js/src/ion/LICM.cpp

@@ -4,12 +4,13 @@
  * 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 "ion/LICM.h"
+
 #include <stdio.h>
 
 #include "ion/Ion.h"
 #include "ion/IonBuilder.h"
 #include "ion/IonSpewer.h"
-#include "ion/LICM.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
 

js/src/ion/LICM.h

@@ -11,6 +11,7 @@
 #include "ion/IonAnalysis.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
+
 // This file represents the Loop Invariant Code Motion optimization pass
 
 namespace js {

js/src/ion/LIR.cpp

@@ -4,12 +4,13 @@
  * 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 "ion/LIR.h"
+
 #include "jsprf.h"
 
+#include "ion/IonSpewer.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "ion/LIR.h"
-#include "ion/IonSpewer.h"
 #include "ion/shared/CodeGenerator-shared.h"
 
 using namespace js;

js/src/ion/LIR.h

@@ -14,15 +14,15 @@
 
 #include "jscntxt.h"
 
-#include "ion/IonAllocPolicy.h"
-#include "ion/InlineList.h"
-#include "ion/LOpcodes.h"
-#include "ion/Registers.h"
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
-#include "ion/shared/Assembler-shared.h"
-#include "ion/Safepoints.h"
 #include "ion/Bailouts.h"
+#include "ion/InlineList.h"
+#include "ion/IonAllocPolicy.h"
+#include "ion/LOpcodes.h"
+#include "ion/MIRGraph.h"
+#include "ion/MIR.h"
+#include "ion/Registers.h"
+#include "ion/Safepoints.h"
+#include "ion/shared/Assembler-shared.h"
 #include "ion/VMFunctions.h"
 
 namespace js {

js/src/ion/LinearScan.cpp

@@ -4,12 +4,13 @@
  * 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 <limits.h>
+#include "ion/LinearScan.h"
 
 #include "mozilla/DebugOnly.h"
 
+#include <limits.h>
+
 #include "ion/BitSet.h"
-#include "ion/LinearScan.h"
 #include "ion/IonBuilder.h"
 #include "ion/IonSpewer.h"
 

js/src/ion/LinearScan.h

@@ -7,9 +7,8 @@
 #ifndef ion_LinearScan_h
 #define ion_LinearScan_h
 
-#include "ion/LiveRangeAllocator.h"
 #include "ion/BitSet.h"
-
+#include "ion/LiveRangeAllocator.h"
 #include "js/Vector.h"
 
 namespace js {

js/src/ion/LiveRangeAllocator.cpp

@@ -4,10 +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 "mozilla/DebugOnly.h"
-
 #include "ion/LiveRangeAllocator.h"
 
+#include "mozilla/DebugOnly.h"
+
 #include "ion/BacktrackingAllocator.h"
 #include "ion/LinearScan.h"
 

js/src/ion/Lowering.cpp

@@ -4,20 +4,24 @@
  * 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 "ion/LIR.h"
 #include "ion/Lowering.h"
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
-#include "ion/IonSpewer.h"
-#include "ion/RangeAnalysis.h"
+
+#include "mozilla/DebugOnly.h"
+
 #include "jsanalyze.h"
 #include "jsbool.h"
 #include "jsnum.h"
-#include "ion/shared/Lowering-shared-inl.h"
-#include "mozilla/DebugOnly.h"
+
+#include "ion/IonSpewer.h"
+#include "ion/LIR.h"
+#include "ion/MIR.h"
+#include "ion/MIRGraph.h"
+#include "ion/RangeAnalysis.h"
 
 #include "jsinferinlines.h"
 
+#include "ion/shared/Lowering-shared-inl.h"
+
 using namespace js;
 using namespace ion;
 

js/src/ion/Lowering.h

@@ -13,7 +13,6 @@
 #include "ion/IonAllocPolicy.h"
 #include "ion/LIR.h"
 #include "ion/MOpcodes.h"
-
 #if defined(JS_CPU_X86)
 # include "ion/x86/Lowering-x86.h"
 #elif defined(JS_CPU_X64)

js/src/ion/MCallOptimize.cpp

@@ -6,12 +6,12 @@
 
 #include "jslibmath.h"
 #include "jsmath.h"
+
 #include "builtin/ParallelArray.h"
 #include "builtin/TestingFunctions.h"
-
+#include "ion/IonBuilder.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "ion/IonBuilder.h"
 
 #include "jsscriptinlines.h"
 

js/src/ion/MIR.cpp

@@ -8,16 +8,17 @@
 
 #include "mozilla/FloatingPoint.h"
 
-#include "ion/BaselineInspector.h"
-#include "ion/IonBuilder.h"
-#include "ion/LICM.h" // For LinearSum
-#include "ion/MIRGraph.h"
-#include "ion/EdgeCaseAnalysis.h"
-#include "ion/RangeAnalysis.h"
-#include "ion/IonSpewer.h"
 #include "jsnum.h"
 #include "jsstr.h"
 
+#include "ion/BaselineInspector.h"
+#include "ion/EdgeCaseAnalysis.h"
+#include "ion/IonBuilder.h"
+#include "ion/IonSpewer.h"
+#include "ion/LICM.h" // For LinearSum
+#include "ion/MIRGraph.h"
+#include "ion/RangeAnalysis.h"
+
 #include "jsatominlines.h"
 #include "jsinferinlines.h"
 

js/src/ion/MIR.h

@@ -18,14 +18,14 @@
 #include "jsinfer.h"
 #include "jslibmath.h"
 
-#include "ion/TypePolicy.h"
-#include "ion/IonAllocPolicy.h"
-#include "ion/InlineList.h"
-#include "ion/MOpcodes.h"
-#include "ion/IonMacroAssembler.h"
 #include "ion/Bailouts.h"
-#include "ion/FixedList.h"
 #include "ion/CompilerRoot.h"
+#include "ion/FixedList.h"
+#include "ion/InlineList.h"
+#include "ion/IonAllocPolicy.h"
+#include "ion/IonMacroAssembler.h"
+#include "ion/MOpcodes.h"
+#include "ion/TypePolicy.h"
 #include "vm/ScopeObject.h"
 
 namespace js {

js/src/ion/MIRGenerator.h

@@ -9,19 +9,19 @@
 
 // This file declares the data structures used to build a control-flow graph
 // containing MIR.
+
 #include <stdarg.h>
 
 #include "jscntxt.h"
 #include "jscompartment.h"
+
+#include "ion/CompileInfo.h"
 #include "ion/IonAllocPolicy.h"
 #include "ion/IonCompartment.h"
-#include "ion/CompileInfo.h"
-#include "ion/RegisterSets.h"
-
 #if defined(JS_ION_PERF)
 # include "ion/PerfSpewer.h"
 #endif
-
+#include "ion/RegisterSets.h"
 
 namespace js {
 namespace ion {

js/src/ion/MIRGraph.cpp

@@ -4,13 +4,15 @@
  * 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 "ion/MIRGraph.h"
+
 #include "jsanalyze.h"
 
 #include "ion/Ion.h"
+#include "ion/IonBuilder.h"
 #include "ion/IonSpewer.h"
 #include "ion/MIR.h"
-#include "ion/MIRGraph.h"
-#include "ion/IonBuilder.h"
+
 #include "jsinferinlines.h"
 
 using namespace js;

js/src/ion/MIRGraph.h

@@ -10,9 +10,10 @@
 // This file declares the data structures used to build a control-flow graph
 // containing MIR.
 
-#include "ion/IonAllocPolicy.h"
-#include "ion/MIRGenerator.h"
 #include "ion/FixedList.h"
+#include "ion/IonAllocPolicy.h"
+#include "ion/MIR.h"
+#include "ion/MIRGenerator.h"
 
 namespace js {
 namespace ion {

js/src/ion/MoveResolver.h

@@ -7,9 +7,9 @@
 #ifndef ion_MoveResolver_h
 #define ion_MoveResolver_h
 
-#include "ion/Registers.h"
 #include "ion/InlineList.h"
 #include "ion/IonAllocPolicy.h"
+#include "ion/Registers.h"
 
 namespace js {
 namespace ion {

js/src/ion/ParallelFunctions.h

@@ -7,9 +7,9 @@
 #ifndef ion_ParallelFunctions_h
 #define ion_ParallelFunctions_h
 
-#include "vm/ThreadPool.h"
-#include "vm/ForkJoin.h"
 #include "gc/Heap.h"
+#include "vm/ForkJoin.h"
+#include "vm/ThreadPool.h"
 
 namespace js {
 namespace ion {

js/src/ion/ParallelSafetyAnalysis.cpp

@@ -4,15 +4,16 @@
  * 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 "ion/ParallelSafetyAnalysis.h"
+
 #include <stdio.h>
 
 #include "ion/Ion.h"
+#include "ion/IonAnalysis.h"
+#include "ion/IonSpewer.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "ion/ParallelSafetyAnalysis.h"
-#include "ion/IonSpewer.h"
 #include "ion/UnreachableCodeElimination.h"
-#include "ion/IonAnalysis.h"
 #include "vm/Stack.h"
 
 #include "jsinferinlines.h"

js/src/ion/ParallelSafetyAnalysis.h

@@ -7,8 +7,8 @@
 #ifndef ion_ParallelSafetyAnalysis_h
 #define ion_ParallelSafetyAnalysis_h
 
-#include "ion/MIR.h"
 #include "ion/CompileInfo.h"
+#include "ion/MIR.h"
 
 namespace js {
 

js/src/ion/PerfSpewer.cpp

@@ -4,17 +4,19 @@
  * 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 "ion/PerfSpewer.h"
+
 #include <stdarg.h>
+
 #if defined(__linux__)
 # include <unistd.h>
 #endif
 
-#include "ion/PerfSpewer.h"
 #include "ion/IonSpewer.h"
+#include "ion/LinearScan.h"
 #include "ion/LIR.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "ion/LinearScan.h"
 #include "ion/RangeAnalysis.h"
 
 using namespace js;

js/src/ion/PerfSpewer.h

@@ -10,6 +10,7 @@
 #include <stdio.h>
 
 #include "jsscript.h"
+
 #include "ion/IonMacroAssembler.h"
 #include "js/RootingAPI.h"
 

js/src/ion/RangeAnalysis.cpp

@@ -4,6 +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 "ion/RangeAnalysis.h"
+
 #include "mozilla/MathAlgorithms.h"
 
 #include <math.h>
@@ -11,14 +13,12 @@
 
 #include "jsanalyze.h"
 
-#include "vm/NumericConversions.h"
-
 #include "ion/Ion.h"
 #include "ion/IonAnalysis.h"
+#include "ion/IonSpewer.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "ion/RangeAnalysis.h"
-#include "ion/IonSpewer.h"
+#include "vm/NumericConversions.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/RangeAnalysis.h

@@ -10,9 +10,9 @@
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
 
-#include "ion/MIR.h"
 #include "ion/CompileInfo.h"
 #include "ion/IonAnalysis.h"
+#include "ion/MIR.h"
 
 namespace js {
 namespace ion {

js/src/ion/RegisterAllocator.h

@@ -9,12 +9,12 @@
 
 #include "mozilla/Attributes.h"
 
-#include "ion/Ion.h"
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
 #include "ion/InlineList.h"
+#include "ion/Ion.h"
 #include "ion/LIR.h"
 #include "ion/Lowering.h"
+#include "ion/MIR.h"
+#include "ion/MIRGraph.h"
 
 // Generic structures and functions for use by register allocators.
 

js/src/ion/RegisterSets.h

@@ -9,8 +9,8 @@
 
 #include "mozilla/MathAlgorithms.h"
 
-#include "ion/Registers.h"
 #include "ion/IonAllocPolicy.h"
+#include "ion/Registers.h"
 
 namespace js {
 namespace ion {

js/src/ion/Registers.h

@@ -10,6 +10,11 @@
 #include "mozilla/Array.h"
 
 #include "jsutil.h"
+
+// ARM defines the RegisterID within Architecture-arm.h
+#if !defined(JS_CPU_ARM)
+#include "assembler/assembler/MacroAssembler.h"
+#endif
 #include "ion/IonTypes.h"
 #if defined(JS_CPU_X86)
 # include "ion/x86/Architecture-x86.h"
@@ -19,11 +24,6 @@
 # include "ion/arm/Architecture-arm.h"
 #endif
 
-// ARM defines the RegisterID within Architecture-arm.h
-#if !defined(JS_CPU_ARM)
-#include "assembler/assembler/MacroAssembler.h"
-#endif
-
 namespace js {
 namespace ion {
 

js/src/ion/Safepoints.h

@@ -7,10 +7,9 @@
 #ifndef ion_Safepoints_h
 #define ion_Safepoints_h
 
-#include "ion/Registers.h"
-#include "ion/CompactBuffer.h"
 #include "ion/BitSet.h"
-
+#include "ion/CompactBuffer.h"
+#include "ion/Registers.h"
 #include "ion/shared/Assembler-shared.h"
 
 namespace js {

js/src/ion/SnapshotReader.h

@@ -7,10 +7,10 @@
 #ifndef ion_SnapshotReader_h
 #define ion_SnapshotReader_h
 
-#include "ion/IonTypes.h"
-#include "ion/IonCode.h"
-#include "ion/Registers.h"
 #include "ion/CompactBuffer.h"
+#include "ion/IonCode.h"
+#include "ion/IonTypes.h"
+#include "ion/Registers.h"
 
 namespace js {
 namespace ion {

js/src/ion/SnapshotWriter.h

@@ -7,11 +7,11 @@
 #ifndef ion_SnapshotWriter_h
 #define ion_SnapshotWriter_h
 
+#include "ion/Bailouts.h"
+#include "ion/CompactBuffer.h"
 #include "ion/Ion.h"
 #include "ion/IonCode.h"
 #include "ion/Registers.h"
-#include "ion/CompactBuffer.h"
-#include "ion/Bailouts.h"
 
 namespace js {
 namespace ion {

js/src/ion/Snapshots.cpp

@@ -4,19 +4,19 @@
  * 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 "ion/MIRGenerator.h"
-#include "ion/IonFrames.h"
 #include "jsscript.h"
+
+#include "ion/IonFrames.h"
 #include "ion/IonLinker.h"
 #include "ion/IonSpewer.h"
+#ifdef TRACK_SNAPSHOTS
+#include "ion/LIR.h"
+#include "ion/MIR.h"
+#endif
+#include "ion/MIRGenerator.h"
 #include "ion/SnapshotReader.h"
 #include "ion/SnapshotWriter.h"
 
-#ifdef TRACK_SNAPSHOTS
-#include "ion/MIR.h"
-#include "ion/LIR.h"
-#endif
-
 using namespace js;
 using namespace js::ion;
 

js/src/ion/TypePolicy.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ion/TypePolicy.h"
+
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
 

js/src/ion/UnreachableCodeElimination.cpp

@@ -5,8 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ion/UnreachableCodeElimination.h"
-#include "ion/IonAnalysis.h"
+
 #include "ion/AliasAnalysis.h"
+#include "ion/IonAnalysis.h"
 #include "ion/ValueNumbering.h"
 
 using namespace js;

js/src/ion/VMFunctions.cpp

@@ -4,24 +4,23 @@
  * 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 "ion/VMFunctions.h"
+
+#include "builtin/ParallelArray.h"
+#include "frontend/BytecodeCompiler.h"
+#include "ion/BaselineIC.h"
 #include "ion/Ion.h"
 #include "ion/IonCompartment.h"
-#include "ion/BaselineFrame-inl.h"
-#include "ion/BaselineIC.h"
 #include "ion/IonFrames.h"
-
 #include "vm/ArrayObject.h"
 #include "vm/Debugger.h"
 #include "vm/Interpreter.h"
-#include "vm/StringObject-inl.h"
-
-#include "builtin/ParallelArray.h"
-
-#include "frontend/BytecodeCompiler.h"
 
 #include "jsboolinlines.h"
 
+#include "ion/BaselineFrame-inl.h"
 #include "vm/Interpreter-inl.h"
+#include "vm/StringObject-inl.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/VMFunctions.h

@@ -9,6 +9,10 @@
 
 #include "jspubtd.h"
 
+#include "ion/CompileInfo.h"
+#include "ion/Ion.h"
+#include "ion/IonFrames.h"
+
 namespace js {
 
 class DeclEnvObject;

js/src/ion/ValueNumbering.cpp

@@ -4,11 +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 "ion/ValueNumbering.h"
+
+#include "ion/CompileInfo.h"
 #include "ion/Ion.h"
 #include "ion/IonBuilder.h"
 #include "ion/IonSpewer.h"
-#include "ion/CompileInfo.h"
-#include "ion/ValueNumbering.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/ValueNumbering.h

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

js/src/ion/shared/Assembler-shared.h

@@ -7,14 +7,15 @@
 #ifndef ion_shared_Assembler_shared_h
 #define ion_shared_Assembler_shared_h
 
-#include <limits.h>
-
 #include "mozilla/DebugOnly.h"
 #include "mozilla/PodOperations.h"
 
+#include <limits.h>
+
 #include "ion/IonAllocPolicy.h"
 #include "ion/Registers.h"
 #include "ion/RegisterSets.h"
+
 #if defined(JS_CPU_X64) || defined(JS_CPU_ARM)
 // JS_SMALL_BRANCH means the range on a branch instruction
 // is smaller than the whole address space

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

@@ -4,8 +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 "ion/IonMacroAssembler.h"
 #include "gc/Marking.h"
+#include "ion/IonMacroAssembler.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/shared/Assembler-x86-shared.h

@@ -6,8 +6,11 @@
 
 #ifndef ion_shared_Assembler_x86_shared_h
 #define ion_shared_Assembler_x86_shared_h
+
 #include <cstddef>
+
 #include "assembler/assembler/X86Assembler.h"
+#include "ion/shared/Assembler-shared.h"
 
 namespace js {
 namespace ion {

js/src/ion/shared/BaselineCompiler-shared.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ion/shared/BaselineCompiler-shared.h"
+
 #include "ion/BaselineIC.h"
 #include "ion/VMFunctions.h"
 

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

@@ -8,11 +8,12 @@
 #define ion_shared_BaselineCompiler_shared_h
 
 #include "jscntxt.h"
+
 #include "ion/BaselineFrameInfo.h"
-#include "ion/IonSpewer.h"
 #include "ion/BaselineIC.h"
 #include "ion/IonInstrumentation.h"
 #include "ion/IonMacroAssembler.h"
+#include "ion/IonSpewer.h"
 
 namespace js {
 namespace ion {

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

@@ -4,10 +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 "ion/BaselineJIT.h"
-#include "ion/BaselineIC.h"
 #include "ion/BaselineCompiler.h"
 #include "ion/BaselineHelpers.h"
+#include "ion/BaselineIC.h"
+#include "ion/BaselineJIT.h"
 #include "ion/IonLinker.h"
 
 using namespace js;

js/src/ion/shared/CodeGenerator-shared-inl.h

@@ -7,6 +7,8 @@
 #ifndef ion_shared_CodeGenerator_shared_inl_h
 #define ion_shared_CodeGenerator_shared_inl_h
 
+#include "ion/shared/CodeGenerator-shared.h"
+
 namespace js {
 namespace ion {
 

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

@@ -4,17 +4,18 @@
  * 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 "ion/shared/CodeGenerator-shared-inl.h"
+
 #include "mozilla/DebugOnly.h"
 
-#include "ion/shared/CodeGenerator-shared.h"
-#include "ion/MIRGenerator.h"
-#include "ion/IonFrames-inl.h"
-#include "ion/MIR.h"
-#include "ion/shared/CodeGenerator-shared-inl.h"
-#include "ion/IonSpewer.h"
-#include "ion/IonMacroAssembler.h"
-#include "ion/ParallelFunctions.h"
 #include "builtin/ParallelArray.h"
+#include "ion/IonMacroAssembler.h"
+#include "ion/IonSpewer.h"
+#include "ion/MIR.h"
+#include "ion/MIRGenerator.h"
+#include "ion/ParallelFunctions.h"
+
+#include "ion/IonFrames-inl.h"
 
 using namespace js;
 using namespace js::ion;

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

@@ -7,16 +7,15 @@
 #ifndef ion_shared_CodeGenerator_shared_h
 #define ion_shared_CodeGenerator_shared_h
 
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
-#include "ion/LIR.h"
 #include "ion/IonCaches.h"
-#include "ion/IonMacroAssembler.h"
 #include "ion/IonFrames.h"
 #include "ion/IonMacroAssembler.h"
+#include "ion/LIR.h"
+#include "ion/MIR.h"
+#include "ion/MIRGraph.h"
 #include "ion/Safepoints.h"
-#include "ion/VMFunctions.h"
 #include "ion/SnapshotWriter.h"
+#include "ion/VMFunctions.h"
 
 namespace js {
 namespace ion {