Bug 902908 - Rename js/src/ion to js/src/jit. r=luke

--HG--
rename : js/src/ion/AliasAnalysis.cpp => js/src/jit/AliasAnalysis.cpp
rename : js/src/ion/AliasAnalysis.h => js/src/jit/AliasAnalysis.h
rename : js/src/ion/AsmJS.cpp => js/src/jit/AsmJS.cpp
rename : js/src/ion/AsmJS.h => js/src/jit/AsmJS.h
rename : js/src/ion/AsmJSLink.cpp => js/src/jit/AsmJSLink.cpp
rename : js/src/ion/AsmJSLink.h => js/src/jit/AsmJSLink.h
rename : js/src/ion/AsmJSModule.cpp => js/src/jit/AsmJSModule.cpp
rename : js/src/ion/AsmJSModule.h => js/src/jit/AsmJSModule.h
rename : js/src/ion/AsmJSSignalHandlers.cpp => js/src/jit/AsmJSSignalHandlers.cpp
rename : js/src/ion/AsmJSSignalHandlers.h => js/src/jit/AsmJSSignalHandlers.h
rename : js/src/ion/BacktrackingAllocator.cpp => js/src/jit/BacktrackingAllocator.cpp
rename : js/src/ion/BacktrackingAllocator.h => js/src/jit/BacktrackingAllocator.h
rename : js/src/ion/Bailouts.cpp => js/src/jit/Bailouts.cpp
rename : js/src/ion/Bailouts.h => js/src/jit/Bailouts.h
rename : js/src/ion/BaselineBailouts.cpp => js/src/jit/BaselineBailouts.cpp
rename : js/src/ion/BaselineCompiler.cpp => js/src/jit/BaselineCompiler.cpp
rename : js/src/ion/BaselineCompiler.h => js/src/jit/BaselineCompiler.h
rename : js/src/ion/BaselineFrame-inl.h => js/src/jit/BaselineFrame-inl.h
rename : js/src/ion/BaselineFrame.cpp => js/src/jit/BaselineFrame.cpp
rename : js/src/ion/BaselineFrame.h => js/src/jit/BaselineFrame.h
rename : js/src/ion/BaselineFrameInfo.cpp => js/src/jit/BaselineFrameInfo.cpp
rename : js/src/ion/BaselineFrameInfo.h => js/src/jit/BaselineFrameInfo.h
rename : js/src/ion/BaselineHelpers.h => js/src/jit/BaselineHelpers.h
rename : js/src/ion/BaselineIC.cpp => js/src/jit/BaselineIC.cpp
rename : js/src/ion/BaselineIC.h => js/src/jit/BaselineIC.h
rename : js/src/ion/BaselineInspector.cpp => js/src/jit/BaselineInspector.cpp
rename : js/src/ion/BaselineInspector.h => js/src/jit/BaselineInspector.h
rename : js/src/ion/BaselineJIT.cpp => js/src/jit/BaselineJIT.cpp
rename : js/src/ion/BaselineJIT.h => js/src/jit/BaselineJIT.h
rename : js/src/ion/BaselineRegisters.h => js/src/jit/BaselineRegisters.h
rename : js/src/ion/BitSet.cpp => js/src/jit/BitSet.cpp
rename : js/src/ion/BitSet.h => js/src/jit/BitSet.h
rename : js/src/ion/BytecodeAnalysis.cpp => js/src/jit/BytecodeAnalysis.cpp
rename : js/src/ion/BytecodeAnalysis.h => js/src/jit/BytecodeAnalysis.h
rename : js/src/ion/C1Spewer.cpp => js/src/jit/C1Spewer.cpp
rename : js/src/ion/C1Spewer.h => js/src/jit/C1Spewer.h
rename : js/src/ion/CodeGenerator.cpp => js/src/jit/CodeGenerator.cpp
rename : js/src/ion/CodeGenerator.h => js/src/jit/CodeGenerator.h
rename : js/src/ion/CompactBuffer.h => js/src/jit/CompactBuffer.h
rename : js/src/ion/CompileInfo-inl.h => js/src/jit/CompileInfo-inl.h
rename : js/src/ion/CompileInfo.h => js/src/jit/CompileInfo.h
rename : js/src/ion/CompilerRoot.h => js/src/jit/CompilerRoot.h
rename : js/src/ion/EdgeCaseAnalysis.cpp => js/src/jit/EdgeCaseAnalysis.cpp
rename : js/src/ion/EdgeCaseAnalysis.h => js/src/jit/EdgeCaseAnalysis.h
rename : js/src/ion/EffectiveAddressAnalysis.cpp => js/src/jit/EffectiveAddressAnalysis.cpp
rename : js/src/ion/EffectiveAddressAnalysis.h => js/src/jit/EffectiveAddressAnalysis.h
rename : js/src/ion/ExecutionModeInlines.h => js/src/jit/ExecutionModeInlines.h
rename : js/src/ion/FixedList.h => js/src/jit/FixedList.h
rename : js/src/ion/InlineList.h => js/src/jit/InlineList.h
rename : js/src/ion/Ion.cpp => js/src/jit/Ion.cpp
rename : js/src/ion/Ion.h => js/src/jit/Ion.h
rename : js/src/ion/IonAllocPolicy.h => js/src/jit/IonAllocPolicy.h
rename : js/src/ion/IonAnalysis.cpp => js/src/jit/IonAnalysis.cpp
rename : js/src/ion/IonAnalysis.h => js/src/jit/IonAnalysis.h
rename : js/src/ion/IonBuilder.cpp => js/src/jit/IonBuilder.cpp
rename : js/src/ion/IonBuilder.h => js/src/jit/IonBuilder.h
rename : js/src/ion/IonCaches.cpp => js/src/jit/IonCaches.cpp
rename : js/src/ion/IonCaches.h => js/src/jit/IonCaches.h
rename : js/src/ion/IonCode.h => js/src/jit/IonCode.h
rename : js/src/ion/IonCompartment.h => js/src/jit/IonCompartment.h
rename : js/src/ion/IonFrameIterator-inl.h => js/src/jit/IonFrameIterator-inl.h
rename : js/src/ion/IonFrameIterator.h => js/src/jit/IonFrameIterator.h
rename : js/src/ion/IonFrames-inl.h => js/src/jit/IonFrames-inl.h
rename : js/src/ion/IonFrames.cpp => js/src/jit/IonFrames.cpp
rename : js/src/ion/IonFrames.h => js/src/jit/IonFrames.h
rename : js/src/ion/IonInstrumentation.h => js/src/jit/IonInstrumentation.h
rename : js/src/ion/IonLinker.h => js/src/jit/IonLinker.h
rename : js/src/ion/IonMacroAssembler.cpp => js/src/jit/IonMacroAssembler.cpp
rename : js/src/ion/IonMacroAssembler.h => js/src/jit/IonMacroAssembler.h
rename : js/src/ion/IonSpewer.cpp => js/src/jit/IonSpewer.cpp
rename : js/src/ion/IonSpewer.h => js/src/jit/IonSpewer.h
rename : js/src/ion/IonTypes.h => js/src/jit/IonTypes.h
rename : js/src/ion/JSONSpewer.cpp => js/src/jit/JSONSpewer.cpp
rename : js/src/ion/JSONSpewer.h => js/src/jit/JSONSpewer.h
rename : js/src/ion/LICM.cpp => js/src/jit/LICM.cpp
rename : js/src/ion/LICM.h => js/src/jit/LICM.h
rename : js/src/ion/LIR-Common.h => js/src/jit/LIR-Common.h
rename : js/src/ion/LIR.cpp => js/src/jit/LIR.cpp
rename : js/src/ion/LIR.h => js/src/jit/LIR.h
rename : js/src/ion/LOpcodes.h => js/src/jit/LOpcodes.h
rename : js/src/ion/LinearScan.cpp => js/src/jit/LinearScan.cpp
rename : js/src/ion/LinearScan.h => js/src/jit/LinearScan.h
rename : js/src/ion/LiveRangeAllocator.cpp => js/src/jit/LiveRangeAllocator.cpp
rename : js/src/ion/LiveRangeAllocator.h => js/src/jit/LiveRangeAllocator.h
rename : js/src/ion/Lowering.cpp => js/src/jit/Lowering.cpp
rename : js/src/ion/Lowering.h => js/src/jit/Lowering.h
rename : js/src/ion/MCallOptimize.cpp => js/src/jit/MCallOptimize.cpp
rename : js/src/ion/MIR.cpp => js/src/jit/MIR.cpp
rename : js/src/ion/MIR.h => js/src/jit/MIR.h
rename : js/src/ion/MIRGenerator.h => js/src/jit/MIRGenerator.h
rename : js/src/ion/MIRGraph.cpp => js/src/jit/MIRGraph.cpp
rename : js/src/ion/MIRGraph.h => js/src/jit/MIRGraph.h
rename : js/src/ion/MOpcodes.h => js/src/jit/MOpcodes.h
rename : js/src/ion/MoveEmitter.h => js/src/jit/MoveEmitter.h
rename : js/src/ion/MoveResolver.cpp => js/src/jit/MoveResolver.cpp
rename : js/src/ion/MoveResolver.h => js/src/jit/MoveResolver.h
rename : js/src/ion/ParallelFunctions.cpp => js/src/jit/ParallelFunctions.cpp
rename : js/src/ion/ParallelFunctions.h => js/src/jit/ParallelFunctions.h
rename : js/src/ion/ParallelSafetyAnalysis.cpp => js/src/jit/ParallelSafetyAnalysis.cpp
rename : js/src/ion/ParallelSafetyAnalysis.h => js/src/jit/ParallelSafetyAnalysis.h
rename : js/src/ion/PcScriptCache.h => js/src/jit/PcScriptCache.h
rename : js/src/ion/PerfSpewer.cpp => js/src/jit/PerfSpewer.cpp
rename : js/src/ion/PerfSpewer.h => js/src/jit/PerfSpewer.h
rename : js/src/ion/RangeAnalysis.cpp => js/src/jit/RangeAnalysis.cpp
rename : js/src/ion/RangeAnalysis.h => js/src/jit/RangeAnalysis.h
rename : js/src/ion/RegisterAllocator.cpp => js/src/jit/RegisterAllocator.cpp
rename : js/src/ion/RegisterAllocator.h => js/src/jit/RegisterAllocator.h
rename : js/src/ion/RegisterSets.h => js/src/jit/RegisterSets.h
rename : js/src/ion/Registers.h => js/src/jit/Registers.h
rename : js/src/ion/Safepoints.cpp => js/src/jit/Safepoints.cpp
rename : js/src/ion/Safepoints.h => js/src/jit/Safepoints.h
rename : js/src/ion/SnapshotReader.h => js/src/jit/SnapshotReader.h
rename : js/src/ion/SnapshotWriter.h => js/src/jit/SnapshotWriter.h
rename : js/src/ion/Snapshots.cpp => js/src/jit/Snapshots.cpp
rename : js/src/ion/StackSlotAllocator.h => js/src/jit/StackSlotAllocator.h
rename : js/src/ion/StupidAllocator.cpp => js/src/jit/StupidAllocator.cpp
rename : js/src/ion/StupidAllocator.h => js/src/jit/StupidAllocator.h
rename : js/src/ion/TypePolicy.cpp => js/src/jit/TypePolicy.cpp
rename : js/src/ion/TypePolicy.h => js/src/jit/TypePolicy.h
rename : js/src/ion/UnreachableCodeElimination.cpp => js/src/jit/UnreachableCodeElimination.cpp
rename : js/src/ion/UnreachableCodeElimination.h => js/src/jit/UnreachableCodeElimination.h
rename : js/src/ion/VMFunctions.cpp => js/src/jit/VMFunctions.cpp
rename : js/src/ion/VMFunctions.h => js/src/jit/VMFunctions.h
rename : js/src/ion/ValueNumbering.cpp => js/src/jit/ValueNumbering.cpp
rename : js/src/ion/ValueNumbering.h => js/src/jit/ValueNumbering.h
rename : js/src/ion/arm/Architecture-arm.cpp => js/src/jit/arm/Architecture-arm.cpp
rename : js/src/ion/arm/Architecture-arm.h => js/src/jit/arm/Architecture-arm.h
rename : js/src/ion/arm/Assembler-arm.cpp => js/src/jit/arm/Assembler-arm.cpp
rename : js/src/ion/arm/Assembler-arm.h => js/src/jit/arm/Assembler-arm.h
rename : js/src/ion/arm/Bailouts-arm.cpp => js/src/jit/arm/Bailouts-arm.cpp
rename : js/src/ion/arm/BaselineCompiler-arm.cpp => js/src/jit/arm/BaselineCompiler-arm.cpp
rename : js/src/ion/arm/BaselineCompiler-arm.h => js/src/jit/arm/BaselineCompiler-arm.h
rename : js/src/ion/arm/BaselineHelpers-arm.h => js/src/jit/arm/BaselineHelpers-arm.h
rename : js/src/ion/arm/BaselineIC-arm.cpp => js/src/jit/arm/BaselineIC-arm.cpp
rename : js/src/ion/arm/BaselineRegisters-arm.h => js/src/jit/arm/BaselineRegisters-arm.h
rename : js/src/ion/arm/CodeGenerator-arm.cpp => js/src/jit/arm/CodeGenerator-arm.cpp
rename : js/src/ion/arm/CodeGenerator-arm.h => js/src/jit/arm/CodeGenerator-arm.h
rename : js/src/ion/arm/IonFrames-arm.cpp => js/src/jit/arm/IonFrames-arm.cpp
rename : js/src/ion/arm/IonFrames-arm.h => js/src/jit/arm/IonFrames-arm.h
rename : js/src/ion/arm/LIR-arm.h => js/src/jit/arm/LIR-arm.h
rename : js/src/ion/arm/LOpcodes-arm.h => js/src/jit/arm/LOpcodes-arm.h
rename : js/src/ion/arm/Lowering-arm.cpp => js/src/jit/arm/Lowering-arm.cpp
rename : js/src/ion/arm/Lowering-arm.h => js/src/jit/arm/Lowering-arm.h
rename : js/src/ion/arm/MacroAssembler-arm.cpp => js/src/jit/arm/MacroAssembler-arm.cpp
rename : js/src/ion/arm/MacroAssembler-arm.h => js/src/jit/arm/MacroAssembler-arm.h
rename : js/src/ion/arm/MoveEmitter-arm.cpp => js/src/jit/arm/MoveEmitter-arm.cpp
rename : js/src/ion/arm/MoveEmitter-arm.h => js/src/jit/arm/MoveEmitter-arm.h
rename : js/src/ion/arm/Trampoline-arm.cpp => js/src/jit/arm/Trampoline-arm.cpp
rename : js/src/ion/shared/Assembler-shared.h => js/src/jit/shared/Assembler-shared.h
rename : js/src/ion/shared/Assembler-x86-shared.cpp => js/src/jit/shared/Assembler-x86-shared.cpp
rename : js/src/ion/shared/Assembler-x86-shared.h => js/src/jit/shared/Assembler-x86-shared.h
rename : js/src/ion/shared/BaselineCompiler-shared.cpp => js/src/jit/shared/BaselineCompiler-shared.cpp
rename : js/src/ion/shared/BaselineCompiler-shared.h => js/src/jit/shared/BaselineCompiler-shared.h
rename : js/src/ion/shared/BaselineCompiler-x86-shared.cpp => js/src/jit/shared/BaselineCompiler-x86-shared.cpp
rename : js/src/ion/shared/BaselineCompiler-x86-shared.h => js/src/jit/shared/BaselineCompiler-x86-shared.h
rename : js/src/ion/shared/BaselineIC-x86-shared.cpp => js/src/jit/shared/BaselineIC-x86-shared.cpp
rename : js/src/ion/shared/CodeGenerator-shared-inl.h => js/src/jit/shared/CodeGenerator-shared-inl.h
rename : js/src/ion/shared/CodeGenerator-shared.cpp => js/src/jit/shared/CodeGenerator-shared.cpp
rename : js/src/ion/shared/CodeGenerator-shared.h => js/src/jit/shared/CodeGenerator-shared.h
rename : js/src/ion/shared/CodeGenerator-x86-shared.cpp => js/src/jit/shared/CodeGenerator-x86-shared.cpp
rename : js/src/ion/shared/CodeGenerator-x86-shared.h => js/src/jit/shared/CodeGenerator-x86-shared.h
rename : js/src/ion/shared/IonAssemblerBuffer.h => js/src/jit/shared/IonAssemblerBuffer.h
rename : js/src/ion/shared/IonAssemblerBufferWithConstantPools.h => js/src/jit/shared/IonAssemblerBufferWithConstantPools.h
rename : js/src/ion/shared/IonFrames-shared.h => js/src/jit/shared/IonFrames-shared.h
rename : js/src/ion/shared/IonFrames-x86-shared.cpp => js/src/jit/shared/IonFrames-x86-shared.cpp
rename : js/src/ion/shared/IonFrames-x86-shared.h => js/src/jit/shared/IonFrames-x86-shared.h
rename : js/src/ion/shared/LIR-x86-shared.h => js/src/jit/shared/LIR-x86-shared.h
rename : js/src/ion/shared/Lowering-shared-inl.h => js/src/jit/shared/Lowering-shared-inl.h
rename : js/src/ion/shared/Lowering-shared.cpp => js/src/jit/shared/Lowering-shared.cpp
rename : js/src/ion/shared/Lowering-shared.h => js/src/jit/shared/Lowering-shared.h
rename : js/src/ion/shared/Lowering-x86-shared.cpp => js/src/jit/shared/Lowering-x86-shared.cpp
rename : js/src/ion/shared/Lowering-x86-shared.h => js/src/jit/shared/Lowering-x86-shared.h
rename : js/src/ion/shared/MacroAssembler-x86-shared.h => js/src/jit/shared/MacroAssembler-x86-shared.h
rename : js/src/ion/shared/MoveEmitter-x86-shared.cpp => js/src/jit/shared/MoveEmitter-x86-shared.cpp
rename : js/src/ion/shared/MoveEmitter-x86-shared.h => js/src/jit/shared/MoveEmitter-x86-shared.h
rename : js/src/ion/x64/Architecture-x64.h => js/src/jit/x64/Architecture-x64.h
rename : js/src/ion/x64/Assembler-x64.cpp => js/src/jit/x64/Assembler-x64.cpp
rename : js/src/ion/x64/Assembler-x64.h => js/src/jit/x64/Assembler-x64.h
rename : js/src/ion/x64/Bailouts-x64.cpp => js/src/jit/x64/Bailouts-x64.cpp
rename : js/src/ion/x64/BaselineCompiler-x64.cpp => js/src/jit/x64/BaselineCompiler-x64.cpp
rename : js/src/ion/x64/BaselineCompiler-x64.h => js/src/jit/x64/BaselineCompiler-x64.h
rename : js/src/ion/x64/BaselineHelpers-x64.h => js/src/jit/x64/BaselineHelpers-x64.h
rename : js/src/ion/x64/BaselineIC-x64.cpp => js/src/jit/x64/BaselineIC-x64.cpp
rename : js/src/ion/x64/BaselineRegisters-x64.h => js/src/jit/x64/BaselineRegisters-x64.h
rename : js/src/ion/x64/CodeGenerator-x64.cpp => js/src/jit/x64/CodeGenerator-x64.cpp
rename : js/src/ion/x64/CodeGenerator-x64.h => js/src/jit/x64/CodeGenerator-x64.h
rename : js/src/ion/x64/LIR-x64.h => js/src/jit/x64/LIR-x64.h
rename : js/src/ion/x64/LOpcodes-x64.h => js/src/jit/x64/LOpcodes-x64.h
rename : js/src/ion/x64/Lowering-x64.cpp => js/src/jit/x64/Lowering-x64.cpp
rename : js/src/ion/x64/Lowering-x64.h => js/src/jit/x64/Lowering-x64.h
rename : js/src/ion/x64/MacroAssembler-x64.cpp => js/src/jit/x64/MacroAssembler-x64.cpp
rename : js/src/ion/x64/MacroAssembler-x64.h => js/src/jit/x64/MacroAssembler-x64.h
rename : js/src/ion/x64/Trampoline-x64.cpp => js/src/jit/x64/Trampoline-x64.cpp
rename : js/src/ion/x86/Architecture-x86.h => js/src/jit/x86/Architecture-x86.h
rename : js/src/ion/x86/Assembler-x86.cpp => js/src/jit/x86/Assembler-x86.cpp
rename : js/src/ion/x86/Assembler-x86.h => js/src/jit/x86/Assembler-x86.h
rename : js/src/ion/x86/Bailouts-x86.cpp => js/src/jit/x86/Bailouts-x86.cpp
rename : js/src/ion/x86/BaselineCompiler-x86.cpp => js/src/jit/x86/BaselineCompiler-x86.cpp
rename : js/src/ion/x86/BaselineCompiler-x86.h => js/src/jit/x86/BaselineCompiler-x86.h
rename : js/src/ion/x86/BaselineHelpers-x86.h => js/src/jit/x86/BaselineHelpers-x86.h
rename : js/src/ion/x86/BaselineIC-x86.cpp => js/src/jit/x86/BaselineIC-x86.cpp
rename : js/src/ion/x86/BaselineRegisters-x86.h => js/src/jit/x86/BaselineRegisters-x86.h
rename : js/src/ion/x86/CodeGenerator-x86.cpp => js/src/jit/x86/CodeGenerator-x86.cpp
rename : js/src/ion/x86/CodeGenerator-x86.h => js/src/jit/x86/CodeGenerator-x86.h
rename : js/src/ion/x86/LIR-x86.h => js/src/jit/x86/LIR-x86.h
rename : js/src/ion/x86/LOpcodes-x86.h => js/src/jit/x86/LOpcodes-x86.h
rename : js/src/ion/x86/Lowering-x86.cpp => js/src/jit/x86/Lowering-x86.cpp
rename : js/src/ion/x86/Lowering-x86.h => js/src/jit/x86/Lowering-x86.h
rename : js/src/ion/x86/MacroAssembler-x86.cpp => js/src/jit/x86/MacroAssembler-x86.cpp
rename : js/src/ion/x86/MacroAssembler-x86.h => js/src/jit/x86/MacroAssembler-x86.h
rename : js/src/ion/x86/Trampoline-x86.cpp => js/src/jit/x86/Trampoline-x86.cpp

