Bug 888088 (part 4) - Fix #include ordering in js/src/gc/. r=nnethercote.
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Tue, 23 Jul 2013 17:34:18 -0700
changeset 152031 1609288cc7aa99b4f505e2a0d3868603981b7a5d
parent 152030 055b807e6a4b29e9b1b12609acde8332f35d045e
child 152032 12b1fc69cf4f1e23b01d723e3bb74a970b17827f
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnnethercote
bugs888088
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 888088 (part 4) - Fix #include ordering in js/src/gc/. r=nnethercote.
js/src/gc/Barrier-inl.h
js/src/gc/Iteration.cpp
js/src/gc/Memory.h
js/src/gc/Nursery-inl.h
js/src/gc/Nursery.cpp
js/src/gc/Nursery.h
js/src/gc/RootMarking.cpp
js/src/gc/Statistics.cpp
js/src/gc/Verifier.cpp
js/src/gc/Zone.cpp
js/src/gc/Zone.h
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -3,16 +3,17 @@
  * 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/. */
 
 #ifndef gc_Barrier_inl_h
 #define gc_Barrier_inl_h
 
 #include "gc/Barrier.h"
+
 #include "gc/Marking.h"
 #include "gc/StoreBuffer.h"
 
 #include "vm/String-inl.h"
 
 namespace js {
 
 JS_ALWAYS_INLINE JS::Zone *
--- a/js/src/gc/Iteration.cpp
+++ b/js/src/gc/Iteration.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 "jsapi.h"
 #include "jsgc.h"
 
+#include "gc/GCInternals.h"
 #include "js/HashTable.h"
-#include "gc/GCInternals.h"
 #include "vm/Runtime.h"
 
 #include "jsgcinlines.h"
 
 using namespace js;
 using namespace js::gc;
 
 void
--- a/js/src/gc/Memory.h
+++ b/js/src/gc/Memory.h
@@ -3,16 +3,17 @@
  * 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/. */
 
 #ifndef gc_Memory_h
 #define gc_Memory_h
 
 #include <stddef.h>
+
 #include "jsgc.h"
 
 namespace js {
 namespace gc {
 
 // Sanity check that our compiled configuration matches the currently running
 // instance and initialize any runtime data needed for allocation.
 void
--- a/js/src/gc/Nursery-inl.h
+++ b/js/src/gc/Nursery-inl.h
@@ -5,18 +5,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/. */
 
 #ifndef gc_Nursery_inl_h
 #define gc_Nursery_inl_h
 
 #ifdef JSGC_GENERATIONAL
 
+#include "gc/Nursery.h"
+
 #include "gc/Heap.h"
-#include "gc/Nursery.h"
 
 namespace js {
 namespace gc {
 
 /*
  * This structure overlays a Cell in the Nursery and re-purposes its memory
  * for managing the Nursery collection process.
  */
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -2,27 +2,28 @@
  * vim: set ts=8 sw=4 et tw=78:
  *
  * 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/. */
 
 #ifdef JSGC_GENERATIONAL
 
+#include "gc/Nursery-inl.h"
+
 #include "jscompartment.h"
 #include "jsgc.h"
 #include "jsutil.h"
 
 #include "gc/GCInternals.h"
 #include "gc/Memory.h"
 #include "vm/ArrayObject.h"
 #include "vm/Debugger.h"
 #include "vm/TypedArrayObject.h"
 
-#include "gc/Nursery-inl.h"
 #include "vm/ObjectImpl-inl.h"
 
 using namespace js;
 using namespace gc;
 using namespace mozilla;
 
 bool
 js::Nursery::init()
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -5,22 +5,22 @@
  * 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 gc_Nursery_h
 #define gc_Nursery_h
 
 #ifdef JSGC_GENERATIONAL
 
+#include "jsgc.h"
+#include "jspubtd.h"
+
 #include "ds/BitArray.h"
 #include "js/HashTable.h"
 
-#include "jsgc.h"
-#include "jspubtd.h"
-
 namespace js {
 
 class ObjectElements;
 
 namespace gc {
 class MinorCollectionTracer;
 } /* namespace gc */
 
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -2,41 +2,41 @@
  * 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/DebugOnly.h"
 #include "mozilla/Util.h"
 
+#ifdef MOZ_VALGRIND
+# include <valgrind/memcheck.h>
+#endif
+
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsgc.h"
 #include "jsonparser.h"
 #include "jsprf.h"
 #include "jswatchpoint.h"
 
 #include "builtin/MapObject.h"
 #include "frontend/BytecodeCompiler.h"
 #include "gc/GCInternals.h"
 #include "gc/Marking.h"
 #ifdef JS_ION
+# include "ion/IonFrameIterator.h"
 # include "ion/IonMacroAssembler.h"
-# include "ion/IonFrameIterator.h"
 #endif
 #include "js/HashTable.h"
 #include "vm/Debugger.h"
 
 #include "jsgcinlines.h"
 #include "jsobjinlines.h"
 
-#ifdef MOZ_VALGRIND
-# include <valgrind/memcheck.h>
-#endif
-
 using namespace js;
 using namespace js::gc;
 
 using mozilla::ArrayEnd;
 
 typedef RootedValueMap::Range RootRange;
 typedef RootedValueMap::Entry RootEntry;
 typedef RootedValueMap::Enum RootEnum;
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -1,25 +1,26 @@
 /* -*- 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 "gc/Statistics.h"
 
-#include <stdio.h>
+#include "mozilla/PodOperations.h"
+
 #include <stdarg.h>
-
-#include "mozilla/PodOperations.h"
+#include <stdio.h>
 
 #include "jscrashreport.h"
 #include "jsprf.h"
 #include "jsutil.h"
 #include "prmjtime.h"
+
 #include "gc/Memory.h"
 #include "vm/Runtime.h"
 
 using namespace js;
 using namespace js::gcstats;
 
 using mozilla::PodArrayZero;
 
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -1,30 +1,30 @@
 /* -*- 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/. */
 
+#ifdef MOZ_VALGRIND
+# include <valgrind/memcheck.h>
+#endif
+
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsgc.h"
 #include "jsprf.h"
 
-#include "js/HashTable.h"
 #include "gc/GCInternals.h"
 #include "gc/Zone.h"
+#include "js/HashTable.h"
 
 #include "jsgcinlines.h"
 
-#ifdef MOZ_VALGRIND
-# include <valgrind/memcheck.h>
-#endif
-
 using namespace js;
 using namespace js::gc;
 using namespace mozilla;
 
 #if defined(DEBUG) && defined(JS_GC_ZEAL) && defined(JSGC_ROOT_ANALYSIS) && !defined(JS_THREADSAFE)
 #  if JS_STACK_GROWTH_DIRECTION > 0
 #    error "Root analysis is only supported on a descending stack."
 #  endif
--- a/js/src/gc/Zone.cpp
+++ b/js/src/gc/Zone.cpp
@@ -1,20 +1,22 @@
 /* -*- 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 "gc/Zone.h"
+
 #include "jsgc.h"
 
 #ifdef JS_ION
 #include "ion/BaselineJIT.h"
+#include "ion/Ion.h"
 #include "ion/IonCompartment.h"
-#include "ion/Ion.h"
 #endif
 #include "vm/Debugger.h"
 #include "vm/Runtime.h"
 
 #include "jsgcinlines.h"
 
 using namespace js;
 using namespace js::gc;
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -13,18 +13,18 @@
 #include "mozilla/Util.h"
 
 #include "jscntxt.h"
 #include "jsfun.h"
 #include "jsgc.h"
 #include "jsinfer.h"
 #include "jsobj.h"
 
+#include "gc/FindSCCs.h"
 #include "gc/StoreBuffer.h"
-#include "gc/FindSCCs.h"
 #include "vm/GlobalObject.h"
 #include "vm/RegExpObject.h"
 #include "vm/Shape.h"
 
 namespace js {
 
 /*
  * Encapsulates the data needed to perform allocation.  Typically there is