Backed out changeset df8423fdcad8 (bug 888088) for possible premaorange crash

js/src/ion/arm/Architecture-arm.cpp

@@ -4,17 +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/arm/Architecture-arm.h"
-
+#define HWCAP_ARMv7 (1 << 31)
 #include "mozilla/StandardInteger.h"
 
-#include <elf.h>
-#include <fcntl.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <unistd.h>
-
-#define HWCAP_ARMv7 (1 << 31)
+#include <elf.h>
 
 // lame check for kernel version
 // see bug 586550
@@ -30,7 +27,8 @@
 #define HWCAP_NEON     (1<<6)
 #define HWCAP_ARMv7    (1<<7)
 #endif
-
+#include "ion/arm/Architecture-arm.h"
+#include "ion/arm/Assembler-arm.h"
 namespace js {
 namespace ion {
 

js/src/ion/arm/Architecture-arm.h

@@ -7,10 +7,7 @@
 #ifndef ion_arm_Architecture_arm_h
 #define ion_arm_Architecture_arm_h
 
-#include "mozilla/StandardInteger.h"
-
 #include <limits.h>
-
 // gcc appears to use __ARM_PCS_VFP to denote that the target is a hard-float target.
 #ifdef __ARM_PCS_VFP
 #define JS_CPU_ARM_HARDFP

js/src/ion/arm/Assembler-arm.cpp

@@ -4,18 +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/arm/Assembler-arm.h"
-
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MathAlgorithms.h"
 
-#include "jscompartment.h"
-#include "jsutil.h"
-
-#include "assembler/jit/ExecutableAllocator.h"
-#include "gc/Marking.h"
-#include "ion/IonCompartment.h"
+#include "ion/arm/Assembler-arm.h"
 #include "ion/arm/MacroAssembler-arm.h"
+#include "gc/Marking.h"
+#include "jsutil.h"
+#include "assembler/jit/ExecutableAllocator.h"
+#include "jscompartment.h"
+#include "ion/IonCompartment.h"
 
 using namespace js;
 using namespace js::ion;

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

@@ -11,11 +11,11 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/Util.h"
 
+#include "ion/shared/Assembler-shared.h"
 #include "assembler/assembler/AssemblerBufferWithConstantPool.h"
-#include "ion/arm/Architecture-arm.h"
 #include "ion/CompactBuffer.h"
 #include "ion/IonCode.h"
-#include "ion/shared/Assembler-shared.h"
+#include "ion/arm/Architecture-arm.h"
 #include "ion/shared/IonAssemblerBufferWithConstantPools.h"
 
 namespace js {

js/src/ion/arm/Bailouts-arm.cpp

@@ -6,7 +6,6 @@
 
 #include "jscntxt.h"
 #include "jscompartment.h"
-
 #include "ion/Bailouts.h"
 #include "ion/IonCompartment.h"
 

js/src/ion/arm/BaselineHelpers-arm.h

@@ -8,10 +8,11 @@
 #define ion_arm_BaselineHelpers_arm_h
 
 #ifdef JS_ION
-#include "ion/BaselineFrame.h"
-#include "ion/BaselineIC.h"
-#include "ion/BaselineRegisters.h"
+
 #include "ion/IonMacroAssembler.h"
+#include "ion/BaselineFrame.h"
+#include "ion/BaselineRegisters.h"
+#include "ion/BaselineIC.h"
 
 namespace js {
 namespace ion {

js/src/ion/arm/BaselineIC-arm.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/arm/CodeGenerator-arm.cpp

@@ -4,25 +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/arm/CodeGenerator-arm.h"
-
 #include "mozilla/MathAlgorithms.h"
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsnum.h"
 
+#include "ion/arm/CodeGenerator-arm.h"
+#include "ion/PerfSpewer.h"
 #include "ion/CodeGenerator.h"
 #include "ion/IonCompartment.h"
 #include "ion/IonFrames.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "ion/PerfSpewer.h"
+#include "ion/shared/CodeGenerator-shared-inl.h"
 #include "vm/Shape.h"
 
 #include "jsscriptinlines.h"
 
-#include "ion/shared/CodeGenerator-shared-inl.h"
 #include "vm/Shape-inl.h"
 
 using namespace js;

js/src/ion/arm/IonFrames-arm.h

@@ -8,6 +8,7 @@
 #define ion_arm_IonFrames_arm_h
 
 #include "ion/shared/IonFrames-shared.h"
+//#include "ion/arm/Assembler-arm.h"
 
 namespace js {
 namespace ion {

js/src/ion/arm/Lowering-arm.cpp

@@ -6,10 +6,9 @@
 
 #include "mozilla/MathAlgorithms.h"
 
-#include "ion/arm/Assembler-arm.h"
-#include "ion/Lowering.h"
 #include "ion/MIR.h"
-
+#include "ion/Lowering.h"
+#include "ion/arm/Assembler-arm.h"
 #include "ion/shared/Lowering-shared-inl.h"
 
 using namespace js;

js/src/ion/arm/MacroAssembler-arm.cpp

@@ -4,11 +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/arm/MacroAssembler-arm.h"
-
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MathAlgorithms.h"
 
+#include "ion/arm/MacroAssembler-arm.h"
 #include "ion/BaselineFrame.h"
 #include "ion/MoveEmitter.h"
 

js/src/ion/arm/MacroAssembler-arm.h

@@ -9,12 +9,11 @@
 
 #include "mozilla/DebugOnly.h"
 
-#include "jsopcode.h"
-
 #include "ion/arm/Assembler-arm.h"
 #include "ion/IonCaches.h"
 #include "ion/IonFrames.h"
 #include "ion/MoveResolver.h"
+#include "jsopcode.h"
 
 using mozilla::DebugOnly;
 

js/src/ion/arm/MoveEmitter-arm.h

@@ -7,8 +7,8 @@
 #ifndef ion_arm_MoveEmitter_arm_h
 #define ion_arm_MoveEmitter_arm_h
 
-#include "ion/IonMacroAssembler.h"
 #include "ion/MoveResolver.h"
+#include "ion/IonMacroAssembler.h"
 
 namespace js {
 namespace ion {

js/src/ion/arm/Trampoline-arm.cpp

@@ -5,16 +5,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jscompartment.h"
-
 #include "assembler/assembler/MacroAssembler.h"
-#include "ion/arm/BaselineHelpers-arm.h"
-#include "ion/Bailouts.h"
-#include "ion/ExecutionModeInlines.h"
 #include "ion/IonCompartment.h"
-#include "ion/IonFrames.h"
 #include "ion/IonLinker.h"
+#include "ion/IonFrames.h"
 #include "ion/IonSpewer.h"
+#include "ion/Bailouts.h"
 #include "ion/VMFunctions.h"
+#include "ion/arm/BaselineHelpers-arm.h"
+#include "ion/ExecutionModeInlines.h"
 
 using namespace js;
 using namespace js::ion;