From aa22e57dcf3f1f7065728064a6a89d67b46522e6 Mon Sep 17 00:00:00 2001 From: Jeff Walden Date: Mon, 14 Apr 2014 18:26:15 -0700 Subject: [PATCH] Bug 988619 - Fix bad includes bustage. r=njn over IRC to fix bustage in a CLOSED TREE --HG-- rename : js/src/jit/ExecutionModeInlines.h => js/src/jit/ExecutionMode-inl.h --- config/check_spidermonkey_style.py | 2 +- js/src/jit/CodeGenerator.cpp | 2 +- js/src/jit/{ExecutionModeInlines.h => ExecutionMode-inl.h} | 6 +++--- js/src/jit/Ion.cpp | 3 ++- js/src/jit/IonBuilder.cpp | 2 +- js/src/jit/arm/Trampoline-arm.cpp | 3 ++- js/src/jit/x86/CodeGenerator-x86.cpp | 2 +- js/src/jit/x86/Trampoline-x86.cpp | 3 ++- js/src/jsinfer.cpp | 2 +- js/src/jsinferinlines.h | 3 ++- 10 files changed, 16 insertions(+), 12 deletions(-) rename js/src/jit/{ExecutionModeInlines.h => ExecutionMode-inl.h} (96%) diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py index 899430b586f4..a31d84e7853f 100644 --- a/config/check_spidermonkey_style.py +++ b/config/check_spidermonkey_style.py @@ -201,7 +201,7 @@ class FileKind(object): if filename.endswith('.cpp'): return FileKind.CPP - if filename.endswith(('inlines.h', '-inl.h', 'Inlines.h')): + if filename.endswith(('inlines.h', '-inl.h')): return FileKind.INL_H if filename.endswith('.h'): diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index 3fa03a4b8847..c2bc48a4c21b 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -20,7 +20,6 @@ #ifdef JSGC_GENERATIONAL # include "gc/Nursery.h" #endif -#include "jit/ExecutionModeInlines.h" #include "jit/IonCaches.h" #include "jit/IonLinker.h" #include "jit/IonOptimizationLevels.h" @@ -35,6 +34,7 @@ #include "jsboolinlines.h" +#include "jit/ExecutionMode-inl.h" #include "jit/shared/CodeGenerator-shared-inl.h" #include "vm/Interpreter-inl.h" diff --git a/js/src/jit/ExecutionModeInlines.h b/js/src/jit/ExecutionMode-inl.h similarity index 96% rename from js/src/jit/ExecutionModeInlines.h rename to js/src/jit/ExecutionMode-inl.h index 3212ff71134d..a224269499fb 100644 --- a/js/src/jit/ExecutionModeInlines.h +++ b/js/src/jit/ExecutionMode-inl.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 jit_ExecutionModeInlines_h -#define jit_ExecutionModeInlines_h +#ifndef jit_ExecutionMode_inl_h +#define jit_ExecutionMode_inl_h #ifdef JS_ION @@ -100,4 +100,4 @@ CompilingOffThread(HandleScript script, ExecutionMode cmode) #endif // JS_ION -#endif /* jit_ExecutionModeInlines_h */ +#endif /* jit_ExecutionMode_inl_h */ diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp index e44bdc5d7c35..5d4815caee04 100644 --- a/js/src/jit/Ion.cpp +++ b/js/src/jit/Ion.cpp @@ -23,7 +23,6 @@ #include "jit/CodeGenerator.h" #include "jit/EdgeCaseAnalysis.h" #include "jit/EffectiveAddressAnalysis.h" -#include "jit/ExecutionModeInlines.h" #include "jit/IonAnalysis.h" #include "jit/IonBuilder.h" #include "jit/IonOptimizationLevels.h" @@ -48,6 +47,8 @@ #include "jsinferinlines.h" #include "jsobjinlines.h" +#include "jit/ExecutionMode-inl.h" + using namespace js; using namespace js::jit; diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 7eb12710620e..634d8b8f954b 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -13,7 +13,6 @@ #include "frontend/SourceNotes.h" #include "jit/BaselineFrame.h" #include "jit/BaselineInspector.h" -#include "jit/ExecutionModeInlines.h" #include "jit/Ion.h" #include "jit/IonOptimizationLevels.h" #include "jit/IonSpewer.h" @@ -29,6 +28,7 @@ #include "jsscriptinlines.h" #include "jit/CompileInfo-inl.h" +#include "jit/ExecutionMode-inl.h" using namespace js; using namespace js::jit; diff --git a/js/src/jit/arm/Trampoline-arm.cpp b/js/src/jit/arm/Trampoline-arm.cpp index 8aeb5f9d29c1..03e1c301676d 100644 --- a/js/src/jit/arm/Trampoline-arm.cpp +++ b/js/src/jit/arm/Trampoline-arm.cpp @@ -9,7 +9,6 @@ #include "assembler/assembler/MacroAssembler.h" #include "jit/arm/BaselineHelpers-arm.h" #include "jit/Bailouts.h" -#include "jit/ExecutionModeInlines.h" #include "jit/IonFrames.h" #include "jit/IonLinker.h" #include "jit/IonSpewer.h" @@ -19,6 +18,8 @@ #endif #include "jit/VMFunctions.h" +#include "jit/ExecutionMode-inl.h" + using namespace js; using namespace js::jit; diff --git a/js/src/jit/x86/CodeGenerator-x86.cpp b/js/src/jit/x86/CodeGenerator-x86.cpp index b1c76326e665..46c10783ab95 100644 --- a/js/src/jit/x86/CodeGenerator-x86.cpp +++ b/js/src/jit/x86/CodeGenerator-x86.cpp @@ -10,7 +10,6 @@ #include "jsnum.h" -#include "jit/ExecutionModeInlines.h" #include "jit/IonCaches.h" #include "jit/MIR.h" #include "jit/MIRGraph.h" @@ -18,6 +17,7 @@ #include "jsscriptinlines.h" +#include "jit/ExecutionMode-inl.h" #include "jit/shared/CodeGenerator-shared-inl.h" using namespace js; diff --git a/js/src/jit/x86/Trampoline-x86.cpp b/js/src/jit/x86/Trampoline-x86.cpp index 79f0e60d92d7..0a2f0ded671f 100644 --- a/js/src/jit/x86/Trampoline-x86.cpp +++ b/js/src/jit/x86/Trampoline-x86.cpp @@ -9,7 +9,6 @@ #include "assembler/assembler/MacroAssembler.h" #include "jit/Bailouts.h" #include "jit/BaselineJIT.h" -#include "jit/ExecutionModeInlines.h" #include "jit/IonFrames.h" #include "jit/IonLinker.h" #include "jit/IonSpewer.h" @@ -22,6 +21,8 @@ #include "jsscriptinlines.h" +#include "jit/ExecutionMode-inl.h" + using namespace js; using namespace js::jit; diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp index 95f0ee050abd..928194f7284d 100644 --- a/js/src/jsinfer.cpp +++ b/js/src/jsinfer.cpp @@ -37,7 +37,7 @@ #include "jsobjinlines.h" #include "jsscriptinlines.h" -#include "jit/ExecutionModeInlines.h" +#include "jit/ExecutionMode-inl.h" using namespace js; using namespace js::gc; diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h index 16939de92965..37d3f821c6b4 100644 --- a/js/src/jsinferinlines.h +++ b/js/src/jsinferinlines.h @@ -15,7 +15,6 @@ #include "jsanalyze.h" -#include "jit/ExecutionModeInlines.h" #include "vm/ArrayObject.h" #include "vm/BooleanObject.h" #include "vm/NumberObject.h" @@ -25,6 +24,8 @@ #include "jscntxtinlines.h" +#include "jit/ExecutionMode-inl.h" + namespace js { namespace types {