config/check_spidermonkey_style.py

@@ -21,7 +21,7 @@
 # 
 # We check the following things in all files.
 #
-# - #includes should have full paths, e.g. "ion/Ion.h", not "Ion.h". 
+# - #includes should have full paths, e.g. "jit/Ion.h", not "Ion.h".
 #
 # - #includes should use the appropriate form for system headers (<...>) and
 #   local headers ("...").

js/src/Makefile.in

@@ -74,18 +74,18 @@ endif
 
 # Ion
 ifdef ENABLE_ION
-VPATH +=	$(srcdir)/ion
-VPATH +=	$(srcdir)/ion/shared
+VPATH +=	$(srcdir)/jit
+VPATH +=	$(srcdir)/jit/shared
 
 ifeq (86, $(findstring 86,$(TARGET_CPU)))
 ifeq (x86_64, $(TARGET_CPU))
-VPATH +=	$(srcdir)/ion/x64
+VPATH +=	$(srcdir)/jit/x64
 else
-VPATH +=	$(srcdir)/ion/x86
+VPATH +=	$(srcdir)/jit/x86
 endif
 endif
 ifeq (arm, $(findstring arm, $(TARGET_CPU)))
-VPATH +=	$(srcdir)/ion/arm
+VPATH +=	$(srcdir)/jit/arm
 endif
 endif #ENABLE_ION
 

