Bug 879831, part 0 - Add defined(JS_ION) guard to more ion headers, to prevent the need for #ifdef JS_ION around #includes in other files. r=njn.
authorJason Orendorff <jorendorff@mozilla.com>
Thu, 06 Jun 2013 22:47:23 -0500
changeset 134305 3dba555bd153ad8c1316f6a8bad3d26dc0594e45
parent 134304 f160923b71ae880adb99c304fa8e994e82a9190a
child 134306 e6ca293b6980fd6f3e96d3331906268cbf988015
push id29156
push userjorendorff@mozilla.com
push dateFri, 07 Jun 2013 03:49:43 +0000
treeherdermozilla-inbound@b252464d739e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs879831
milestone24.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 879831, part 0 - Add defined(JS_ION) guard to more ion headers, to prevent the need for #ifdef JS_ION around #includes in other files. r=njn.
js/src/ion/AsmJSModule.h
js/src/ion/ExecutionModeInlines.h
js/src/ion/IonBuilder.h
js/src/ion/IonCompartment.h
js/src/ion/IonFrameIterator-inl.h
js/src/ion/IonFrameIterator.h
js/src/ion/IonFrames-inl.h
js/src/ion/IonFrames.h
js/src/ion/IonMacroAssembler.h
--- a/js/src/ion/AsmJSModule.h
+++ b/js/src/ion/AsmJSModule.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#if !defined(jsion_asmjsmodule_h__)
+#if !defined(jsion_asmjsmodule_h__) && defined(JS_ION)
 #define jsion_asmjsmodule_h__
 
 #include "gc/Marking.h"
 #include "ion/RegisterSets.h"
 
 #include "jsscript.h"
 #include "jstypedarrayinlines.h"
 
--- a/js/src/ion/ExecutionModeInlines.h
+++ b/js/src/ion/ExecutionModeInlines.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#ifndef jsion_compilemode_h__
+#if !defined(jsion_compilemode_h__) && defined(JS_ION)
 #define jsion_compilemode_h__
 
 namespace js {
 namespace ion {
 
 static inline bool
 HasIonScript(JSScript *script, ExecutionMode cmode)
 {
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#ifndef jsion_bytecode_analyzer_h__
+#if !defined(jsion_bytecode_analyzer_h__) && defined(JS_ION)
 #define jsion_bytecode_analyzer_h__
 
 // This file declares the data structures for building a MIRGraph from a
 // JSScript.
 
 #include "MIR.h"
 #include "MIRGraph.h"
 
--- a/js/src/ion/IonCompartment.h
+++ b/js/src/ion/IonCompartment.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#ifndef jsion_ion_compartment_h__
+#if !defined(jsion_ion_compartment_h__) && defined(JS_ION)
 #define jsion_ion_compartment_h__
 
 #include "IonCode.h"
 #include "jsweakcache.h"
 #include "js/Value.h"
 #include "vm/Stack.h"
 #include "IonFrames.h"
 #include "CompileInfo.h"
--- a/js/src/ion/IonFrameIterator-inl.h
+++ b/js/src/ion/IonFrameIterator-inl.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#ifndef jsion_frame_iterator_inl_h__
+#if !defined(jsion_frame_iterator_inl_h__) && defined(JS_ION)
 #define jsion_frame_iterator_inl_h__
 
 #include "ion/BaselineFrame.h"
 #include "ion/IonFrameIterator.h"
 #include "ion/Bailouts.h"
 #include "ion/Ion.h"
 
 namespace js {
--- a/js/src/ion/IonFrameIterator.h
+++ b/js/src/ion/IonFrameIterator.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#ifndef jsion_frame_iterator_h__
+#if !defined(jsion_frame_iterator_h__) && defined(JS_ION)
 #define jsion_frame_iterator_h__
 
 #include "jstypes.h"
 #include "IonCode.h"
 #include "SnapshotReader.h"
 
 class JSFunction;
 class JSScript;
--- a/js/src/ion/IonFrames-inl.h
+++ b/js/src/ion/IonFrames-inl.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#ifndef jsion_frames_inl_h__
+#if !defined(jsion_frames_inl_h__) && defined(JS_ION)
 #define jsion_frames_inl_h__
 
 #include "ion/IonFrames.h"
 #include "ion/IonFrameIterator.h"
 #include "ion/LIR.h"
 
 namespace js {
 namespace ion {
--- a/js/src/ion/IonFrames.h
+++ b/js/src/ion/IonFrames.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#ifndef jsion_frames_h__
+#if !defined(jsion_frames_h__) && defined(JS_ION)
 #define jsion_frames_h__
 
 #include "mozilla/DebugOnly.h"
 
 #include "jsfun.h"
 #include "jstypes.h"
 #include "jsutil.h"
 #include "Registers.h"
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#ifndef jsion_macro_assembler_h__
+#if !defined(jsion_macro_assembler_h__) && defined(JS_ION)
 #define jsion_macro_assembler_h__
 
 #if defined(JS_CPU_X86)
 # include "ion/x86/MacroAssembler-x86.h"
 #elif defined(JS_CPU_X64)
 # include "ion/x64/MacroAssembler-x64.h"
 #elif defined(JS_CPU_ARM)
 # include "ion/arm/MacroAssembler-arm.h"