Backed out changeset 62bd03bc3763 (bug 1754864) for causing bustage o…

…n WeakMapObject.cpp. CLOSED TREE
iaxat · Mar 24, 2022 · de2755b · de2755b
1 parent 36c16e6
commit de2755b
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 16 deletions.
diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
@@ -14,6 +14,7 @@
 
 #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
@@ -26,6 +27,7 @@
 
 #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"
 

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

diff --git a/js/src/jit/MacroAssembler.cpp b/js/src/jit/MacroAssembler.cpp
@@ -20,7 +20,6 @@
 #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"

diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
@@ -12,6 +12,7 @@
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
+#include "mozilla/MemoryReporting.h"
 #include "mozilla/RandomNum.h"
 #include "mozilla/WrappingOperations.h"
 
@@ -24,6 +25,8 @@
 #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"

diff --git a/js/src/jsmath.h b/js/src/jsmath.h
@@ -7,6 +7,8 @@
 #ifndef jsmath_h
 #define jsmath_h
 
+#include "mozilla/MemoryReporting.h"
+
 #include <stdint.h>
 
 #include "NamespaceImports.h"

diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h
@@ -7,8 +7,11 @@
 #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
@@ -20,10 +23,12 @@
 #  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 {

diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
@@ -32,6 +32,8 @@
 #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
@@ -43,6 +45,7 @@
 #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"
@@ -70,6 +73,8 @@
 #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"

diff --git a/js/src/vm/Interpreter.h b/js/src/vm/Interpreter.h
@@ -15,6 +15,7 @@
 
 #include "vm/BuiltinObjectKind.h"
 #include "vm/CheckIsObjectKind.h"  // CheckIsObjectKind
+#include "vm/Iteration.h"
 #include "vm/Stack.h"
 
 namespace js {

diff --git a/js/src/vm/ProfilingStack.cpp b/js/src/vm/ProfilingStack.cpp
@@ -8,6 +8,8 @@
 
 #include "mozilla/IntegerRange.h"
 #include "mozilla/MathAlgorithms.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/UniquePtrExtensions.h"
 
 #include <algorithm>
 

diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp
@@ -6,6 +6,7 @@
 
 #include "vm/TraceLogging.h"
 
+#include "mozilla/EndianUtils.h"
 #include "mozilla/MemoryReporting.h"
 
 #include <algorithm>
@@ -18,12 +19,14 @@
 #include "js/Printf.h"
 #include "js/TraceLoggerAPI.h"
 #include "threading/LockGuard.h"
+#include "util/GetPidProvider.h"  // getpid()
 #include "util/Text.h"
 #include "vm/Activation.h"  // js::ActivationIterator
 #include "vm/FrameIter.h"   // js::JitFrameIter
 #include "vm/JSContext.h"
 #include "vm/JSScript.h"
 #include "vm/Runtime.h"
+#include "vm/Time.h"
 #include "vm/TraceLoggingGraph.h"
 
 using namespace js;

diff --git a/js/src/vm/TraceLoggingGraph.cpp b/js/src/vm/TraceLoggingGraph.cpp
@@ -11,10 +11,12 @@
 #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)

diff --git a/js/src/vm/TraceLoggingGraph.h b/js/src/vm/TraceLoggingGraph.h
@@ -10,6 +10,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
 
+#include "js/TypeDecls.h"
 #include "vm/MutexIDs.h"
 #include "vm/TraceLoggingTypes.h"
 

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

diff --git a/js/src/vm/TraceLoggingTypes.h b/js/src/vm/TraceLoggingTypes.h
@@ -14,6 +14,7 @@
 #include <cstddef>
 #include <cstdint>
 
+#include "js/AllocPolicy.h"
 #include "js/Utility.h"
 
 class JSLinearString;

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

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