js/src/assembler/assembler/AssemblerBuffer.h

@@ -43,7 +43,7 @@
 #include "jsfriendapi.h"
 #include "jsopcode.h"
 
-#include "ion/IonSpewer.h"
+#include "jit/IonSpewer.h"
 #include "js/RootingAPI.h"
 
 #define PRETTY_PRINT_OFFSET(os) (((os)<0)?"-":""), (((os)<0)?-(os):(os))

js/src/builtin/ParallelArray.h

@@ -11,7 +11,7 @@
 #include "jscntxt.h"
 #include "jsobj.h"
 
-#include "ion/Ion.h"
+#include "jit/Ion.h"
 #include "vm/ForkJoin.h"
 #include "vm/ThreadPool.h"
 

js/src/builtin/TestingFunctions.cpp

@@ -14,8 +14,8 @@
 #include "jsprf.h"
 #include "jswrapper.h"
 
-#include "ion/AsmJS.h"
-#include "ion/AsmJSLink.h"
+#include "jit/AsmJS.h"
+#include "jit/AsmJSLink.h"
 #include "vm/ForkJoin.h"
 #include "vm/Interpreter.h"
 

js/src/config/check_spidermonkey_style.py

@@ -21,7 +21,7 @@
 # 
 # We check the following things in all files.
 #
-# - #includes should have full paths, e.g. "ion/Ion.h", not "Ion.h". 
+# - #includes should have full paths, e.g. "jit/Ion.h", not "Ion.h".
 #
 # - #includes should use the appropriate form for system headers (<...>) and
 #   local headers ("...").

js/src/frontend/BytecodeCompiler.cpp

@@ -12,7 +12,7 @@
 #include "frontend/FoldConstants.h"
 #include "frontend/NameFunctions.h"
 #include "frontend/Parser.h"
-#include "ion/AsmJSLink.h"
+#include "jit/AsmJSLink.h"
 #include "vm/GlobalObject.h"
 
 #include "jsobjinlines.h"

js/src/frontend/BytecodeEmitter.cpp

@@ -28,7 +28,7 @@
 
 #include "frontend/Parser.h"
 #include "frontend/TokenStream.h"
-#include "ion/AsmJSLink.h"
+#include "jit/AsmJSLink.h"
 #include "vm/Debugger.h"
 
 #include "jsatominlines.h"

js/src/frontend/Parser.cpp

@@ -33,7 +33,7 @@
 #include "frontend/FoldConstants.h"
 #include "frontend/ParseMaps.h"
 #include "frontend/TokenStream.h"
-#include "ion/AsmJS.h"
+#include "jit/AsmJS.h"
 #include "vm/NumericConversions.h"
 #include "vm/RegExpStatics.h"
 #include "vm/Shape.h"

js/src/gc/Marking.cpp

@@ -8,7 +8,7 @@
 
 #include "mozilla/DebugOnly.h"
 
-#include "ion/IonCode.h"
+#include "jit/IonCode.h"
 #include "vm/Shape.h"
 #include "vm/TypedArrayObject.h"
 

js/src/gc/Marking.h

@@ -12,7 +12,7 @@
 
 #include "gc/Barrier.h"
 #include "gc/Nursery.h"
-#include "ion/IonCode.h"
+#include "jit/IonCode.h"
 
 extern "C" {
 struct JSContext;

js/src/gc/RootMarking.cpp

@@ -23,8 +23,8 @@
 #include "gc/GCInternals.h"
 #include "gc/Marking.h"
 #ifdef JS_ION
-# include "ion/IonFrameIterator.h"
-# include "ion/IonMacroAssembler.h"
+# include "jit/IonFrameIterator.h"
+# include "jit/IonMacroAssembler.h"
 #endif
 #include "js/HashTable.h"
 #include "vm/Debugger.h"

js/src/gc/Zone.cpp

@@ -9,9 +9,9 @@
 #include "jsgc.h"
 
 #ifdef JS_ION
-#include "ion/BaselineJIT.h"
-#include "ion/Ion.h"
-#include "ion/IonCompartment.h"
+#include "jit/BaselineJIT.h"
+#include "jit/Ion.h"
+#include "jit/IonCompartment.h"
 #endif
 #include "vm/Debugger.h"
 #include "vm/Runtime.h"

js/src/jit/AliasAnalysis.cpp

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

js/src/jit/AliasAnalysis.h

@@ -4,11 +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/. */
 
-#ifndef ion_AliasAnalysis_h
-#define ion_AliasAnalysis_h
+#ifndef jit_AliasAnalysis_h
+#define jit_AliasAnalysis_h
 
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
+#include "jit/MIR.h"
+#include "jit/MIRGraph.h"
 
 namespace js {
 namespace ion {
@@ -59,4 +59,4 @@ class AliasAnalysis
 } // namespace js
 } // namespace ion
 
-#endif /* ion_AliasAnalysis_h */
+#endif /* jit_AliasAnalysis_h */

js/src/jit/AsmJS.cpp

@@ -4,7 +4,7 @@
  * 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/AsmJS.h"
+#include "jit/AsmJS.h"
 
 #include "mozilla/Move.h"
 
@@ -17,11 +17,11 @@
 #include "prmjtime.h"
 
 #include "frontend/Parser.h"
-#include "ion/AsmJSModule.h"
-#include "ion/CodeGenerator.h"
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
-#include "ion/PerfSpewer.h"
+#include "jit/AsmJSModule.h"
+#include "jit/CodeGenerator.h"
+#include "jit/MIR.h"
+#include "jit/MIRGraph.h"
+#include "jit/PerfSpewer.h"
 
 #include "jsfuninlines.h"
 

js/src/jit/AsmJS.h

@@ -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/. */
 
-#ifndef ion_AsmJS_h
-#define ion_AsmJS_h
+#ifndef jit_AsmJS_h
+#define jit_AsmJS_h
 
 #include "jsapi.h"
 
@@ -102,4 +102,4 @@ IsAsmJSCompilationAvailable(JSContext *cx, unsigned argc, Value *vp)
 
 } // namespace js
 
-#endif // ion_AsmJS_h
+#endif // jit_AsmJS_h

js/src/jit/AsmJSLink.cpp

@@ -4,7 +4,7 @@
  * 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/AsmJSLink.h"
+#include "jit/AsmJSLink.h"
 
 #ifdef MOZ_VTUNE
 # include "vtune/VTuneWrapper.h"
@@ -15,10 +15,10 @@
 #include "jswrapper.h"
 
 #include "frontend/BytecodeCompiler.h"
-#include "ion/AsmJSModule.h"
-#include "ion/Ion.h"
+#include "jit/AsmJSModule.h"
+#include "jit/Ion.h"
 #ifdef JS_ION_PERF
-# include "ion/PerfSpewer.h"
+# include "jit/PerfSpewer.h"
 #endif
 
 #include "jsfuninlines.h"

js/src/jit/AsmJSLink.h

@@ -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/. */
 
-#ifndef ion_AsmJSLink_h
-#define ion_AsmJSLink_h
+#ifndef jit_AsmJSLink_h
+#define jit_AsmJSLink_h
 
 #include "jsapi.h"
 
@@ -60,4 +60,4 @@ IsAsmJSModule(JSContext *cx, unsigned argc, Value *vp)
 
 } // namespace js
 
-#endif // ion_AsmJS_h
+#endif // jit_AsmJS_h

js/src/jit/AsmJSModule.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/AsmJSModule.h"
-#include "ion/IonCode.h"
+#include "jit/AsmJSModule.h"
+#include "jit/IonCode.h"
 
 #include "jsobjinlines.h"
 

js/src/jit/AsmJSModule.h

@@ -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/. */
 
-#ifndef ion_AsmJSModule_h
-#define ion_AsmJSModule_h
+#ifndef jit_AsmJSModule_h
+#define jit_AsmJSModule_h
 
 #ifdef JS_ION
 
