Bug 1754864 - cleanup js/ includes r=andi

Differential Revision: https://phabricator.services.mozilla.com/D141465

js/src/builtin/RegExp.cpp

@@ -14,7 +14,6 @@
 
 #include "frontend/TokenStream.h"
 #include "irregexp/RegExpAPI.h"
-#include "jit/InlinableNatives.h"
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_NEWREGEXP_FLAGGED
 #include "js/PropertySpec.h"
 #include "js/RegExpFlags.h"  // JS::RegExpFlag, JS::RegExpFlags
@@ -27,7 +26,6 @@
 
 #include "vm/EnvironmentObject-inl.h"
 #include "vm/JSObject-inl.h"
-#include "vm/NativeObject-inl.h"
 #include "vm/ObjectOperations-inl.h"
 #include "vm/PlainObject-inl.h"
 

js/src/builtin/String.cpp

@@ -60,6 +60,7 @@
 
 #include "vm/InlineCharBuffer-inl.h"
 #include "vm/Interpreter-inl.h"
+#include "vm/NativeObject-inl.h"
 #include "vm/StringObject-inl.h"
 #include "vm/StringType-inl.h"
 

js/src/builtin/WeakMapObject.cpp

@@ -16,6 +16,7 @@
 
 #include "gc/WeakMap-inl.h"
 #include "vm/Interpreter-inl.h"
+#include "vm/NativeObject-inl.h"
 
 using namespace js;
 

js/src/intgemm/IntegerGemmIntrinsic.cpp

@@ -10,13 +10,13 @@
 #include "mozilla/CheckedInt.h"
 #include <intgemm.h>
 
-#include <utility>
-
+#include "js/ErrorReport.h"
 #include "js/HeapAPI.h"
-#include "vm/JSContext.h"
+#include "vm/ArrayBufferObject.h"
 #include "wasm/WasmInstance.h"
 #include "wasm/WasmLog.h"
-#include "vm/ArrayBufferObject-inl.h"
+
+struct JSContext;
 
 static constexpr uint32_t ARRAY_ALIGNMENT = 64;
 static constexpr uint32_t ROWS_A_MULTIPLIER = 1;

js/src/jit/IonIC.cpp

@@ -8,11 +8,13 @@
 
 #include "jit/CacheIRCompiler.h"
 #include "jit/CacheIRGenerator.h"
+#include "jit/IonScript.h"
 #include "jit/VMFunctions.h"
 #include "util/DiagnosticAssertions.h"
 #include "vm/EqualityOperations.h"
 
 #include "vm/Interpreter-inl.h"
+#include "vm/JSScript-inl.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/MacroAssembler.cpp

@@ -20,6 +20,7 @@
 #include "jit/JitFrames.h"
 #include "jit/JitOptions.h"
 #include "jit/JitRuntime.h"
+#include "jit/JitScript.h"
 #include "jit/MoveEmitter.h"
 #include "jit/SharedICHelpers.h"
 #include "jit/SharedICRegisters.h"

js/src/jit/WarpOracle.cpp

@@ -19,6 +19,7 @@
 #include "jit/JitScript.h"
 #include "jit/JitSpewer.h"
 #include "jit/MIRGenerator.h"
+#include "jit/TrialInlining.h"
 #include "jit/TypeData.h"
 #include "jit/WarpBuilder.h"
 #include "vm/BuiltinObjectKind.h"

js/src/jsmath.cpp

@@ -12,7 +12,6 @@
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
-#include "mozilla/MemoryReporting.h"
 #include "mozilla/RandomNum.h"
 #include "mozilla/WrappingOperations.h"
 
@@ -25,8 +24,6 @@
 #include "jit/InlinableNatives.h"
 #include "js/Class.h"
 #include "js/PropertySpec.h"
-#include "util/WindowsWrapper.h"
-#include "vm/JSAtom.h"
 #include "vm/JSContext.h"
 #include "vm/Realm.h"
 #include "vm/Time.h"

js/src/jsmath.h

@@ -7,8 +7,6 @@
 #ifndef jsmath_h
 #define jsmath_h
 
-#include "mozilla/MemoryReporting.h"
-
 #include <stdint.h>
 
 #include "NamespaceImports.h"

js/src/vm/Interpreter-inl.h

@@ -7,11 +7,8 @@
 #ifndef vm_Interpreter_inl_h
 #define vm_Interpreter_inl_h
 
-#include "vm/Interpreter.h"
-
 #include "jsnum.h"
 
-#include "js/friend/DumpFunctions.h"
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
 #include "vm/ArgumentsObject.h"
 #include "vm/BytecodeUtil.h"  // JSDVG_SEARCH_STACK
@@ -23,12 +20,10 @@
 #  include "vm/RecordTupleShared.h"
 #endif
 
-#include "vm/EnvironmentObject-inl.h"
 #include "vm/GlobalObject-inl.h"
 #include "vm/JSAtom-inl.h"
 #include "vm/JSObject-inl.h"
 #include "vm/ObjectOperations-inl.h"
