# HG changeset patch
# User t_mrc-ct@users.osdn.jp
# Date 1458484025 -32400
#      Sun Mar 20 23:27:05 2016 +0900
# Branch THUNDERBIRD3880_2016050308_RELBRANCH
# Node ID b3387c468cf14072b9db692dfaab72027b7b61f6
# Parent  edaf9182cf4eac458badeeb730123218cd74a908
Fix check test failure (config/check_spidermonkey_style.py)

diff --git a/js/src/jit/osxppc/BaselineHelpers-ppc.h b/js/src/jit/osxppc/BaselineHelpers-ppc.h
--- a/js/src/jit/osxppc/BaselineHelpers-ppc.h
+++ b/js/src/jit/osxppc/BaselineHelpers-ppc.h
@@ -2,20 +2,20 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #if !defined(jsion_baseline_helpers_ppc_h__)
 #define jsion_baseline_helpers_ppc_h__
 
+#include "jit/BaselineFrame.h"
+#include "jit/BaselineIC.h"
+#include "jit/BaselineRegisters.h"
 #include "jit/MacroAssembler.h"
-#include "jit/BaselineFrame.h"
-#include "jit/BaselineRegisters.h"
-#include "jit/BaselineIC.h"
 
 namespace js {
 namespace jit {
 
 // Distance from sp to the top Value inside an IC stub. Since we emulate x86
 // by storing the return address on the stack, this is one word in.
 static const size_t ICStackValueOffset = sizeof(void *);
 
diff --git a/js/src/jit/osxppc/BaselineIC-ppc.cpp b/js/src/jit/osxppc/BaselineIC-ppc.cpp
--- a/js/src/jit/osxppc/BaselineIC-ppc.cpp
+++ b/js/src/jit/osxppc/BaselineIC-ppc.cpp
@@ -1,20 +1,20 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "jsiter.h"
 
-#include "jit/BaselineJIT.h"
-#include "jit/BaselineIC.h"
 #include "jit/BaselineCompiler.h"
 #include "jit/BaselineHelpers.h"
+#include "jit/BaselineIC.h"
+#include "jit/BaselineJIT.h"
 #include "jit/Linker.h"
 
 #include "jsboolinlines.h"
 
 using namespace js;
 using namespace js::jit;
 
 namespace js {
diff --git a/js/src/jit/osxppc/CodeGenerator-ppc.cpp b/js/src/jit/osxppc/CodeGenerator-ppc.cpp
--- a/js/src/jit/osxppc/CodeGenerator-ppc.cpp
+++ b/js/src/jit/osxppc/CodeGenerator-ppc.cpp
@@ -8,18 +8,18 @@
 
 #include "mozilla/MathAlgorithms.h"
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsnum.h"
 
 #include "jit/CodeGenerator.h"
+#include "jit/JitCompartment.h"
 #include "jit/JitFrames.h"
-#include "jit/JitCompartment.h"
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 #include "vm/Shape.h"
 #include "vm/TraceLogging.h"
 
 #include "jsscriptinlines.h"
 
 #include "jit/shared/CodeGenerator-shared-inl.h"
diff --git a/js/src/jit/osxppc/Lowering-ppc.cpp b/js/src/jit/osxppc/Lowering-ppc.cpp
--- a/js/src/jit/osxppc/Lowering-ppc.cpp
+++ b/js/src/jit/osxppc/Lowering-ppc.cpp
@@ -2,18 +2,18 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/MathAlgorithms.h"
 
 #include "jit/Lowering.h"
+#include "jit/MIR.h"
 #include "jit/osxppc/Assembler-ppc.h"
-#include "jit/MIR.h"
 
 #include "jit/shared/Lowering-shared-inl.h"
 
 using namespace js;
 using namespace js::jit;
 
 using mozilla::FloorLog2;
 
diff --git a/js/src/jit/osxppc/MacroAssembler-ppc.h b/js/src/jit/osxppc/MacroAssembler-ppc.h
--- a/js/src/jit/osxppc/MacroAssembler-ppc.h
+++ b/js/src/jit/osxppc/MacroAssembler-ppc.h
@@ -17,18 +17,18 @@
  
  */
 
 #include "jsopcode.h"
 
 #include "jit/AtomicOp.h"
 #include "jit/IonCaches.h"
 #include "jit/JitFrames.h"
+#include "jit/MoveResolver.h"
 #include "jit/osxppc/Assembler-ppc.h"
-#include "jit/MoveResolver.h"
 #define PPC_USE_UNSIGNED_COMPARE(x) (x & Assembler::ConditionUnsigned)
 
 #if _PPC970_
 #define MFCR0(x) mfocrf(x,cr0)
 #else
 #define MFCR0(x) mfcr(x)
 #endif
 
diff --git a/js/src/jit/osxppc/Trampoline-ppc.cpp b/js/src/jit/osxppc/Trampoline-ppc.cpp
--- a/js/src/jit/osxppc/Trampoline-ppc.cpp
+++ b/js/src/jit/osxppc/Trampoline-ppc.cpp
@@ -16,20 +16,20 @@
  */
 
 /* This file is largely specific to PowerOpen ABI. Some minor but non-trivial
    modifications are required for SysV. */
 
 #include "jscompartment.h"
 
 #include "jit/Bailouts.h"
+#include "jit/JitCompartment.h"
 #include "jit/JitFrames.h"
+#include "jit/JitSpewer.h"
 #include "jit/Linker.h"
-#include "jit/JitCompartment.h"
-#include "jit/JitSpewer.h"
 #include "jit/osxppc/Bailouts-ppc.h"
 #include "jit/osxppc/BaselineHelpers-ppc.h"
 #ifdef JS_ION_PERF
 # include "jit/PerfSpewer.h"
 #endif
 #include "jit/VMFunctions.h"
 
 using namespace js;
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -191,16 +191,21 @@
 
 #include <ctype.h>
 #include <string.h>
 #ifndef XP_WIN
 # include <sys/mman.h>
 # include <unistd.h>
 #endif
 
+/* for GetCPUCount() */
+#include <stdio.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsobj.h"
 #include "jsprf.h"
 #include "jsscript.h"
 #include "jstypes.h"
@@ -230,21 +235,16 @@
 #include "vm/WrapperObject.h"
 
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/Stack-inl.h"
 #include "vm/String-inl.h"
 
-/* for GetCPUCount() */
-#include <stdio.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
 using namespace js;
 using namespace js::gc;
 
 using mozilla::ArrayLength;
 using mozilla::Maybe;
 using mozilla::Swap;
 
 using JS::AutoGCRooter;