@@ -15,12 +15,12 @@
 #include "jsscript.h"
 
 #include "gc/Marking.h"
-#include "ion/AsmJS.h"
-#include "ion/IonMacroAssembler.h"
+#include "jit/AsmJS.h"
+#include "jit/IonMacroAssembler.h"
 #if defined(JS_ION_PERF)
-# include "ion/PerfSpewer.h"
+# include "jit/PerfSpewer.h"
 #endif
-#include "ion/RegisterSets.h"
+#include "jit/RegisterSets.h"
 
 namespace js {
 
@@ -711,4 +711,4 @@ AsmJSModuleObjectToModule(JSObject *obj);
 
 #endif  // JS_ION
 
-#endif /* ion_AsmJSModule_h */
+#endif /* jit_AsmJSModule_h */

js/src/jit/AsmJSSignalHandlers.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/AsmJSSignalHandlers.h"
+#include "jit/AsmJSSignalHandlers.h"
 
 #include "jscntxt.h"
 
 #include "assembler/assembler/MacroAssembler.h"
-#include "ion/AsmJSModule.h"
+#include "jit/AsmJSModule.h"
 
 #include "vm/ObjectImpl-inl.h"
 

js/src/jit/AsmJSSignalHandlers.h

@@ -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/. */
 
-#ifndef ion_AsmJSSignalHandlers_h
-#define ion_AsmJSSignalHandlers_h
+#ifndef jit_AsmJSSignalHandlers_h
+#define jit_AsmJSSignalHandlers_h
 
 struct JSRuntime;
 
@@ -49,4 +49,4 @@ class AsmJSMachExceptionHandler
 
 } // namespace js
 
-#endif // ion_AsmJSSignalHandlers_h
+#endif // jit_AsmJSSignalHandlers_h

js/src/jit/BacktrackingAllocator.cpp

@@ -4,7 +4,7 @@
  * 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/BacktrackingAllocator.h"
+#include "jit/BacktrackingAllocator.h"
 
 #include "jsprf.h"
 

js/src/jit/BacktrackingAllocator.h

@@ -4,14 +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/. */
 
-#ifndef ion_BacktrackingAllocator_h
-#define ion_BacktrackingAllocator_h
+#ifndef jit_BacktrackingAllocator_h
+#define jit_BacktrackingAllocator_h
 
 #include "mozilla/Array.h"
 
 #include "ds/PriorityQueue.h"
 #include "ds/SplayTree.h"
-#include "ion/LiveRangeAllocator.h"
+#include "jit/LiveRangeAllocator.h"
 
 // Backtracking priority queue based register allocator based on that described
 // in the following blog post:
@@ -235,4 +235,4 @@ class BacktrackingAllocator : public LiveRangeAllocator<BacktrackingVirtualRegis
 } // namespace ion
 } // namespace js
 
-#endif /* ion_BacktrackingAllocator_h */
+#endif /* jit_BacktrackingAllocator_h */

js/src/jit/Bailouts.cpp

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

js/src/jit/Bailouts.h

@@ -4,13 +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/. */
 
-#ifndef ion_Bailouts_h
-#define ion_Bailouts_h
+#ifndef jit_Bailouts_h
+#define jit_Bailouts_h
 
 #include "jstypes.h"
 
-#include "ion/IonFrameIterator.h"
-#include "ion/IonFrames.h"
+#include "jit/IonFrameIterator.h"
+#include "jit/IonFrames.h"
 #include "vm/Stack.h"
 
 namespace js {
@@ -178,4 +178,4 @@ bool CheckFrequentBailouts(JSContext *cx, JSScript *script);
 } // namespace ion
 } // namespace js
 
-#endif /* ion_Bailouts_h */
+#endif /* jit_Bailouts_h */

js/src/jit/BaselineBailouts.cpp

@@ -4,15 +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/BaselineCompiler.h"
-#include "ion/BaselineIC.h"
-#include "ion/BaselineJIT.h"
-#include "ion/CompileInfo.h"
-#include "ion/IonSpewer.h"
+#include "jit/BaselineCompiler.h"
+#include "jit/BaselineIC.h"
+#include "jit/BaselineJIT.h"
+#include "jit/CompileInfo.h"
+#include "jit/IonSpewer.h"
 
 #include "jsfuninlines.h"
 
-#include "ion/IonFrames-inl.h"
+#include "jit/IonFrames-inl.h"
 
 using namespace js;
 using namespace js::ion;

js/src/jit/BaselineCompiler.cpp

@@ -4,15 +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/BaselineCompiler.h"
+#include "jit/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"
-#include "ion/VMFunctions.h"
+#include "jit/BaselineHelpers.h"
+#include "jit/BaselineIC.h"
+#include "jit/BaselineJIT.h"
+#include "jit/FixedList.h"
+#include "jit/IonLinker.h"
+#include "jit/IonSpewer.h"
+#include "jit/VMFunctions.h"
 
 #include "vm/Interpreter-inl.h"
 

js/src/jit/BaselineCompiler.h

@@ -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/. */
 
-#ifndef ion_BaselineCompiler_h
-#define ion_BaselineCompiler_h
+#ifndef jit_BaselineCompiler_h
+#define jit_BaselineCompiler_h
 
 #ifdef JS_ION
 
@@ -13,18 +13,18 @@
 #include "jscompartment.h"
 #include "jsinfer.h"
 
-#include "ion/BaselineIC.h"
-#include "ion/BaselineJIT.h"
-#include "ion/BytecodeAnalysis.h"
-#include "ion/FixedList.h"
-#include "ion/IonAllocPolicy.h"
-#include "ion/IonCode.h"
+#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 "ion/x86/BaselineCompiler-x86.h"
+# include "jit/x86/BaselineCompiler-x86.h"
 #elif defined(JS_CPU_X64)
-# include "ion/x64/BaselineCompiler-x64.h"
+# include "jit/x64/BaselineCompiler-x64.h"
 #else
-# include "ion/arm/BaselineCompiler-arm.h"
+# include "jit/arm/BaselineCompiler-arm.h"
 #endif
 #include "vm/Interpreter.h"
 
@@ -270,4 +270,4 @@ class BaselineCompiler : public BaselineCompilerSpecific
 
 #endif // JS_ION
 
-#endif /* ion_BaselineCompiler_h */
+#endif /* jit_BaselineCompiler_h */

js/src/jit/BaselineFrame-inl.h

@@ -4,17 +4,17 @@
  * 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 ion_BaselineFrame_inl_h
-#define ion_BaselineFrame_inl_h
+#ifndef jit_BaselineFrame_inl_h
+#define jit_BaselineFrame_inl_h
 
 #ifdef JS_ION
 
-#include "ion/BaselineFrame.h"
+#include "jit/BaselineFrame.h"
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "ion/IonFrames.h"
+#include "jit/IonFrames.h"
 
 #include "vm/ScopeObject-inl.h"
 
@@ -85,4 +85,4 @@ BaselineFrame::callObj() const
 
 #endif // JS_ION
 
-#endif /* ion_BaselineFrame_inl_h */
+#endif /* jit_BaselineFrame_inl_h */

js/src/jit/BaselineFrame.cpp

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

js/src/jit/BaselineFrame.h

@@ -4,15 +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/. */
 