-#include "vm/Stack-inl.h"
 #include "vm/StringType-inl.h"
 
 namespace js {

js/src/vm/Interpreter.cpp

@@ -32,8 +32,6 @@
 #include "jit/BaselineJIT.h"
 #include "jit/Jit.h"
 #include "jit/JitRuntime.h"
-#include "js/CallAndConstruct.h"  // JS::Construct, JS::IsCallable, JS::IsConstructor
-#include "js/CharacterEncoding.h"
 #include "js/experimental/JitInfo.h"  // JSJitInfo
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
 #include "js/friend/StackLimits.h"    // js::AutoCheckRecursionLimit
@@ -45,7 +43,6 @@
 #include "vm/BigIntType.h"
 #include "vm/BytecodeUtil.h"        // JSDVG_SEARCH_STACK
 #include "vm/EqualityOperations.h"  // js::StrictlyEqual
-#include "vm/FunctionFlags.h"       // js::FunctionFlags
 #include "vm/GeneratorObject.h"
 #include "vm/Iteration.h"
 #include "vm/JSAtom.h"
@@ -73,8 +70,6 @@
 #include "vm/ArgumentsObject-inl.h"
 #include "vm/EnvironmentObject-inl.h"
 #include "vm/GeckoProfiler-inl.h"
-#include "vm/JSAtom-inl.h"
-#include "vm/JSFunction-inl.h"
 #include "vm/JSScript-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/ObjectOperations-inl.h"

js/src/vm/Interpreter.h

@@ -15,7 +15,6 @@
 
 #include "vm/BuiltinObjectKind.h"
 #include "vm/CheckIsObjectKind.h"  // CheckIsObjectKind
-#include "vm/Iteration.h"
 #include "vm/Stack.h"
 
 namespace js {

js/src/vm/JSObject.cpp

@@ -60,6 +60,7 @@
 #include "vm/JSFunction.h"
 #include "vm/JSScript.h"
 #include "vm/ProxyObject.h"
+#include "vm/RegExpObject.h"
 #include "vm/Shape.h"
 #include "vm/TypedArrayObject.h"
 #include "vm/Watchtower.h"
@@ -76,6 +77,7 @@
 #include "vm/ArrayObject-inl.h"
 #include "vm/BooleanObject-inl.h"
 #include "vm/Compartment-inl.h"
+#include "vm/EnvironmentObject-inl.h"
 #include "vm/Interpreter-inl.h"
 #include "vm/JSAtom-inl.h"
 #include "vm/JSContext-inl.h"

js/src/vm/ProfilingStack.cpp

@@ -8,8 +8,6 @@
 
 #include "mozilla/IntegerRange.h"
 #include "mozilla/MathAlgorithms.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/UniquePtrExtensions.h"
 
 #include <algorithm>
 

js/src/vm/TraceLogging.cpp

@@ -6,7 +6,6 @@
 
 #include "vm/TraceLogging.h"
 
-#include "mozilla/EndianUtils.h"
 #include "mozilla/MemoryReporting.h"
 
 #include <algorithm>
@@ -26,7 +25,6 @@
 #include "vm/JSContext.h"
 #include "vm/JSScript.h"
 #include "vm/Runtime.h"
-#include "vm/Time.h"
 #include "vm/TraceLoggingGraph.h"
 
 using namespace js;

js/src/vm/TraceLoggingGraph.cpp

@@ -11,12 +11,10 @@
 #include "mozilla/ScopeExit.h"
 
 #include "js/Printf.h"
-#include "js/UniquePtr.h"
 #include "threading/LockGuard.h"
 #include "threading/Thread.h"
 #include "util/GetPidProvider.h"  // getpid()
 #include "util/Text.h"
-#include "vm/TraceLogging.h"
 
 #ifndef DEFAULT_TRACE_LOG_DIR
 #  if defined(_WIN32)

js/src/vm/TraceLoggingGraph.h

@@ -10,7 +10,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
 
-#include "js/TypeDecls.h"
 #include "vm/MutexIDs.h"
 #include "vm/TraceLoggingTypes.h"
 

js/src/vm/TraceLoggingTypes.cpp

@@ -8,8 +8,6 @@
 
 #include "vm/StringType.h"
 
-class JSLinearString;
-
 uint32_t TLStringToTextId(JSLinearString* str) {
 #define NAME(textId) \
   if (js::StringEqualsLiteral(str, #textId)) return TraceLogger_##textId;

js/src/vm/TraceLoggingTypes.h

@@ -14,7 +14,6 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "js/AllocPolicy.h"
 #include "js/Utility.h"
 
 class JSLinearString;

js/src/vtune/VTuneWrapper.cpp

@@ -8,12 +8,13 @@
 
 #include "mozilla/Sprintf.h"
 
+#include "jit/JitCode.h"
+#include "js/Utility.h"
 #include "threading/LockGuard.h"
 #include "threading/Mutex.h"
-#include "vm/JSContext.h"
+#include "vm/JSScript.h"
 #include "vm/MutexIDs.h"
-#include "vm/Realm.h"
-#include "vm/Shape.h"
+#include "vtune/jitprofiling.h"
 
 namespace js::vtune {
 

js/src/vtune/VTuneWrapper.h

@@ -9,12 +9,16 @@
 
 #ifdef MOZ_VTUNE
 
-#  include "vtune/jitprofiling.h"
+#  include "jstypes.h"
 
-#  include "jit/JitCode.h"
-#  include "vm/JSScript.h"
+class JS_PUBLIC_API JSScript;
 
 namespace js {
+
+namespace jit {
+class JitCode;
+}
+
 namespace vtune {
 
 bool Initialize();