-#ifndef ion_BaselineFrame_h
-#define ion_BaselineFrame_h
+#ifndef jit_BaselineFrame_h
+#define jit_BaselineFrame_h
 
 #ifdef JS_ION
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "ion/IonFrames.h"
+#include "jit/IonFrames.h"
 #include "vm/Stack.h"
 
 namespace js {
@@ -403,4 +403,4 @@ JS_STATIC_ASSERT(((sizeof(BaselineFrame) + BaselineFrame::FramePointerOffset) %
 
 #endif // JS_ION
 
-#endif /* ion_BaselineFrame_h */
+#endif /* jit_BaselineFrame_h */

js/src/jit/BaselineFrameInfo.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/BaselineFrameInfo.h"
+#include "jit/BaselineFrameInfo.h"
 
 #include "jsanalyze.h"
 
-#include "ion/IonSpewer.h"
-#include "ion/shared/BaselineCompiler-shared.h"
+#include "jit/IonSpewer.h"
+#include "jit/shared/BaselineCompiler-shared.h"
 
 using namespace js;
 using namespace js::ion;

js/src/jit/BaselineFrameInfo.h

@@ -4,20 +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/. */
 
-#ifndef ion_BaselineFrameInfo_h
-#define ion_BaselineFrameInfo_h
+#ifndef jit_BaselineFrameInfo_h
+#define jit_BaselineFrameInfo_h
 
 #ifdef JS_ION
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "ion/BaselineFrame.h"
-#include "ion/BaselineJIT.h"
-#include "ion/BaselineRegisters.h"
-#include "ion/BytecodeAnalysis.h"
-#include "ion/FixedList.h"
-#include "ion/IonMacroAssembler.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 ion {
@@ -333,4 +333,4 @@ class FrameInfo
 
 #endif // JS_ION
 
-#endif /* ion_BaselineFrameInfo_h */
+#endif /* jit_BaselineFrameInfo_h */

js/src/jit/BaselineHelpers.h

@@ -4,17 +4,17 @@
  * 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 ion_BaselineHelpers_h
-#define ion_BaselineHelpers_h
+#ifndef jit_BaselineHelpers_h
+#define jit_BaselineHelpers_h
 
 #ifdef JS_ION
 
 #if defined(JS_CPU_X86)
-# include "ion/x86/BaselineHelpers-x86.h"
+# include "jit/x86/BaselineHelpers-x86.h"
 #elif defined(JS_CPU_X64)
-# include "ion/x64/BaselineHelpers-x64.h"
+# include "jit/x64/BaselineHelpers-x64.h"
 #elif defined(JS_CPU_ARM)
-# include "ion/arm/BaselineHelpers-arm.h"
+# include "jit/arm/BaselineHelpers-arm.h"
 #else
 # error "Unknown architecture!"
 #endif
@@ -27,4 +27,4 @@ namespace ion {
 
 #endif // JS_ION
 
-#endif /* ion_BaselineHelpers_h */
+#endif /* jit_BaselineHelpers_h */

js/src/jit/BaselineIC.cpp

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

js/src/jit/BaselineIC.h

@@ -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/. */
 
-#ifndef ion_BaselineIC_h
-#define ion_BaselineIC_h
+#ifndef jit_BaselineIC_h
+#define jit_BaselineIC_h
 
 #ifdef JS_ION
 
@@ -16,8 +16,8 @@
 #include "jsproxy.h"
 
 #include "gc/Heap.h"
-#include "ion/BaselineJIT.h"
-#include "ion/BaselineRegisters.h"
+#include "jit/BaselineJIT.h"
+#include "jit/BaselineRegisters.h"
 
 namespace js {
 namespace ion {
@@ -5615,4 +5615,4 @@ class ICRetSub_Resume : public ICStub
 
 #endif // JS_ION
 
-#endif /* ion_BaselineIC_h */
+#endif /* jit_BaselineIC_h */

js/src/jit/BaselineInspector.cpp

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

js/src/jit/BaselineInspector.h

@@ -4,17 +4,17 @@
  * 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 ion_BaselineInspector_h
-#define ion_BaselineInspector_h
+#ifndef jit_BaselineInspector_h
+#define jit_BaselineInspector_h
 
 #ifdef JS_ION
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 
-#include "ion/BaselineIC.h"
-#include "ion/BaselineJIT.h"
-#include "ion/MIR.h"
+#include "jit/BaselineIC.h"
+#include "jit/BaselineJIT.h"
+#include "jit/MIR.h"
 
 namespace js {
 namespace ion {
@@ -116,4 +116,4 @@ class BaselineInspector
 
 #endif // JS_ION
 
-#endif /* ion_BaselineInspector_h */
+#endif /* jit_BaselineInspector_h */

js/src/jit/BaselineJIT.cpp

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

js/src/jit/BaselineJIT.h

@@ -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/. */
 
-#ifndef ion_BaselineJIT_h
-#define ion_BaselineJIT_h
+#ifndef jit_BaselineJIT_h
+#define jit_BaselineJIT_h
 
 #ifdef JS_ION
 
@@ -15,9 +15,9 @@
 #include "jscompartment.h"
 
 #include "ds/LifoAlloc.h"
-#include "ion/Bailouts.h"
-#include "ion/IonCode.h"
-#include "ion/IonMacroAssembler.h"
+#include "jit/Bailouts.h"
+#include "jit/IonCode.h"
+#include "jit/IonMacroAssembler.h"
 
 namespace js {
 namespace ion {
@@ -339,4 +339,4 @@ MarkActiveBaselineScripts(Zone *zone);
 
 #endif // JS_ION
 
-#endif /* ion_BaselineJIT_h */
+#endif /* jit_BaselineJIT_h */

js/src/jit/BaselineRegisters.h

@@ -4,17 +4,17 @@
  * 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 ion_BaselineRegisters_h
-#define ion_BaselineRegisters_h
+#ifndef jit_BaselineRegisters_h
+#define jit_BaselineRegisters_h
 
 #ifdef JS_ION
 
 #if defined(JS_CPU_X86)
-# include "ion/x86/BaselineRegisters-x86.h"
+# include "jit/x86/BaselineRegisters-x86.h"
 #elif defined(JS_CPU_X64)
-# include "ion/x64/BaselineRegisters-x64.h"
+# include "jit/x64/BaselineRegisters-x64.h"
 #else
-# include "ion/arm/BaselineRegisters-arm.h"
+# include "jit/arm/BaselineRegisters-arm.h"
 #endif
 
 namespace js {
@@ -25,4 +25,4 @@ namespace ion {
 
 #endif // JS_ION
 
-#endif /* ion_BaselineRegisters_h */
+#endif /* jit_BaselineRegisters_h */

js/src/jit/BitSet.cpp

@@ -4,7 +4,7 @@
  * 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/BitSet.h"
+#include "jit/BitSet.h"
 
 #include "jsutil.h"
 

js/src/jit/BitSet.h

@@ -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/. */
 
-#ifndef ion_BitSet_h
-#define ion_BitSet_h
+#ifndef jit_BitSet_h
+#define jit_BitSet_h
 
 #include "mozilla/MathAlgorithms.h"
 
-#include "ion/IonAllocPolicy.h"
+#include "jit/IonAllocPolicy.h"
 
 namespace js {
 namespace ion {
@@ -171,4 +171,4 @@ class BitSet::Iterator
 }
 }
 
-#endif /* ion_BitSet_h */
+#endif /* jit_BitSet_h */

js/src/jit/BytecodeAnalysis.cpp

@@ -4,7 +4,7 @@
  * 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/BytecodeAnalysis.h"
+#include "jit/BytecodeAnalysis.h"
 
 #include "jsopcode.h"
 

js/src/jit/BytecodeAnalysis.h

@@ -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/. */
 
-#ifndef ion_BytecodeAnalysis_h
-#define ion_BytecodeAnalysis_h
+#ifndef jit_BytecodeAnalysis_h
+#define jit_BytecodeAnalysis_h
 
 #include "jscntxt.h"
 
-#include "ion/IonAllocPolicy.h"
+#include "jit/IonAllocPolicy.h"
 #include "js/Vector.h"
 
 namespace js {
@@ -62,4 +62,4 @@ class BytecodeAnalysis
 } // namespace ion
 } // namespace js
 
-#endif /* ion_BytecodeAnalysis_h */
+#endif /* jit_BytecodeAnalysis_h */

js/src/jit/C1Spewer.cpp

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

js/src/jit/C1Spewer.h

@@ -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/. */
 
-#ifndef ion_C1Spewer_h
-#define ion_C1Spewer_h
+#ifndef jit_C1Spewer_h
+#define jit_C1Spewer_h
 
 #ifdef DEBUG
 
@@ -52,4 +52,4 @@ class C1Spewer
 
 #endif /* DEBUG */
 
-#endif /* ion_C1Spewer_h */
+#endif /* jit_C1Spewer_h */

js/src/jit/CodeGenerator.cpp

@@ -4,7 +4,7 @@
  * 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 "jit/CodeGenerator.h"
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -16,19 +16,19 @@
 
 #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/MoveEmitter.h"
-#include "ion/ParallelFunctions.h"
-#include "ion/ParallelSafetyAnalysis.h"
-#include "ion/PerfSpewer.h"
+#include "jit/ExecutionModeInlines.h"
+#include "jit/IonLinker.h"
+#include "jit/IonSpewer.h"
+#include "jit/MIRGenerator.h"
+#include "jit/MoveEmitter.h"
+#include "jit/ParallelFunctions.h"
+#include "jit/ParallelSafetyAnalysis.h"
+#include "jit/PerfSpewer.h"
 #include "vm/ForkJoin.h"
 
 #include "jsboolinlines.h"
 
-#include "ion/shared/CodeGenerator-shared-inl.h"
+#include "jit/shared/CodeGenerator-shared-inl.h"
 #include "vm/Interpreter-inl.h"
 
 using namespace js;

js/src/jit/CodeGenerator.h

@@ -4,17 +4,17 @@
  * 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 ion_CodeGenerator_h
-#define ion_CodeGenerator_h
+#ifndef jit_CodeGenerator_h
+#define jit_CodeGenerator_h
 
-#include "ion/PerfSpewer.h"
+#include "jit/PerfSpewer.h"
 
 #if defined(JS_CPU_X86)
-# include "ion/x86/CodeGenerator-x86.h"
+# include "jit/x86/CodeGenerator-x86.h"
 #elif defined(JS_CPU_X64)
-# include "ion/x64/CodeGenerator-x64.h"
+# include "jit/x64/CodeGenerator-x64.h"
 #elif defined(JS_CPU_ARM)
-# include "ion/arm/CodeGenerator-arm.h"
+# include "jit/arm/CodeGenerator-arm.h"
 #else
 #error "CPU Not Supported"
 #endif
@@ -355,4 +355,4 @@ class CodeGenerator : public CodeGeneratorSpecific
 } // namespace ion
 } // namespace js
 
-#endif /* ion_CodeGenerator_h */
+#endif /* jit_CodeGenerator_h */

js/src/jit/CompactBuffer.h

@@ -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/. */
 
-#ifndef ion_Compactbuffer_h
-#define ion_Compactbuffer_h
+#ifndef jit_Compactbuffer_h
+#define jit_Compactbuffer_h
 
 #include "jsalloc.h"
 
-#include "ion/IonTypes.h"
+#include "jit/IonTypes.h"
 #include "js/Vector.h"
 
 namespace js {
@@ -157,4 +157,4 @@ CompactBufferReader::CompactBufferReader(const CompactBufferWriter &writer)
 } // namespace ion
 } // namespace js
 
-#endif /* ion_Compactbuffer_h */
+#endif /* jit_Compactbuffer_h */

js/src/jit/CompileInfo-inl.h

@@ -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/. */
 
-#ifndef ion_CompileInfo_inl_h
-#define ion_CompileInfo_inl_h
+#ifndef jit_CompileInfo_inl_h
+#define jit_CompileInfo_inl_h
 
-#include "ion/CompileInfo.h"
+#include "jit/CompileInfo.h"
 
 #include "jsscriptinlines.h"
 
@@ -26,4 +26,4 @@ CompileInfo::getFunction(jsbytecode *pc) const
     return script_->getFunction(GET_UINT32_INDEX(pc));
 }
 
-#endif /* ion_CompileInfo_inl_h */
+#endif /* jit_CompileInfo_inl_h */

js/src/jit/CompileInfo.h

@@ -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/. */
 
-#ifndef ion_CompileInfo_h
-#define ion_CompileInfo_h
+#ifndef jit_CompileInfo_h
+#define jit_CompileInfo_h
 
 #include "jsfun.h"
 
-#include "ion/Registers.h"
+#include "jit/Registers.h"
 
 namespace js {
 namespace ion {
@@ -243,4 +243,4 @@ class CompileInfo
 } // namespace ion
 } // namespace js
 
-#endif /* ion_CompileInfo_h */
+#endif /* jit_CompileInfo_h */

js/src/jit/CompilerRoot.h

@@ -4,15 +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/. */
 
-#ifndef ion_CompilerRoot_h
-#define ion_CompilerRoot_h
+#ifndef jit_CompilerRoot_h
+#define jit_CompilerRoot_h
 
 #ifdef JS_ION
 
 #include "jscntxt.h"
 
-#include "ion/Ion.h"
-#include "ion/IonAllocPolicy.h"
+#include "jit/Ion.h"
+#include "jit/IonAllocPolicy.h"
 #include "js/RootingAPI.h"
 
 namespace js {
@@ -67,4 +67,4 @@ typedef CompilerRoot<Value> CompilerRootValue;
 
 #endif // JS_ION
 
-#endif /* ion_CompilerRoot_h */
+#endif /* jit_CompilerRoot_h */

js/src/jit/EdgeCaseAnalysis.cpp

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

js/src/jit/EdgeCaseAnalysis.h

@@ -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/. */
 
-#ifndef ion_EdgeCaseAnalysis_h
-#define ion_EdgeCaseAnalysis_h
+#ifndef jit_EdgeCaseAnalysis_h
+#define jit_EdgeCaseAnalysis_h
 
-#include "ion/MIRGenerator.h"
+#include "jit/MIRGenerator.h"
 
 namespace js {
 namespace ion {
@@ -28,4 +28,4 @@ class EdgeCaseAnalysis
 } // namespace ion
 } // namespace js
 
-#endif /* ion_EdgeCaseAnalysis_h */
+#endif /* jit_EdgeCaseAnalysis_h */

js/src/jit/EffectiveAddressAnalysis.cpp

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

js/src/jit/EffectiveAddressAnalysis.h

@@ -4,11 +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/. */
 
-#ifndef ion_EffectiveAddressAnalysis_h
-#define ion_EffectiveAddressAnalysis_h
+#ifndef jit_EffectiveAddressAnalysis_h
+#define jit_EffectiveAddressAnalysis_h
 
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
+#include "jit/MIR.h"
+#include "jit/MIRGraph.h"
 
 namespace js {
 namespace ion {
@@ -28,4 +28,4 @@ class EffectiveAddressAnalysis
 } /* namespace ion */
 } /* namespace js */
 
-#endif /* ion_EffectiveAddressAnalysis_h */
+#endif /* jit_EffectiveAddressAnalysis_h */

js/src/jit/ExecutionModeInlines.h

@@ -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/. */
 
-#ifndef ion_ExecutionModeInlines_h
-#define ion_ExecutionModeInlines_h
+#ifndef jit_ExecutionModeInlines_h
+#define jit_ExecutionModeInlines_h
 
 #ifdef JS_ION
 
-#include "ion/CompileInfo.h"
+#include "jit/CompileInfo.h"
 
 namespace js {
 namespace ion {
@@ -106,4 +106,4 @@ CompilerOutputKind(ExecutionMode cmode)
 
 #endif  // JS_ION
 
-#endif /* ion_ExecutionModeInlines_h */
+#endif /* jit_ExecutionModeInlines_h */

js/src/jit/FixedList.h

@@ -4,13 +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/. */
 
-#ifndef ion_FixedList_h
-#define ion_FixedList_h
+#ifndef jit_FixedList_h
+#define jit_FixedList_h
 
 #include <stddef.h>
 
-#include "ion/Ion.h"
-#include "ion/IonAllocPolicy.h"
+#include "jit/Ion.h"
+#include "jit/IonAllocPolicy.h"
 
 namespace js {
 namespace ion {
@@ -76,4 +76,4 @@ class FixedList
 } // namespace ion
 } // namespace js
 
-#endif /* ion_FixedList_h */
+#endif /* jit_FixedList_h */

js/src/jit/InlineList.h

@@ -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/. */
 
-#ifndef ion_InlineList_h
-#define ion_InlineList_h
+#ifndef jit_InlineList_h
+#define jit_InlineList_h
 
 #include "mozilla/DebugOnly.h"
 
@@ -392,4 +392,4 @@ class InlineListReverseIterator
 
 } // namespace js
 
-#endif /* ion_InlineList_h */
+#endif /* jit_InlineList_h */

js/src/jit/Ion.cpp

@@ -4,7 +4,7 @@
  * 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 "jit/Ion.h"
 
 #include "mozilla/MemoryReporting.h"
 
@@ -15,37 +15,37 @@
 #endif
 
 #include "gc/Marking.h"
-#include "ion/AsmJSModule.h"
-#include "ion/AliasAnalysis.h"
-#include "ion/BacktrackingAllocator.h"
-#include "ion/BaselineCompiler.h"
-#include "ion/BaselineInspector.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/LICM.h"
-#include "ion/LinearScan.h"
-#include "ion/LIR.h"
-#include "ion/ParallelSafetyAnalysis.h"
-#include "ion/PerfSpewer.h"
-#include "ion/RangeAnalysis.h"
-#include "ion/StupidAllocator.h"
-#include "ion/UnreachableCodeElimination.h"
-#include "ion/ValueNumbering.h"
+#include "jit/AsmJSModule.h"
+#include "jit/AliasAnalysis.h"
+#include "jit/BacktrackingAllocator.h"
+#include "jit/BaselineCompiler.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/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 "ion/x86/Lowering-x86.h"
+# include "jit/x86/Lowering-x86.h"
 #elif defined(JS_CPU_X64)
-# include "ion/x64/Lowering-x64.h"
+# include "jit/x64/Lowering-x64.h"
 #elif defined(JS_CPU_ARM)
-# include "ion/arm/Lowering-arm.h"
+# include "jit/arm/Lowering-arm.h"
 #endif
 #include "vm/ForkJoin.h"
 #include "vm/ThreadPool.h"

js/src/jit/Ion.h

@@ -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/. */
 
-#ifndef ion_Ion_h
-#define ion_Ion_h
+#ifndef jit_Ion_h
+#define jit_Ion_h
 
 #ifdef JS_ION
 
@@ -15,8 +15,8 @@
 #include "jscompartment.h"
 #include "jsinfer.h"
 
-#include "ion/CompileInfo.h"
-#include "ion/IonCode.h"
+#include "jit/CompileInfo.h"
+#include "jit/IonCode.h"
 #include "vm/Interpreter.h"
 
 namespace js {
@@ -379,4 +379,4 @@ void TraceIonScripts(JSTracer* trc, JSScript *script);
 
 #endif // JS_ION
 
-#endif /* ion_Ion_h */
+#endif /* jit_Ion_h */

js/src/jit/IonAllocPolicy.h

@@ -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/. */
 
-#ifndef ion_IonAllocPolicy_h
-#define ion_IonAllocPolicy_h
+#ifndef jit_IonAllocPolicy_h
+#define jit_IonAllocPolicy_h
 
 #include "mozilla/GuardObjects.h"
 
 #include "jscntxt.h"
 
 #include "ds/LifoAlloc.h"
-#include "ion/InlineList.h"
-#include "ion/Ion.h"
+#include "jit/InlineList.h"
+#include "jit/Ion.h"
 
 namespace js {
 namespace ion {
@@ -161,4 +161,4 @@ class TempObjectPool
 } // namespace ion
 } // namespace js
 
-#endif /* ion_IonAllocPolicy_h */
+#endif /* jit_IonAllocPolicy_h */

js/src/jit/IonAnalysis.cpp

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

js/src/jit/IonAnalysis.h

@@ -4,13 +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/. */
 
-#ifndef ion_IonAnalysis_h
-#define ion_IonAnalysis_h
+#ifndef jit_IonAnalysis_h
+#define jit_IonAnalysis_h
 
 // This file declares various analysis passes that operate on MIR.
 
-#include "ion/IonAllocPolicy.h"
-#include "ion/MIR.h"
+#include "jit/IonAllocPolicy.h"
+#include "jit/MIR.h"
 
 namespace js {
 namespace ion {
@@ -127,4 +127,4 @@ class LinearSum
 } // namespace ion
 } // namespace js
 
-#endif /* ion_IonAnalysis_h */
+#endif /* jit_IonAnalysis_h */

js/src/jit/IonBuilder.cpp

@@ -4,26 +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/. */
 
-#include "ion/IonBuilder.h"
+#include "jit/IonBuilder.h"
 
 #include "mozilla/DebugOnly.h"
 
 #include "builtin/Eval.h"
 #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/IonSpewer.h"
-#include "ion/Lowering.h"
-#include "ion/MIRGraph.h"
+#include "jit/BaselineFrame.h"
+#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"
 
 #include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
-#include "ion/CompileInfo-inl.h"
+#include "jit/CompileInfo-inl.h"
 
 using namespace js;
 using namespace js::ion;

js/src/jit/IonBuilder.h

@@ -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/. */
 
-#ifndef ion_IonBuilder_h
-#define ion_IonBuilder_h
+#ifndef jit_IonBuilder_h
+#define jit_IonBuilder_h
 
 #ifdef JS_ION
 
 // This file declares the data structures for building a MIRGraph from a
 // JSScript.
 
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
+#include "jit/MIR.h"
+#include "jit/MIRGraph.h"
 
 namespace js {
 namespace ion {
@@ -833,4 +833,4 @@ bool NeedsPostBarrier(CompileInfo &info, MDefinition *value);
 
 #endif // JS_ION
 
-#endif /* ion_IonBuilder_h */
+#endif /* jit_IonBuilder_h */

js/src/jit/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 "jit/IonCaches.h"
 
 #include "mozilla/DebugOnly.h"
 
-#include "ion/CodeGenerator.h"
-#include "ion/Ion.h"
-#include "ion/IonLinker.h"
-#include "ion/IonSpewer.h"
-#include "ion/PerfSpewer.h"
-#include "ion/VMFunctions.h"
+#include "jit/CodeGenerator.h"
+#include "jit/Ion.h"
+#include "jit/IonLinker.h"
+#include "jit/IonSpewer.h"
+#include "jit/PerfSpewer.h"
+#include "jit/VMFunctions.h"
 #include "vm/Shape.h"
 
 #include "vm/Interpreter-inl.h"

js/src/jit/IonCaches.h

@@ -4,15 +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/. */
 
-#ifndef ion_IonCaches_h
-#define ion_IonCaches_h
+#ifndef jit_IonCaches_h
+#define jit_IonCaches_h
 
 #ifdef JS_CPU_ARM
-# include "ion/arm/Assembler-arm.h"
+# include "jit/arm/Assembler-arm.h"
 #endif
-#include "ion/IonCode.h"
-#include "ion/Registers.h"
-#include "ion/shared/Assembler-shared.h"
+#include "jit/IonCode.h"
+#include "jit/Registers.h"
+#include "jit/shared/Assembler-shared.h"
 #include "vm/ForkJoin.h"
 
 class JSFunction;
@@ -1028,4 +1028,4 @@ IONCACHE_KIND_LIST(CACHE_CASTS)
 } // namespace ion
 } // namespace js
 
-#endif /* ion_IonCaches_h */
+#endif /* jit_IonCaches_h */

js/src/jit/IonCode.h

@@ -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/. */
 
-#ifndef ion_IonCode_h
-#define ion_IonCode_h
+#ifndef jit_IonCode_h
+#define jit_IonCode_h
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
@@ -13,7 +13,7 @@
 #include "jsinfer.h"
 
 #include "gc/Heap.h"
-#include "ion/IonTypes.h"
+#include "jit/IonTypes.h"
 
 namespace JSC {
     class ExecutablePool;
@@ -749,4 +749,4 @@ IsMarked(const ion::VMFunction *)
 
 } // namespace js
 
-#endif /* ion_IonCode_h */
+#endif /* jit_IonCode_h */

js/src/jit/IonCompartment.h

@@ -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/. */
 
-#ifndef ion_IonCompartment_h
-#define ion_IonCompartment_h
+#ifndef jit_IonCompartment_h
+#define jit_IonCompartment_h
 
 #ifdef JS_ION
 
@@ -13,9 +13,9 @@
 
 #include "jsweakcache.h"
 
-#include "ion/CompileInfo.h"
-#include "ion/IonCode.h"
-#include "ion/IonFrames.h"
+#include "jit/CompileInfo.h"
+#include "jit/IonCode.h"
+#include "jit/IonFrames.h"
 #include "js/Value.h"
 #include "vm/Stack.h"
 
@@ -380,4 +380,4 @@ void FinishInvalidation(FreeOp *fop, JSScript *script);
 
 #endif // JS_ION
 
-#endif /* ion_IonCompartment_h */
+#endif /* jit_IonCompartment_h */

js/src/jit/IonFrameIterator-inl.h

@@ -4,15 +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/. */
 
-#ifndef ion_IonFrameIterator_inl_h
-#define ion_IonFrameIterator_inl_h
+#ifndef jit_IonFrameIterator_inl_h
+#define jit_IonFrameIterator_inl_h
 
 #ifdef JS_ION
 
-#include "ion/IonFrameIterator.h"
+#include "jit/IonFrameIterator.h"
 
-#include "ion/Bailouts.h"
-#include "ion/BaselineFrame.h"
+#include "jit/Bailouts.h"
+#include "jit/BaselineFrame.h"
 
 namespace js {
 namespace ion {
@@ -44,4 +44,4 @@ IonFrameIterator::baselineFrame() const
 
 #endif // JS_ION
 
-#endif /* ion_IonFrameIterator_inl_h */
+#endif /* jit_IonFrameIterator_inl_h */

js/src/jit/IonFrameIterator.h

@@ -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/. */
 
-#ifndef ion_IonFrameIterator_h
-#define ion_IonFrameIterator_h
+#ifndef jit_IonFrameIterator_h
+#define jit_IonFrameIterator_h
 
 #ifdef JS_ION
 
 #include "jsscript.h"
 #include "jstypes.h"
 
-#include "ion/IonCode.h"
-#include "ion/SnapshotReader.h"
+#include "jit/IonCode.h"
+#include "jit/SnapshotReader.h"
 
 namespace js {
     class ActivationIterator;
@@ -501,4 +501,4 @@ typedef InlineFrameIteratorMaybeGC<NoGC> InlineFrameIteratorNoGC;
 
 #endif // JS_ION
 
-#endif /* ion_IonFrameIterator_h */
+#endif /* jit_IonFrameIterator_h */

js/src/jit/IonFrames-inl.h

@@ -4,17 +4,17 @@
  * 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 ion_IonFrames_inl_h
-#define ion_IonFrames_inl_h
+#ifndef jit_IonFrames_inl_h
+#define jit_IonFrames_inl_h
 
 #ifdef JS_ION
 
-#include "ion/IonFrames.h"
+#include "jit/IonFrames.h"
 
-#include "ion/IonFrameIterator.h"
-#include "ion/LIR.h"
+#include "jit/IonFrameIterator.h"
+#include "jit/LIR.h"
 
-#include "ion/IonFrameIterator-inl.h"
+#include "jit/IonFrameIterator-inl.h"
 
 namespace js {
 namespace ion {
@@ -83,4 +83,4 @@ GetTopBaselineFrame(JSContext *cx)
 
 #endif // JS_ION
 
-#endif /* ion_IonFrames_inl_h */
+#endif /* jit_IonFrames_inl_h */

js/src/jit/IonFrames.cpp

@@ -4,28 +4,28 @@
  * 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-inl.h"
+#include "jit/IonFrames-inl.h"
 
 #include "jsfun.h"
 #include "jsobj.h"
 #include "jsscript.h"
 
 #include "gc/Marking.h"
-#include "ion/BaselineFrame.h"
-#include "ion/BaselineIC.h"
-#include "ion/BaselineJIT.h"
-#include "ion/Ion.h"
-#include "ion/IonCompartment.h"
-#include "ion/IonMacroAssembler.h"
-#include "ion/IonSpewer.h"
-#include "ion/PcScriptCache.h"
-#include "ion/Safepoints.h"
-#include "ion/SnapshotReader.h"
-#include "ion/VMFunctions.h"
+#include "jit/BaselineFrame.h"
+#include "jit/BaselineIC.h"
+#include "jit/BaselineJIT.h"
+#include "jit/Ion.h"
+#include "jit/IonCompartment.h"
+#include "jit/IonMacroAssembler.h"
+#include "jit/IonSpewer.h"
+#include "jit/PcScriptCache.h"
+#include "jit/Safepoints.h"
+#include "jit/SnapshotReader.h"
+#include "jit/VMFunctions.h"
 
 #include "jsfuninlines.h"
 
-#include "ion/IonFrameIterator-inl.h"
+#include "jit/IonFrameIterator-inl.h"
 #include "vm/Probes-inl.h"
 
 namespace js {

js/src/jit/IonFrames.h

@@ -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/. */
 
-#ifndef ion_IonFrames_h
-#define ion_IonFrames_h
+#ifndef jit_IonFrames_h
+#define jit_IonFrames_h
 
 #ifdef JS_ION
 
@@ -16,9 +16,9 @@
 #include "jstypes.h"
 #include "jsutil.h"
 
-#include "ion/IonCode.h"
-#include "ion/IonFrameIterator.h"
-#include "ion/Registers.h"
+#include "jit/IonCode.h"
+#include "jit/IonFrameIterator.h"
+#include "jit/Registers.h"
 
 class JSFunction;
 class JSScript;
@@ -326,9 +326,9 @@ GetTopIonJSScript(JSContext *cx, const SafepointIndex **safepointIndexOut, void
 } // namespace js
 
 #if defined(JS_CPU_X86) || defined (JS_CPU_X64)
-# include "ion/shared/IonFrames-x86-shared.h"
+# include "jit/shared/IonFrames-x86-shared.h"
 #elif defined (JS_CPU_ARM)
-# include "ion/arm/IonFrames-arm.h"
+# include "jit/arm/IonFrames-arm.h"
 #else
 # error "unsupported architecture"
 #endif
@@ -375,4 +375,4 @@ MarkCalleeToken(JSTracer *trc, CalleeToken token);
 
 #endif // JS_ION
 
-#endif /* ion_IonFrames_h */
+#endif /* jit_IonFrames_h */

js/src/jit/IonInstrumentation.h

@@ -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/. */
 
-#ifndef ion_IonInstrumentation_h
-#define ion_IonInstrumentation_h
+#ifndef jit_IonInstrumentatjit_h
+#define jit_IonInstrumentatjit_h
 
 namespace js {
 
@@ -37,4 +37,4 @@ class IonInstrumentation : public BaseInstrumentation
 } // namespace ion
 } // namespace js
 
-#endif /* ion_IonInstrumentation_h */
+#endif /* jit_IonInstrumentatjit_h */

js/src/jit/IonLinker.h

@@ -4,17 +4,17 @@
  * 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 ion_IonLinker_h
-#define ion_IonLinker_h
+#ifndef jit_IonLinker_h
+#define jit_IonLinker_h
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsgc.h"
 
 #include "assembler/jit/ExecutableAllocator.h"
-#include "ion/IonCode.h"
-#include "ion/IonCompartment.h"
-#include "ion/IonMacroAssembler.h"
+#include "jit/IonCode.h"
+#include "jit/IonCompartment.h"
+#include "jit/IonMacroAssembler.h"
 
 namespace js {
 namespace ion {
@@ -81,4 +81,4 @@ class Linker
 } // namespace ion
 } // namespace js
 
-#endif /* ion_IonLinker_h */
+#endif /* jit_IonLinker_h */

js/src/jit/IonMacroAssembler.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/IonMacroAssembler.h"
+#include "jit/IonMacroAssembler.h"
 
 #include "jsinfer.h"
 
-#include "ion/Bailouts.h"
-#include "ion/BaselineFrame.h"
-#include "ion/BaselineIC.h"
-#include "ion/BaselineJIT.h"
-#include "ion/BaselineRegisters.h"
-#include "ion/MIR.h"
+#include "jit/Bailouts.h"
+#include "jit/BaselineFrame.h"
+#include "jit/BaselineIC.h"
+#include "jit/BaselineJIT.h"
+#include "jit/BaselineRegisters.h"
+#include "jit/MIR.h"
 #include "js/RootingAPI.h"
 #include "vm/ForkJoin.h"
 

js/src/jit/IonMacroAssembler.h

@@ -4,24 +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/. */
 
-#ifndef ion_IonMacroAssembler_h
-#define ion_IonMacroAssembler_h
+#ifndef jit_IonMacroAssembler_h
+#define jit_IonMacroAssembler_h
 
 #ifdef JS_ION
 
 #include "jscompartment.h"
 
 #if defined(JS_CPU_X86)
-# include "ion/x86/MacroAssembler-x86.h"
+# include "jit/x86/MacroAssembler-x86.h"
 #elif defined(JS_CPU_X64)
-# include "ion/x64/MacroAssembler-x64.h"
+# include "jit/x64/MacroAssembler-x64.h"
 #elif defined(JS_CPU_ARM)
-# include "ion/arm/MacroAssembler-arm.h"
+# include "jit/arm/MacroAssembler-arm.h"
 #endif
-#include "ion/IonCompartment.h"
-#include "ion/IonInstrumentation.h"
-#include "ion/ParallelFunctions.h"
-#include "ion/VMFunctions.h"
+#include "jit/IonCompartment.h"
+#include "jit/IonInstrumentation.h"
+#include "jit/ParallelFunctions.h"
+#include "jit/VMFunctions.h"
 #include "vm/ForkJoin.h"
 #include "vm/ProxyObject.h"
 #include "vm/Shape.h"
@@ -1051,4 +1051,4 @@ JSOpToCondition(JSOp op, bool isSigned)
 
 #endif // JS_ION
 
-#endif /* ion_IonMacroAssembler_h */
+#endif /* jit_IonMacroAssembler_h */

js/src/jit/IonSpewer.cpp

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

js/src/jit/IonSpewer.h

@@ -4,15 +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/. */
 
-#ifndef ion_IonSpewer_h
-#define ion_IonSpewer_h
+#ifndef jit_IonSpewer_h
+#define jit_IonSpewer_h
 
 #include "mozilla/DebugOnly.h"
 
 #include <stdarg.h>
 
-#include "ion/C1Spewer.h"
-#include "ion/JSONSpewer.h"
+#include "jit/C1Spewer.h"
+#include "jit/JSONSpewer.h"
 
 namespace js {
 namespace ion {
@@ -199,4 +199,4 @@ class AutoDisableSpew
 } /* ion */
 } /* js */
 
-#endif /* ion_IonSpewer_h */
+#endif /* jit_IonSpewer_h */

js/src/jit/IonTypes.h

@@ -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/. */
 
-#ifndef ion_IonTypes_h
-#define ion_IonTypes_h
+#ifndef jit_IonTypes_h
+#define jit_IonTypes_h
 
 #include "jstypes.h"
 
@@ -209,4 +209,4 @@ IsNullOrUndefined(MIRType type)
 } // namespace ion
 } // namespace js
 
-#endif /* ion_IonTypes_h */
+#endif /* jit_IonTypes_h */

js/src/jit/JSONSpewer.cpp

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

js/src/jit/JSONSpewer.h

@@ -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/. */
 
-#ifndef ion_JSONSpewer_h
-#define ion_JSONSpewer_h
+#ifndef jit_JSONSpewer_h
+#define jit_JSONSpewer_h
 
 #include <stdio.h>
 
@@ -76,4 +76,4 @@ class JSONSpewer
 } // namespace ion
 } // namespace js
 
-#endif /* ion_JSONSpewer_h */
+#endif /* jit_JSONSpewer_h */

js/src/jit/LICM.cpp

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

js/src/jit/LICM.h

@@ -4,13 +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/. */
 
-#ifndef ion_LICM_h
-#define ion_LICM_h
+#ifndef jit_LICM_h
+#define jit_LICM_h
 
-#include "ion/IonAllocPolicy.h"
-#include "ion/IonAnalysis.h"
-#include "ion/MIR.h"
-#include "ion/MIRGraph.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
 
@@ -30,4 +30,4 @@ class LICM
 } // namespace ion
 } // namespace js
 
-#endif /* ion_LICM_h */
+#endif /* jit_LICM_h */

js/src/jit/LIR-Common.h

@@ -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/. */
 
-#ifndef ion_LIR_Common_h
-#define ion_LIR_Common_h
+#ifndef jit_LIR_Common_h
+#define jit_LIR_Common_h
 
-#include "ion/shared/Assembler-shared.h"
+#include "jit/shared/Assembler-shared.h"
 
 // This file declares LIR instructions that are common to every platform.
 
@@ -4939,4 +4939,4 @@ class LAsmJSCheckOverRecursed : public LInstructionHelper<0, 0, 0>
 } // namespace ion
 } // namespace js
 
-#endif /* ion_LIR_Common_h */
+#endif /* jit_LIR_Common_h */

js/src/jit/LIR.cpp

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

js/src/jit/LIR.h

@@ -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/. */
 
-#ifndef ion_LIR_h
-#define ion_LIR_h
+#ifndef jit_LIR_h
+#define jit_LIR_h
 
 // This file declares the core data structures for LIR: storage allocations for
 // inputs and outputs, as well as the interface instructions must conform to.
@@ -14,16 +14,16 @@
 
 #include "jscntxt.h"
 
-#include "ion/Bailouts.h"
-#include "ion/InlineList.h"
-#include "ion/IonAllocPolicy.h"
-#include "ion/LOpcodes.h"
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
-#include "ion/Registers.h"
-#include "ion/Safepoints.h"
-#include "ion/shared/Assembler-shared.h"
-#include "ion/VMFunctions.h"
+#include "jit/Bailouts.h"
+#include "jit/InlineList.h"
+#include "jit/IonAllocPolicy.h"
+#include "jit/LOpcodes.h"
+#include "jit/MIR.h"
+#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 ion {
@@ -1472,16 +1472,16 @@ LAllocation::toRegister() const
     }
 #endif
 
-#include "ion/LIR-Common.h"
+#include "jit/LIR-Common.h"
 #if defined(JS_CPU_X86) || defined(JS_CPU_X64)
 # if defined(JS_CPU_X86)
-#  include "ion/x86/LIR-x86.h"
+#  include "jit/x86/LIR-x86.h"
 # elif defined(JS_CPU_X64)
-#  include "ion/x64/LIR-x64.h"
+#  include "jit/x64/LIR-x64.h"
 # endif
-# include "ion/shared/LIR-x86-shared.h"
+# include "jit/shared/LIR-x86-shared.h"
 #elif defined(JS_CPU_ARM)
-# include "ion/arm/LIR-arm.h"
+# include "jit/arm/LIR-arm.h"
 #endif
 
 #undef LIR_HEADER
@@ -1559,4 +1559,4 @@ BaseOfNunboxSlot(LDefinition::Type type, unsigned slot)
 } // namespace ion
 } // namespace js
 
-#endif /* ion_LIR_h */
+#endif /* jit_LIR_h */

js/src/jit/LOpcodes.h

@@ -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/. */
 
-#ifndef ion_LOpcodes_h
-#define ion_LOpcodes_h
+#ifndef jit_LOpcodes_h
+#define jit_LOpcodes_h
 
 #define LIR_COMMON_OPCODE_LIST(_)   \
     _(Label)                        \
@@ -249,15 +249,15 @@
     _(CheckInterruptPar)
 
 #if defined(JS_CPU_X86)
-# include "ion/x86/LOpcodes-x86.h"
+# include "jit/x86/LOpcodes-x86.h"
 #elif defined(JS_CPU_X64)
-# include "ion/x64/LOpcodes-x64.h"
+# include "jit/x64/LOpcodes-x64.h"
 #elif defined(JS_CPU_ARM)
-# include "ion/arm/LOpcodes-arm.h"
+# include "jit/arm/LOpcodes-arm.h"
 #endif
 
 #define LIR_OPCODE_LIST(_)          \
     LIR_COMMON_OPCODE_LIST(_)       \
     LIR_CPU_OPCODE_LIST(_)
 
-#endif /* ion_LOpcodes_h */
+#endif /* jit_LOpcodes_h */

js/src/jit/LinearScan.cpp

@@ -4,15 +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/LinearScan.h"
+#include "jit/LinearScan.h"
 
 #include "mozilla/DebugOnly.h"
 
 #include <limits.h>
 
-#include "ion/BitSet.h"
-#include "ion/IonBuilder.h"
-#include "ion/IonSpewer.h"
+#include "jit/BitSet.h"
+#include "jit/IonBuilder.h"
+#include "jit/IonSpewer.h"
 
 using namespace js;
 using namespace js::ion;

js/src/jit/LinearScan.h

@@ -4,11 +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/. */
 
-#ifndef ion_LinearScan_h
-#define ion_LinearScan_h
+#ifndef jit_LinearScan_h
+#define jit_LinearScan_h
 
-#include "ion/BitSet.h"
-#include "ion/LiveRangeAllocator.h"
+#include "jit/BitSet.h"
+#include "jit/LiveRangeAllocator.h"
 #include "js/Vector.h"
 
 namespace js {
@@ -133,4 +133,4 @@ class LinearScanAllocator : public LiveRangeAllocator<LinearScanVirtualRegister>
 } // namespace ion
 } // namespace js
 
-#endif /* ion_LinearScan_h */
+#endif /* jit_LinearScan_h */

js/src/jit/LiveRangeAllocator.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/LiveRangeAllocator.h"
+#include "jit/LiveRangeAllocator.h"
 
 #include "mozilla/DebugOnly.h"
 
-#include "ion/BacktrackingAllocator.h"
-#include "ion/LinearScan.h"
+#include "jit/BacktrackingAllocator.h"
+#include "jit/LinearScan.h"
 
 using namespace js;
 using namespace js::ion;

js/src/jit/LiveRangeAllocator.h

@@ -4,14 +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/. */
 
-#ifndef ion_LiveRangeAllocator_h
-#define ion_LiveRangeAllocator_h
+#ifndef jit_LiveRangeAllocator_h
+#define jit_LiveRangeAllocator_h
 
 #include "mozilla/Array.h"
 #include "mozilla/DebugOnly.h"
 
-#include "ion/RegisterAllocator.h"
-#include "ion/StackSlotAllocator.h"
+#include "jit/RegisterAllocator.h"
+#include "jit/StackSlotAllocator.h"
 
 // Common structures and functions used by register allocators that operate on
 // virtual register live ranges.
@@ -644,4 +644,4 @@ class LiveRangeAllocator : public RegisterAllocator
 } // namespace ion
 } // namespace js
 
-#endif /* ion_LiveRangeAllocator_h */
+#endif /* jit_LiveRangeAllocator_h */

js/src/jit/Lowering.cpp

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

js/src/jit/Lowering.h

@@ -4,21 +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/. */
 
-#ifndef ion_Lowering_h
-#define ion_Lowering_h
+#ifndef jit_Lowering_h
+#define jit_Lowering_h
 
 // This file declares the structures that are used for attaching LIR to a
 // MIRGraph.
 
-#include "ion/IonAllocPolicy.h"
-#include "ion/LIR.h"
-#include "ion/MOpcodes.h"
+#include "jit/IonAllocPolicy.h"
+#include "jit/LIR.h"
+#include "jit/MOpcodes.h"
 #if defined(JS_CPU_X86)
-# include "ion/x86/Lowering-x86.h"
+# include "jit/x86/Lowering-x86.h"
 #elif defined(JS_CPU_X64)
-# include "ion/x64/Lowering-x64.h"
+# include "jit/x64/Lowering-x64.h"
 #elif defined(JS_CPU_ARM)
-# include "ion/arm/Lowering-arm.h"
+# include "jit/arm/Lowering-arm.h"
 #else
 # error "CPU!"
 #endif
@@ -253,4 +253,4 @@ class LIRGenerator : public LIRGeneratorSpecific
 } // namespace ion
 } // namespace js
 
-#endif /* ion_Lowering_h */
+#endif /* jit_Lowering_h */

js/src/jit/MCallOptimize.cpp

@@ -9,9 +9,9 @@
 
 #include "builtin/ParallelArray.h"
 #include "builtin/TestingFunctions.h"
-#include "ion/IonBuilder.h"
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
+#include "jit/IonBuilder.h"
+#include "jit/MIR.h"
+#include "jit/MIRGraph.h"
 
 #include "jsscriptinlines.h"