diff --git a/caps/ContentPrincipal.cpp b/caps/ContentPrincipal.cpp index e6edaec35bf5..a1f097e176a0 100644 --- a/caps/ContentPrincipal.cpp +++ b/caps/ContentPrincipal.cpp @@ -25,7 +25,7 @@ #include "nsError.h" #include "nsIContentSecurityPolicy.h" #include "nsNetCID.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/dom/nsCSPContext.h" #include "mozilla/dom/ScriptSettings.h" diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp index ce2670ec1141..47084fa58076 100644 --- a/dom/base/DOMException.cpp +++ b/dom/base/DOMException.cpp @@ -6,7 +6,6 @@ #include "mozilla/dom/DOMException.h" -#include "jsprf.h" #include "mozilla/ArrayUtils.h" #include "mozilla/HoldDropJSObjects.h" #include "mozilla/dom/Exceptions.h" diff --git a/dom/base/StructuredCloneBlob.cpp b/dom/base/StructuredCloneBlob.cpp index f75f9e73a615..220325b63552 100644 --- a/dom/base/StructuredCloneBlob.cpp +++ b/dom/base/StructuredCloneBlob.cpp @@ -8,7 +8,7 @@ #include "js/StructuredClone.h" #include "js/Utility.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/dom/BlobImpl.h" #include "mozilla/dom/StructuredCloneTags.h" #include "mozilla/Maybe.h" diff --git a/dom/base/WindowDestroyedEvent.cpp b/dom/base/WindowDestroyedEvent.cpp index 424e5f34e93f..ce2724d02244 100644 --- a/dom/base/WindowDestroyedEvent.cpp +++ b/dom/base/WindowDestroyedEvent.cpp @@ -2,7 +2,7 @@ #include "nsJSUtils.h" #include "jsapi.h" // for JSAutoRequest -#include "jswrapper.h" +#include "js/Wrapper.h" #include "nsIPrincipal.h" #include "nsISupportsPrimitives.h" #include "nsIAppStartup.h" diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp index f8ef2c5a4088..de658aaaea9a 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -66,7 +66,7 @@ // Helper Classes #include "nsJSUtils.h" #include "jsapi.h" // for JSAutoRequest -#include "jswrapper.h" +#include "js/Wrapper.h" #include "nsCharSeparatedTokenizer.h" #include "nsReadableUtils.h" #include "nsDOMClassInfo.h" diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp index 8156290464d1..0295ddafd738 100644 --- a/dom/base/nsGlobalWindowOuter.cpp +++ b/dom/base/nsGlobalWindowOuter.cpp @@ -64,7 +64,7 @@ // Helper Classes #include "nsJSUtils.h" #include "jsapi.h" // for JSAutoRequest -#include "jswrapper.h" +#include "js/Wrapper.h" #include "nsCharSeparatedTokenizer.h" #include "nsReadableUtils.h" #include "nsDOMClassInfo.h" diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 7bfd1eb3c038..be23274f8cd8 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -46,7 +46,7 @@ #include "xpcpublic.h" #include "jsapi.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "js/SliceBudget.h" #include "nsIArray.h" #include "nsIObjectInputStream.h" diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h index fea7645c5050..c6cfb09a2e56 100644 --- a/dom/bindings/BindingUtils.h +++ b/dom/bindings/BindingUtils.h @@ -8,7 +8,7 @@ #define mozilla_dom_BindingUtils_h__ #include "jsfriendapi.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "js/Conversions.h" #include "mozilla/ArrayUtils.h" #include "mozilla/Alignment.h" diff --git a/dom/bindings/CallbackObject.h b/dom/bindings/CallbackObject.h index cb556650fcd2..e8e264e68988 100644 --- a/dom/bindings/CallbackObject.h +++ b/dom/bindings/CallbackObject.h @@ -20,7 +20,7 @@ #include "nsISupports.h" #include "nsISupportsImpl.h" #include "nsCycleCollectionParticipant.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/Assertions.h" #include "mozilla/ErrorResult.h" #include "mozilla/HoldDropJSObjects.h" diff --git a/dom/bindings/Exceptions.cpp b/dom/bindings/Exceptions.cpp index 13178c9ccd38..95cb15281ae9 100644 --- a/dom/bindings/Exceptions.cpp +++ b/dom/bindings/Exceptions.cpp @@ -9,7 +9,6 @@ #include "js/RootingAPI.h" #include "js/TypeDecls.h" #include "jsapi.h" -#include "jsprf.h" #include "mozilla/CycleCollectedJSContext.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/DOMException.h" diff --git a/dom/bindings/IterableIterator.h b/dom/bindings/IterableIterator.h index b508a903a408..f8c9cb0b6bc3 100644 --- a/dom/bindings/IterableIterator.h +++ b/dom/bindings/IterableIterator.h @@ -32,7 +32,7 @@ #include "nsPIDOMWindow.h" #include "nsCOMPtr.h" #include "mozilla/dom/ToJSValue.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/dom/IterableIteratorBinding.h" namespace mozilla { diff --git a/dom/bindings/WebIDLGlobalNameHash.cpp b/dom/bindings/WebIDLGlobalNameHash.cpp index 95b85bfc1874..3bda9e4c050e 100644 --- a/dom/bindings/WebIDLGlobalNameHash.cpp +++ b/dom/bindings/WebIDLGlobalNameHash.cpp @@ -6,7 +6,7 @@ #include "WebIDLGlobalNameHash.h" #include "js/GCAPI.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/ErrorResult.h" #include "mozilla/HashFunctions.h" #include "mozilla/Maybe.h" diff --git a/dom/bindings/nsScriptError.cpp b/dom/bindings/nsScriptError.cpp index 02cec1310cf0..83dedc1772f0 100644 --- a/dom/bindings/nsScriptError.cpp +++ b/dom/bindings/nsScriptError.cpp @@ -9,7 +9,7 @@ */ #include "nsScriptError.h" -#include "jsprf.h" +#include "js/Printf.h" #include "MainThreadUtils.h" #include "mozilla/Assertions.h" #include "nsContentUtils.h" diff --git a/dom/jsurl/nsJSProtocolHandler.cpp b/dom/jsurl/nsJSProtocolHandler.cpp index e545adbff63e..33e48b0a6ad8 100644 --- a/dom/jsurl/nsJSProtocolHandler.cpp +++ b/dom/jsurl/nsJSProtocolHandler.cpp @@ -6,7 +6,7 @@ #include "nsCOMPtr.h" #include "jsapi.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "nsCRT.h" #include "nsError.h" #include "nsString.h" diff --git a/dom/plugins/base/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp index fb912221e5a7..d9443733288e 100644 --- a/dom/plugins/base/nsJSNPRuntime.cpp +++ b/dom/plugins/base/nsJSNPRuntime.cpp @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "jsfriendapi.h" -#include "jswrapper.h" #include "nsAutoPtr.h" #include "nsIInterfaceRequestorUtils.h" @@ -28,6 +27,7 @@ #include "nsWrapperCacheInlines.h" #include "js/GCHashTable.h" #include "js/TracingAPI.h" +#include "js/Wrapper.h" #include "mozilla/HashFunctions.h" #include "mozilla/dom/ScriptSettings.h" diff --git a/dom/power/PowerManagerService.cpp b/dom/power/PowerManagerService.cpp index b8a2d18a9c1f..7716c093ba8b 100644 --- a/dom/power/PowerManagerService.cpp +++ b/dom/power/PowerManagerService.cpp @@ -10,7 +10,6 @@ #include "mozilla/ClearOnShutdown.h" #include "mozilla/Preferences.h" #include "mozilla/Services.h" -#include "jsprf.h" #include "nsIDOMWakeLockListener.h" #include "nsIDOMWindow.h" #include "nsIObserverService.h" diff --git a/dom/xbl/nsBindingManager.cpp b/dom/xbl/nsBindingManager.cpp index 96effbdd6442..28fedbc0fe24 100644 --- a/dom/xbl/nsBindingManager.cpp +++ b/dom/xbl/nsBindingManager.cpp @@ -50,7 +50,7 @@ #include "nsIScriptContext.h" #include "xpcpublic.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "nsThreadUtils.h" #include "mozilla/dom/NodeListBinding.h" diff --git a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp index 33b81da568ad..98f58fe9b502 100644 --- a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp +++ b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp @@ -17,7 +17,7 @@ #include "nsIScriptSecurityManager.h" #include "nsJSPrincipals.h" #include "nsIScriptError.h" -#include "jswrapper.h" +#include "js/Wrapper.h" extern mozilla::LazyLogModule MCD; using mozilla::AutoSafeJSContext; diff --git a/js/ductwork/debugger/JSDebugger.cpp b/js/ductwork/debugger/JSDebugger.cpp index 074008cdcdc7..c1e19eaad6ad 100644 --- a/js/ductwork/debugger/JSDebugger.cpp +++ b/js/ductwork/debugger/JSDebugger.cpp @@ -8,7 +8,7 @@ #include "nsThreadUtils.h" #include "jsapi.h" #include "jsfriendapi.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/ModuleUtils.h" #include "nsServiceManagerUtils.h" #include "nsMemory.h" diff --git a/js/ipc/JavaScriptLogging.h b/js/ipc/JavaScriptLogging.h index e91b4a74d1c4..d926caf63ade 100644 --- a/js/ipc/JavaScriptLogging.h +++ b/js/ipc/JavaScriptLogging.h @@ -11,7 +11,7 @@ #include "nsString.h" #include "nsPrintfCString.h" #include "jsfriendapi.h" -#include "jswrapper.h" +#include "js/Wrapper.h" namespace mozilla { namespace jsipc { diff --git a/js/ipc/JavaScriptParent.cpp b/js/ipc/JavaScriptParent.cpp index 6649cafd9e86..07f8811663f1 100644 --- a/js/ipc/JavaScriptParent.cpp +++ b/js/ipc/JavaScriptParent.cpp @@ -11,9 +11,9 @@ #include "nsJSUtils.h" #include "nsIScriptError.h" #include "jsfriendapi.h" -#include "jswrapper.h" #include "js/Proxy.h" #include "js/HeapAPI.h" +#include "js/Wrapper.h" #include "xpcprivate.h" #include "mozilla/Casting.h" #include "mozilla/Telemetry.h" diff --git a/js/src/jsalloc.h b/js/public/AllocPolicy.h similarity index 98% rename from js/src/jsalloc.h rename to js/public/AllocPolicy.h index 57acfac0d409..a505cbce3f4e 100644 --- a/js/src/jsalloc.h +++ b/js/public/AllocPolicy.h @@ -11,8 +11,8 @@ * managed by the GC. See the comment at the top of vm/MallocProvider.h. */ -#ifndef jsalloc_h -#define jsalloc_h +#ifndef js_AllocPolicy_h +#define js_AllocPolicy_h #include "js/TypeDecls.h" #include "js/Utility.h" @@ -171,4 +171,4 @@ class ZoneAllocPolicy } /* namespace js */ -#endif /* jsalloc_h */ +#endif /* js_AllocPolicy_h */ diff --git a/js/public/HashTable.h b/js/public/HashTable.h index 9c9580b8c25a..f91ec2485227 100644 --- a/js/public/HashTable.h +++ b/js/public/HashTable.h @@ -56,7 +56,7 @@ using Generation = mozilla::Opaque; // HashPolicy requirements: // - see Hash Policy section below // AllocPolicy: -// - see jsalloc.h +// - see AllocPolicy.h // // Note: // - HashMap is not reentrant: Key/Value/HashPolicy/AllocPolicy members @@ -318,7 +318,7 @@ class HashMap // HashPolicy requirements: // - see Hash Policy section below // AllocPolicy: -// - see jsalloc.h +// - see AllocPolicy.h // // Note: // - HashSet is not reentrant: T/HashPolicy/AllocPolicy members called by diff --git a/js/public/MemoryMetrics.h b/js/public/MemoryMetrics.h index fc405dfe800c..32a661cee123 100644 --- a/js/public/MemoryMetrics.h +++ b/js/public/MemoryMetrics.h @@ -16,9 +16,9 @@ #include -#include "jsalloc.h" #include "jspubtd.h" +#include "js/AllocPolicy.h" #include "js/HashTable.h" #include "js/TracingAPI.h" #include "js/Utility.h" diff --git a/js/src/jsprf.h b/js/public/Printf.h similarity index 94% rename from js/src/jsprf.h rename to js/public/Printf.h index 4402a39876d2..264b526a62c2 100644 --- a/js/src/jsprf.h +++ b/js/public/Printf.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 jsprf_h -#define jsprf_h +#ifndef js_Printf_h +#define js_Printf_h #include "mozilla/Printf.h" @@ -30,4 +30,4 @@ extern JS_PUBLIC_API(JS::UniqueChars) JS_vsprintf_append(JS::UniqueChars&& last, const char* fmt, va_list ap) MOZ_FORMAT_PRINTF(2, 0); -#endif /* jsprf_h */ +#endif /* js_Printf_h */ diff --git a/js/public/ProfilingFrameIterator.h b/js/public/ProfilingFrameIterator.h index 0da1bb1a4786..25a9e4003465 100644 --- a/js/public/ProfilingFrameIterator.h +++ b/js/public/ProfilingFrameIterator.h @@ -10,7 +10,6 @@ #include "mozilla/Attributes.h" #include "mozilla/Maybe.h" -#include "jsbytecode.h" #include "js/GCAPI.h" #include "js/TypeDecls.h" #include "js/Utility.h" diff --git a/js/public/ProfilingStack.h b/js/public/ProfilingStack.h index 7b26097af094..951cb67f3867 100644 --- a/js/public/ProfilingStack.h +++ b/js/public/ProfilingStack.h @@ -10,8 +10,8 @@ #include #include -#include "jsbytecode.h" #include "jstypes.h" + #include "js/TypeDecls.h" #include "js/Utility.h" diff --git a/js/src/jsprototypes.h b/js/public/ProtoKey.h similarity index 99% rename from js/src/jsprototypes.h rename to js/public/ProtoKey.h index 2168968f5d42..95e49e074737 100644 --- a/js/src/jsprototypes.h +++ b/js/public/ProtoKey.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 jsprototypes_h -#define jsprototypes_h +#ifndef js_ProtoKey_h +#define js_ProtoKey_h /* A higher-order macro for enumerating all JSProtoKey values. */ /* @@ -131,4 +131,4 @@ IF_SAB(real,imaginary)(Atomics, InitAtomicsClass, OCLASP(Atomics)) \ #define JS_FOR_EACH_PROTOTYPE(macro) JS_FOR_PROTOTYPES(macro,macro) -#endif /* jsprototypes_h */ +#endif /* js_ProtoKey_h */ diff --git a/js/public/TracingAPI.h b/js/public/TracingAPI.h index e7d479bab21f..cac2c8f3243c 100644 --- a/js/public/TracingAPI.h +++ b/js/public/TracingAPI.h @@ -7,8 +7,7 @@ #ifndef js_TracingAPI_h #define js_TracingAPI_h -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/HashTable.h" #include "js/HeapAPI.h" #include "js/TraceKind.h" diff --git a/js/public/TypeDecls.h b/js/public/TypeDecls.h index c39e9e4f3cdb..bdb48cdf7bd5 100644 --- a/js/public/TypeDecls.h +++ b/js/public/TypeDecls.h @@ -22,6 +22,8 @@ #include "js-config.h" +typedef uint8_t jsbytecode; + class JSAtom; struct JSCompartment; struct JSContext; diff --git a/js/public/UbiNodeDominatorTree.h b/js/public/UbiNodeDominatorTree.h index 3422b76bc1fc..ef2ce120d795 100644 --- a/js/public/UbiNodeDominatorTree.h +++ b/js/public/UbiNodeDominatorTree.h @@ -13,8 +13,7 @@ #include "mozilla/Move.h" #include "mozilla/UniquePtr.h" -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/UbiNode.h" #include "js/UbiNodePostOrder.h" #include "js/Utility.h" diff --git a/js/public/UbiNodePostOrder.h b/js/public/UbiNodePostOrder.h index a5042677697a..853ef877b736 100644 --- a/js/public/UbiNodePostOrder.h +++ b/js/public/UbiNodePostOrder.h @@ -11,8 +11,7 @@ #include "mozilla/Maybe.h" #include "mozilla/Move.h" -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/UbiNode.h" #include "js/Utility.h" #include "js/Vector.h" diff --git a/js/public/UbiNodeShortestPaths.h b/js/public/UbiNodeShortestPaths.h index babb5ff3b78f..5979091b5a06 100644 --- a/js/public/UbiNodeShortestPaths.h +++ b/js/public/UbiNodeShortestPaths.h @@ -11,8 +11,7 @@ #include "mozilla/Maybe.h" #include "mozilla/Move.h" -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/UbiNodeBreadthFirst.h" #include "js/Vector.h" diff --git a/js/src/jswrapper.h b/js/public/Wrapper.h similarity index 99% rename from js/src/jswrapper.h rename to js/public/Wrapper.h index b45b263903a4..a00a19b192b5 100644 --- a/js/src/jswrapper.h +++ b/js/public/Wrapper.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 jswrapper_h -#define jswrapper_h +#ifndef js_Wrapper_h +#define js_Wrapper_h #include "mozilla/Attributes.h" @@ -399,4 +399,4 @@ RecomputeWrappers(JSContext* cx, const CompartmentFilter& sourceFilter, } /* namespace js */ -#endif /* jswrapper_h */ +#endif /* js_Wrapper_h */ diff --git a/js/rust/src/jsglue.cpp b/js/rust/src/jsglue.cpp index a565233b4572..11af5548874e 100644 --- a/js/rust/src/jsglue.cpp +++ b/js/rust/src/jsglue.cpp @@ -16,9 +16,9 @@ #include "jsfriendapi.h" #include "js/Proxy.h" #include "js/Class.h" -#include "jswrapper.h" #include "js/MemoryMetrics.h" #include "js/Principals.h" +#include "js/Wrapper.h" #include "assert.h" struct ProxyTraps { diff --git a/js/src/builtin/DataViewObject.cpp b/js/src/builtin/DataViewObject.cpp index 381ad712524c..382aeeb82891 100644 --- a/js/src/builtin/DataViewObject.cpp +++ b/js/src/builtin/DataViewObject.cpp @@ -15,10 +15,10 @@ #include "jsapi.h" #include "jsarray.h" #include "jsnum.h" -#include "jswrapper.h" #include "jit/AtomicOperations.h" #include "js/Conversions.h" +#include "js/Wrapper.h" #include "util/Windows.h" #include "vm/ArrayBufferObject.h" #include "vm/GlobalObject.h" diff --git a/js/src/builtin/Eval.h b/js/src/builtin/Eval.h index 03a75d5999ac..94b4ce7948d1 100644 --- a/js/src/builtin/Eval.h +++ b/js/src/builtin/Eval.h @@ -7,9 +7,10 @@ #ifndef builtin_Eval_h #define builtin_Eval_h -#include "jsbytecode.h" #include "NamespaceImports.h" +#include "js/TypeDecls.h" + namespace js { // The C++ native for 'eval' (ES5 15.1.2.1). The function is named "indirect diff --git a/js/src/builtin/SIMD.cpp b/js/src/builtin/SIMD.cpp index 52861141f24b..d5a904f60e92 100644 --- a/js/src/builtin/SIMD.cpp +++ b/js/src/builtin/SIMD.cpp @@ -21,11 +21,11 @@ #include "jsapi.h" #include "jsfriendapi.h" #include "jsnum.h" -#include "jsprf.h" #include "builtin/TypedObject.h" #include "jit/AtomicOperations.h" #include "jit/InlinableNatives.h" +#include "js/Printf.h" #include "js/Value.h" #include "vm/JSObject-inl.h" diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp index acdcc3a957ca..7dbab09875c9 100644 --- a/js/src/builtin/TestingFunctions.cpp +++ b/js/src/builtin/TestingFunctions.cpp @@ -18,8 +18,6 @@ #include "jsapi.h" #include "jsfriendapi.h" -#include "jsprf.h" -#include "jswrapper.h" #include "builtin/Promise.h" #include "builtin/SelfHostingDefines.h" @@ -32,12 +30,14 @@ #include "jit/InlinableNatives.h" #include "js/Debug.h" #include "js/HashTable.h" +#include "js/Printf.h" #include "js/StructuredClone.h" #include "js/UbiNode.h" #include "js/UbiNodeBreadthFirst.h" #include "js/UbiNodeShortestPaths.h" #include "js/UniquePtr.h" #include "js/Vector.h" +#include "js/Wrapper.h" #include "vm/Debugger.h" #include "vm/GlobalObject.h" #include "vm/Interpreter.h" diff --git a/js/src/builtin/intl/SharedIntlData.h b/js/src/builtin/intl/SharedIntlData.h index fe9e9e99d5a8..da321e7c2ccf 100644 --- a/js/src/builtin/intl/SharedIntlData.h +++ b/js/src/builtin/intl/SharedIntlData.h @@ -11,8 +11,7 @@ #include -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/CharacterEncoding.h" #include "js/GCAPI.h" #include "js/GCHashTable.h" diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp index efa5417af90f..f991eee186f5 100644 --- a/js/src/ctypes/CTypes.cpp +++ b/js/src/ctypes/CTypes.cpp @@ -29,7 +29,6 @@ #include "jsexn.h" #include "jsnum.h" -#include "jsprf.h" #include "builtin/TypedObject.h" #include "ctypes/Library.h" @@ -37,6 +36,7 @@ #include "gc/Policy.h" #include "gc/Zone.h" #include "jit/AtomicOperations.h" +#include "js/Printf.h" #include "js/Vector.h" #include "util/Windows.h" #include "vm/JSContext.h" diff --git a/js/src/ctypes/CTypes.h b/js/src/ctypes/CTypes.h index 53c2ee555c0f..9381a15b844c 100644 --- a/js/src/ctypes/CTypes.h +++ b/js/src/ctypes/CTypes.h @@ -10,12 +10,12 @@ #include "mozilla/Vector.h" #include "ffi.h" -#include "jsalloc.h" -#include "jsprf.h" #include "prlink.h" #include "ctypes/typedefs.h" +#include "js/AllocPolicy.h" #include "js/GCHashTable.h" +#include "js/Printf.h" #include "js/UniquePtr.h" #include "js/Vector.h" #include "vm/String.h" diff --git a/js/src/ds/Bitmap.h b/js/src/ds/Bitmap.h index b1acccc43be1..24f962a7260f 100644 --- a/js/src/ds/Bitmap.h +++ b/js/src/ds/Bitmap.h @@ -9,8 +9,7 @@ #include -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/HashTable.h" #include "js/Vector.h" diff --git a/js/src/ds/InlineTable.h b/js/src/ds/InlineTable.h index b8326b169b94..e92f09914740 100644 --- a/js/src/ds/InlineTable.h +++ b/js/src/ds/InlineTable.h @@ -9,8 +9,7 @@ #include "mozilla/Move.h" -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/HashTable.h" namespace js { diff --git a/js/src/frontend/NameFunctions.cpp b/js/src/frontend/NameFunctions.cpp index b17b6ca3eacf..d43b2c23a5a5 100644 --- a/js/src/frontend/NameFunctions.cpp +++ b/js/src/frontend/NameFunctions.cpp @@ -9,11 +9,10 @@ #include "mozilla/MemoryChecking.h" #include "mozilla/Sprintf.h" -#include "jsprf.h" - #include "frontend/BytecodeCompiler.h" #include "frontend/ParseNode.h" #include "frontend/SharedContext.h" +#include "js/Printf.h" #include "vm/JSFunction.h" #include "vm/StringBuffer.h" diff --git a/js/src/fuzz-tests/tests.cpp b/js/src/fuzz-tests/tests.cpp index eaf6888095b2..7406a4c66ab5 100644 --- a/js/src/fuzz-tests/tests.cpp +++ b/js/src/fuzz-tests/tests.cpp @@ -8,8 +8,7 @@ #include -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/Initialization.h" #include "js/RootingAPI.h" #include "vm/JSContext.h" diff --git a/js/src/gc/FreeOp.h b/js/src/gc/FreeOp.h index 6909edc55f60..a47118f0ff15 100644 --- a/js/src/gc/FreeOp.h +++ b/js/src/gc/FreeOp.h @@ -9,10 +9,10 @@ #include "mozilla/Assertions.h" // MOZ_ASSERT -#include "jsalloc.h" // SystemAllocPolicy #include "jsapi.h" // JSFreeOp #include "jit/ExecutableAllocator.h" // jit::JitPoisonRangeVector +#include "js/AllocPolicy.h" // SystemAllocPolicy #include "js/Utility.h" // AutoEnterOOMUnsafeRegion, js_free #include "js/Vector.h" // js::Vector diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp index 7e92ff2a09d1..36d441cccf9c 100644 --- a/js/src/gc/GC.cpp +++ b/js/src/gc/GC.cpp @@ -207,7 +207,6 @@ #include "jsapi.h" #include "jsfriendapi.h" -#include "jsprf.h" #include "jstypes.h" #include "jsutil.h" @@ -221,6 +220,7 @@ #include "jit/BaselineJIT.h" #include "jit/IonCode.h" #include "jit/JitcodeMap.h" +#include "js/Printf.h" #include "js/SliceBudget.h" #include "proxy/DeadObjectProxy.h" #include "util/Windows.h" diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp index 2a23ed7bbc50..8c7762b691d8 100644 --- a/js/src/gc/Marking.cpp +++ b/js/src/gc/Marking.cpp @@ -13,12 +13,12 @@ #include "mozilla/TypeTraits.h" #include "jsfriendapi.h" -#include "jsprf.h" #include "builtin/ModuleObject.h" #include "gc/GCInternals.h" #include "gc/Policy.h" #include "jit/IonCode.h" +#include "js/Printf.h" #include "js/SliceBudget.h" #include "vm/ArgumentsObject.h" #include "vm/ArrayObject.h" diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp index 63e5d891d69e..79f4b4e86972 100644 --- a/js/src/gc/RootMarking.cpp +++ b/js/src/gc/RootMarking.cpp @@ -8,7 +8,6 @@ # include #endif -#include "jsprf.h" #include "jstypes.h" #include "builtin/MapObject.h" @@ -17,6 +16,7 @@ #include "gc/Marking.h" #include "jit/MacroAssembler.h" #include "js/HashTable.h" +#include "js/Printf.h" #include "vm/Debugger.h" #include "vm/JSContext.h" #include "vm/JSONParser.h" diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp index 33c7d2e7e100..c50cf382f5b4 100644 --- a/js/src/gc/Statistics.cpp +++ b/js/src/gc/Statistics.cpp @@ -16,11 +16,11 @@ #include #include -#include "jsprf.h" #include "jsutil.h" #include "gc/GC.h" #include "gc/Memory.h" +#include "js/Printf.h" #include "vm/Debugger.h" #include "vm/HelperThreads.h" #include "vm/Runtime.h" diff --git a/js/src/gc/Statistics.h b/js/src/gc/Statistics.h index 9a46d3245541..7cbe1439b092 100644 --- a/js/src/gc/Statistics.h +++ b/js/src/gc/Statistics.h @@ -14,11 +14,11 @@ #include "mozilla/Maybe.h" #include "mozilla/PodOperations.h" -#include "jsalloc.h" #include "jspubtd.h" #include "NamespaceImports.h" #include "gc/GCEnum.h" +#include "js/AllocPolicy.h" #include "js/SliceBudget.h" #include "js/UniquePtr.h" #include "js/Vector.h" diff --git a/js/src/gc/StoreBuffer.h b/js/src/gc/StoreBuffer.h index 15ea3adb4d47..26c40cdb598f 100644 --- a/js/src/gc/StoreBuffer.h +++ b/js/src/gc/StoreBuffer.h @@ -13,11 +13,10 @@ #include -#include "jsalloc.h" - #include "ds/BitArray.h" #include "ds/LifoAlloc.h" #include "gc/Nursery.h" +#include "js/AllocPolicy.h" #include "js/MemoryMetrics.h" namespace js { diff --git a/js/src/gc/Tracer.cpp b/js/src/gc/Tracer.cpp index e77634541527..36a4578b8ae8 100644 --- a/js/src/gc/Tracer.cpp +++ b/js/src/gc/Tracer.cpp @@ -8,7 +8,6 @@ #include "mozilla/DebugOnly.h" -#include "jsprf.h" #include "jsutil.h" #include "NamespaceImports.h" @@ -16,6 +15,7 @@ #include "gc/Marking.h" #include "gc/PublicIterators.h" #include "gc/Zone.h" +#include "js/Printf.h" #include "vm/JSFunction.h" #include "vm/JSScript.h" #include "vm/Shape.h" diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp index 91a345725e02..9f02893e5298 100644 --- a/js/src/gc/Verifier.cpp +++ b/js/src/gc/Verifier.cpp @@ -4,20 +4,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/. */ -#ifdef MOZ_VALGRIND -# include -#endif - #include "mozilla/DebugOnly.h" #include "mozilla/IntegerPrintfMacros.h" #include "mozilla/Sprintf.h" -#include "jsprf.h" +#ifdef MOZ_VALGRIND +# include +#endif #include "gc/GCInternals.h" #include "gc/PublicIterators.h" #include "gc/Zone.h" #include "js/HashTable.h" +#include "js/Printf.h" #include "vm/JSContext.h" #include "gc/GC-inl.h" diff --git a/js/src/gc/WeakMap.cpp b/js/src/gc/WeakMap.cpp index 843da4973cb6..22060f65be78 100644 --- a/js/src/gc/WeakMap.cpp +++ b/js/src/gc/WeakMap.cpp @@ -10,9 +10,9 @@ #include "jsapi.h" #include "jsfriendapi.h" -#include "jswrapper.h" #include "gc/PublicIterators.h" +#include "js/Wrapper.h" #include "vm/GlobalObject.h" #include "vm/JSContext.h" #include "vm/JSObject.h" diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp index a1bb6aebbcdc..948db8f190eb 100644 --- a/js/src/jit/BacktrackingAllocator.cpp +++ b/js/src/jit/BacktrackingAllocator.cpp @@ -6,9 +6,8 @@ #include "jit/BacktrackingAllocator.h" -#include "jsprf.h" - #include "jit/BitSet.h" +#include "js/Printf.h" using namespace js; using namespace js::jit; diff --git a/js/src/jit/BaselineBailouts.cpp b/js/src/jit/BaselineBailouts.cpp index 05fce21b1ddc..e765ee71fff2 100644 --- a/js/src/jit/BaselineBailouts.cpp +++ b/js/src/jit/BaselineBailouts.cpp @@ -6,7 +6,6 @@ #include "mozilla/ScopeExit.h" -#include "jsprf.h" #include "jsutil.h" #include "jit/arm/Simulator-arm.h" @@ -19,6 +18,7 @@ #include "jit/mips64/Simulator-mips64.h" #include "jit/Recover.h" #include "jit/RematerializedFrame.h" +#include "js/Printf.h" #include "vm/ArgumentsObject.h" #include "vm/Debugger.h" #include "vm/TraceLogging.h" diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index 9102535a3b96..47a33fe3f714 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -20,7 +20,6 @@ #include "jslibmath.h" #include "jsmath.h" #include "jsnum.h" -#include "jsprf.h" #include "jsstr.h" #include "builtin/Eval.h" @@ -43,6 +42,7 @@ #include "jit/RangeAnalysis.h" #include "jit/SharedICHelpers.h" #include "jit/StackSlotAllocator.h" +#include "js/Printf.h" #include "vm/AsyncFunction.h" #include "vm/AsyncIteration.h" #include "vm/MatchPairs.h" diff --git a/js/src/jit/CompactBuffer.h b/js/src/jit/CompactBuffer.h index 2be48fdb04f3..8ea7dba95efb 100644 --- a/js/src/jit/CompactBuffer.h +++ b/js/src/jit/CompactBuffer.h @@ -7,9 +7,8 @@ #ifndef jit_Compactbuffer_h #define jit_Compactbuffer_h -#include "jsalloc.h" - #include "jit/IonTypes.h" +#include "js/AllocPolicy.h" #include "js/Vector.h" namespace js { diff --git a/js/src/jit/ExecutableAllocator.h b/js/src/jit/ExecutableAllocator.h index f255d2ab946e..cfa96ba6cd3b 100644 --- a/js/src/jit/ExecutableAllocator.h +++ b/js/src/jit/ExecutableAllocator.h @@ -35,18 +35,17 @@ #include #include // for ptrdiff_t -#include "jsalloc.h" - #ifdef JS_CODEGEN_ARM -#include "jit/arm/Architecture-arm.h" +# include "jit/arm/Architecture-arm.h" #endif #include "jit/arm/Simulator-arm.h" #if defined(JS_CODEGEN_ARM64) -#include "jit/arm64/vixl/Cpu-vixl.h" +# include "jit/arm64/vixl/Cpu-vixl.h" #endif #include "jit/mips32/Simulator-mips32.h" #include "jit/mips64/Simulator-mips64.h" #include "jit/ProcessExecutableMemory.h" +#include "js/AllocPolicy.h" #include "js/HashTable.h" #include "js/TypeDecls.h" #include "js/Vector.h" diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp index 367a6cd370c0..310e00c7af80 100644 --- a/js/src/jit/Ion.cpp +++ b/js/src/jit/Ion.cpp @@ -10,8 +10,6 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/ThreadLocal.h" -#include "jsprf.h" - #include "gc/FreeOp.h" #include "gc/Marking.h" #include "jit/AliasAnalysis.h" @@ -48,6 +46,7 @@ #include "jit/StupidAllocator.h" #include "jit/ValueNumbering.h" #include "jit/WasmBCE.h" +#include "js/Printf.h" #include "vm/Debugger.h" #include "vm/HelperThreads.h" #include "vm/JSCompartment.h" diff --git a/js/src/jit/IonControlFlow.h b/js/src/jit/IonControlFlow.h index 55fc90eb4cde..1d136e41de45 100644 --- a/js/src/jit/IonControlFlow.h +++ b/js/src/jit/IonControlFlow.h @@ -9,8 +9,6 @@ #include "mozilla/Array.h" -#include "jsbytecode.h" - #include "jit/BytecodeAnalysis.h" #include "jit/FixedList.h" #include "jit/JitAllocPolicy.h" diff --git a/js/src/jit/IonOptimizationLevels.h b/js/src/jit/IonOptimizationLevels.h index de3d87fedffc..b9997277415c 100644 --- a/js/src/jit/IonOptimizationLevels.h +++ b/js/src/jit/IonOptimizationLevels.h @@ -9,7 +9,6 @@ #include "mozilla/EnumeratedArray.h" -#include "jsbytecode.h" #include "jstypes.h" #include "jit/JitOptions.h" diff --git a/js/src/jit/JitSpewer.cpp b/js/src/jit/JitSpewer.cpp index a31ef03e1765..15af8f6e707f 100644 --- a/js/src/jit/JitSpewer.cpp +++ b/js/src/jit/JitSpewer.cpp @@ -16,16 +16,12 @@ #else #include #endif - -#include "jsprf.h" - #include "jit/Ion.h" #include "jit/MIR.h" #include "jit/MIRGenerator.h" #include "jit/MIRGraph.h" - +#include "js/Printf.h" #include "threading/LockGuard.h" - #include "vm/HelperThreads.h" #include "vm/MutexIDs.h" diff --git a/js/src/jit/JitcodeMap.cpp b/js/src/jit/JitcodeMap.cpp index 5263e509b870..4b5fbc8ef379 100644 --- a/js/src/jit/JitcodeMap.cpp +++ b/js/src/jit/JitcodeMap.cpp @@ -11,12 +11,11 @@ #include "mozilla/Maybe.h" #include "mozilla/Sprintf.h" -#include "jsprf.h" - #include "gc/Marking.h" #include "gc/Statistics.h" #include "jit/BaselineJIT.h" #include "jit/JitSpewer.h" +#include "js/Printf.h" #include "js/Vector.h" #include "vm/GeckoProfiler.h" diff --git a/js/src/jit/LIR.cpp b/js/src/jit/LIR.cpp index 310b466101f9..99cc06ea9d2e 100644 --- a/js/src/jit/LIR.cpp +++ b/js/src/jit/LIR.cpp @@ -10,11 +10,10 @@ #include -#include "jsprf.h" - #include "jit/JitSpewer.h" #include "jit/MIR.h" #include "jit/MIRGenerator.h" +#include "js/Printf.h" using namespace js; using namespace js::jit; diff --git a/js/src/jit/MacroAssembler.cpp b/js/src/jit/MacroAssembler.cpp index 06cc50fbb1b3..bd578a8e0773 100644 --- a/js/src/jit/MacroAssembler.cpp +++ b/js/src/jit/MacroAssembler.cpp @@ -10,7 +10,6 @@ #include "mozilla/MathAlgorithms.h" #include "jsfriendapi.h" -#include "jsprf.h" #include "builtin/TypedObject.h" #include "gc/GCTrace.h" @@ -23,6 +22,7 @@ #include "jit/Lowering.h" #include "jit/MIR.h" #include "js/Conversions.h" +#include "js/Printf.h" #include "vm/TraceLogging.h" #include "gc/Nursery-inl.h" diff --git a/js/src/jit/OptimizationTracking.cpp b/js/src/jit/OptimizationTracking.cpp index 072b7160792b..840e6620a37f 100644 --- a/js/src/jit/OptimizationTracking.cpp +++ b/js/src/jit/OptimizationTracking.cpp @@ -6,13 +6,11 @@ #include "jit/OptimizationTracking.h" - -#include "jsprf.h" - #include "ds/Sort.h" #include "jit/IonBuilder.h" #include "jit/JitcodeMap.h" #include "jit/JitSpewer.h" +#include "js/Printf.h" #include "js/TrackedOptimizationInfo.h" #include "vm/ObjectGroup-inl.h" diff --git a/js/src/jit/Snapshots.h b/js/src/jit/Snapshots.h index 0ee8f47eb8f3..8c225633fd98 100644 --- a/js/src/jit/Snapshots.h +++ b/js/src/jit/Snapshots.h @@ -10,14 +10,12 @@ #include "mozilla/Alignment.h" #include "mozilla/Attributes.h" -#include "jsalloc.h" -#include "jsbytecode.h" - #include "jit/CompactBuffer.h" #include "jit/IonTypes.h" #include "jit/Registers.h" - +#include "js/AllocPolicy.h" #include "js/HashTable.h" +#include "js/TypeDecls.h" namespace js { class GenericPrinter; diff --git a/js/src/jit/arm64/vixl/Debugger-vixl.cpp b/js/src/jit/arm64/vixl/Debugger-vixl.cpp index 0b90914c8731..0c36abff211e 100644 --- a/js/src/jit/arm64/vixl/Debugger-vixl.cpp +++ b/js/src/jit/arm64/vixl/Debugger-vixl.cpp @@ -33,7 +33,7 @@ #include "mozilla/Unused.h" #include "mozilla/Vector.h" -#include "jsalloc.h" +#include "js/AllocPolicy.h" namespace vixl { diff --git a/js/src/jit/arm64/vixl/Decoder-vixl.h b/js/src/jit/arm64/vixl/Decoder-vixl.h index 742c6f954c72..4aca78618b26 100644 --- a/js/src/jit/arm64/vixl/Decoder-vixl.h +++ b/js/src/jit/arm64/vixl/Decoder-vixl.h @@ -29,10 +29,9 @@ #include "mozilla/Vector.h" -#include "jsalloc.h" - #include "jit/arm64/vixl/Globals-vixl.h" #include "jit/arm64/vixl/Instructions-vixl.h" +#include "js/AllocPolicy.h" // List macro containing all visitors needed by the decoder class. diff --git a/js/src/jit/arm64/vixl/Instrument-vixl.h b/js/src/jit/arm64/vixl/Instrument-vixl.h index 004fa64ea8f8..eca076d234f2 100644 --- a/js/src/jit/arm64/vixl/Instrument-vixl.h +++ b/js/src/jit/arm64/vixl/Instrument-vixl.h @@ -29,12 +29,11 @@ #include "mozilla/Vector.h" -#include "jsalloc.h" - #include "jit/arm64/vixl/Constants-vixl.h" #include "jit/arm64/vixl/Decoder-vixl.h" #include "jit/arm64/vixl/Globals-vixl.h" #include "jit/arm64/vixl/Utils-vixl.h" +#include "js/AllocPolicy.h" namespace vixl { diff --git a/js/src/jit/arm64/vixl/Simulator-vixl.h b/js/src/jit/arm64/vixl/Simulator-vixl.h index e117eb247b0c..07956733ea04 100644 --- a/js/src/jit/arm64/vixl/Simulator-vixl.h +++ b/js/src/jit/arm64/vixl/Simulator-vixl.h @@ -33,8 +33,6 @@ #include "mozilla/Vector.h" -#include "jsalloc.h" - #include "jit/arm64/vixl/Assembler-vixl.h" #include "jit/arm64/vixl/Disasm-vixl.h" #include "jit/arm64/vixl/Globals-vixl.h" @@ -43,6 +41,7 @@ #include "jit/arm64/vixl/Simulator-Constants-vixl.h" #include "jit/arm64/vixl/Utils-vixl.h" #include "jit/IonTypes.h" +#include "js/AllocPolicy.h" #include "vm/MutexIDs.h" #include "vm/PosixNSPR.h" diff --git a/js/src/jit/shared/Disassembler-shared.cpp b/js/src/jit/shared/Disassembler-shared.cpp index e71ff4914241..6b72fab35aaf 100644 --- a/js/src/jit/shared/Disassembler-shared.cpp +++ b/js/src/jit/shared/Disassembler-shared.cpp @@ -6,9 +6,8 @@ #include "jit/shared/Disassembler-shared.h" -#include "jsprf.h" - #include "jit/JitSpewer.h" +#include "js/Printf.h" using namespace js::jit; diff --git a/js/src/jsapi-tests/testBug604087.cpp b/js/src/jsapi-tests/testBug604087.cpp index 76fb67117735..aec81c932ae0 100644 --- a/js/src/jsapi-tests/testBug604087.cpp +++ b/js/src/jsapi-tests/testBug604087.cpp @@ -7,8 +7,7 @@ * 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 "jswrapper.h" - +#include "js/Wrapper.h" #include "jsapi-tests/tests.h" #include "vm/JSObject.h" #include "vm/ProxyObject.h" diff --git a/js/src/jsapi-tests/testParseJSON.cpp b/js/src/jsapi-tests/testParseJSON.cpp index f8efa2b0cd65..3cc338452a2e 100644 --- a/js/src/jsapi-tests/testParseJSON.cpp +++ b/js/src/jsapi-tests/testParseJSON.cpp @@ -8,9 +8,9 @@ #include #include -#include "jsprf.h" #include "jsstr.h" +#include "js/Printf.h" #include "jsapi-tests/tests.h" using namespace js; diff --git a/js/src/jsapi-tests/testPrintf.cpp b/js/src/jsapi-tests/testPrintf.cpp index 0e3269abf911..448edab2a098 100644 --- a/js/src/jsapi-tests/testPrintf.cpp +++ b/js/src/jsapi-tests/testPrintf.cpp @@ -10,7 +10,7 @@ #include #include -#include "jsprf.h" +#include "js/Printf.h" #include "jsapi-tests/tests.h" diff --git a/js/src/jsapi-tests/testThreadingThread.cpp b/js/src/jsapi-tests/testThreadingThread.cpp index a7a8e5007fdd..615a76995bb5 100644 --- a/js/src/jsapi-tests/testThreadingThread.cpp +++ b/js/src/jsapi-tests/testThreadingThread.cpp @@ -10,8 +10,7 @@ #include "mozilla/Move.h" #include "mozilla/Vector.h" -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "jsapi-tests/tests.h" #include "threading/Thread.h" diff --git a/js/src/jsapi-tests/tests.h b/js/src/jsapi-tests/tests.h index 4ca1d9d7d257..a51592d86587 100644 --- a/js/src/jsapi-tests/tests.h +++ b/js/src/jsapi-tests/tests.h @@ -15,9 +15,8 @@ #include #include -#include "jsalloc.h" - #include "gc/GC.h" +#include "js/AllocPolicy.h" #include "js/Vector.h" #include "vm/JSContext.h" diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 268c060a343a..b096f57c1f7b 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -30,11 +30,9 @@ #include "jsfriendapi.h" #include "jsmath.h" #include "jsnum.h" -#include "jsprf.h" #include "jsstr.h" #include "jstypes.h" #include "jsutil.h" -#include "jswrapper.h" #include "builtin/AtomicsObject.h" #include "builtin/Eval.h" @@ -63,10 +61,12 @@ #include "js/Conversions.h" #include "js/Date.h" #include "js/Initialization.h" +#include "js/Printf.h" #include "js/Proxy.h" #include "js/SliceBudget.h" #include "js/StructuredClone.h" #include "js/Utility.h" +#include "js/Wrapper.h" #include "vm/AsyncFunction.h" #include "vm/AsyncIteration.h" #include "vm/DateObject.h" diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 4d0d07558fd1..9eb023346f32 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -23,9 +23,9 @@ #include #include -#include "jsalloc.h" #include "jspubtd.h" +#include "js/AllocPolicy.h" #include "js/CallArgs.h" #include "js/CharacterEncoding.h" #include "js/Class.h" diff --git a/js/src/jsbytecode.h b/js/src/jsbytecode.h deleted file mode 100644 index 8e4f4cf90b02..000000000000 --- a/js/src/jsbytecode.h +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- 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 jsbytecode_h -#define jsbytecode_h - -#include - -typedef uint8_t jsbytecode; - -#endif /* jsbytecode_h */ diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp index 293105b3ed89..653f8cce9928 100644 --- a/js/src/jsdate.cpp +++ b/js/src/jsdate.cpp @@ -28,14 +28,14 @@ #include "jsapi.h" #include "jsnum.h" -#include "jsprf.h" #include "jsstr.h" #include "jstypes.h" #include "jsutil.h" -#include "jswrapper.h" #include "js/Conversions.h" #include "js/Date.h" +#include "js/Printf.h" +#include "js/Wrapper.h" #include "vm/DateTime.h" #include "vm/GlobalObject.h" #include "vm/Interpreter.h" diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp index decc74743263..aa78e0102103 100644 --- a/js/src/jsexn.cpp +++ b/js/src/jsexn.cpp @@ -16,14 +16,14 @@ #include "jsapi.h" #include "jsnum.h" -#include "jsprf.h" #include "jstypes.h" #include "jsutil.h" -#include "jswrapper.h" #include "gc/FreeOp.h" #include "gc/Marking.h" #include "js/CharacterEncoding.h" +#include "js/Printf.h" +#include "js/Wrapper.h" #include "vm/ErrorObject.h" #include "vm/GlobalObject.h" #include "vm/JSContext.h" diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp index 2c950824711b..0e26db81df0e 100644 --- a/js/src/jsfriendapi.cpp +++ b/js/src/jsfriendapi.cpp @@ -10,15 +10,14 @@ #include -#include "jsprf.h" -#include "jswrapper.h" - #include "builtin/Promise.h" #include "builtin/TestingFunctions.h" #include "gc/GCInternals.h" #include "gc/PublicIterators.h" #include "gc/WeakMap.h" +#include "js/Printf.h" #include "js/Proxy.h" +#include "js/Wrapper.h" #include "proxy/DeadObjectProxy.h" #include "vm/ArgumentsObject.h" #include "vm/JSCompartment.h" diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h index f4c5fc7eff2d..3f011a3424ed 100644 --- a/js/src/jsfriendapi.h +++ b/js/src/jsfriendapi.h @@ -14,13 +14,13 @@ #include "mozilla/UniquePtr.h" #include "jsapi.h" // For JSAutoByteString. See bug 1033916. -#include "jsbytecode.h" #include "jspubtd.h" #include "js/CallArgs.h" #include "js/CallNonGenericMethod.h" #include "js/Class.h" #include "js/HeapAPI.h" +#include "js/TypeDecls.h" #include "js/Utility.h" #ifndef JS_STACK_GROWTH_DIRECTION diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h index c3b5087bbedc..9c73bf3d0cb0 100644 --- a/js/src/jspubtd.h +++ b/js/src/jspubtd.h @@ -16,9 +16,9 @@ #include "mozilla/LinkedList.h" #include "mozilla/PodOperations.h" -#include "jsprototypes.h" #include "jstypes.h" +#include "js/ProtoKey.h" #include "js/Result.h" #include "js/TraceKind.h" #include "js/TypeDecls.h" diff --git a/js/src/moz.build b/js/src/moz.build index e45ed03dc86f..ced8981f73be 100755 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -86,19 +86,15 @@ if CONFIG['HAVE_DTRACE']: EXPORTS += [ '!js-config.h', 'js.msg', - 'jsalloc.h', 'jsapi.h', - 'jsbytecode.h', 'jsfriendapi.h', - 'jsprf.h', - 'jsprototypes.h', 'jspubtd.h', 'jstypes.h', - 'jswrapper.h', 'perf/jsperf.h', ] EXPORTS.js += [ + '../public/AllocPolicy.h', '../public/CallArgs.h', '../public/CallNonGenericMethod.h', '../public/CharacterEncoding.h', @@ -118,8 +114,10 @@ EXPORTS.js += [ '../public/Initialization.h', '../public/MemoryMetrics.h', '../public/Principals.h', + '../public/Printf.h', '../public/ProfilingFrameIterator.h', '../public/ProfilingStack.h', + '../public/ProtoKey.h', '../public/Proxy.h', '../public/Realm.h', '../public/RefCounted.h', @@ -145,6 +143,7 @@ EXPORTS.js += [ '../public/Value.h', '../public/Vector.h', '../public/WeakMapPtr.h', + '../public/Wrapper.h', ] UNIFIED_SOURCES += [ @@ -286,14 +285,12 @@ UNIFIED_SOURCES += [ 'jit/ValueNumbering.cpp', 'jit/VMFunctions.cpp', 'jit/WasmBCE.cpp', - 'jsalloc.cpp', 'jsapi.cpp', 'jsbool.cpp', 'jsdate.cpp', 'jsexn.cpp', 'jsfriendapi.cpp', 'jsnum.cpp', - 'jsprf.cpp', 'jsstr.cpp', 'perf/jsperf.cpp', 'proxy/BaseProxyHandler.cpp', @@ -306,7 +303,9 @@ UNIFIED_SOURCES += [ 'proxy/Wrapper.cpp', 'threading/Mutex.cpp', 'threading/ProtectedData.cpp', + 'util/AllocPolicy.cpp', 'util/NativeStack.cpp', + 'util/Printf.cpp', 'vm/ArgumentsObject.cpp', 'vm/ArrayBufferObject.cpp', 'vm/AsyncFunction.cpp', diff --git a/js/src/proxy/CrossCompartmentWrapper.cpp b/js/src/proxy/CrossCompartmentWrapper.cpp index 48b507f1581b..1b1f5fec5cc5 100644 --- a/js/src/proxy/CrossCompartmentWrapper.cpp +++ b/js/src/proxy/CrossCompartmentWrapper.cpp @@ -4,9 +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/. */ -#include "jswrapper.h" - #include "gc/PublicIterators.h" +#include "js/Wrapper.h" #include "proxy/DeadObjectProxy.h" #include "vm/Iteration.h" #include "vm/WrapperObject.h" diff --git a/js/src/proxy/OpaqueCrossCompartmentWrapper.cpp b/js/src/proxy/OpaqueCrossCompartmentWrapper.cpp index 45f666333a3c..d155b8126970 100644 --- a/js/src/proxy/OpaqueCrossCompartmentWrapper.cpp +++ b/js/src/proxy/OpaqueCrossCompartmentWrapper.cpp @@ -4,7 +4,7 @@ * 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 "jswrapper.h" +#include "js/Wrapper.h" #include "vm/JSObject-inl.h" diff --git a/js/src/proxy/Proxy.cpp b/js/src/proxy/Proxy.cpp index b80905f240f9..30c754b3433f 100644 --- a/js/src/proxy/Proxy.cpp +++ b/js/src/proxy/Proxy.cpp @@ -11,8 +11,8 @@ #include #include "jsapi.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "proxy/DeadObjectProxy.h" #include "proxy/ScriptedProxyHandler.h" #include "vm/JSContext.h" diff --git a/js/src/proxy/SecurityWrapper.cpp b/js/src/proxy/SecurityWrapper.cpp index 6c9a1eae8c22..1ad2f00ea17a 100644 --- a/js/src/proxy/SecurityWrapper.cpp +++ b/js/src/proxy/SecurityWrapper.cpp @@ -6,10 +6,9 @@ #include "jsapi.h" #include "jsfriendapi.h" -#include "jswrapper.h" - #include "NamespaceImports.h" +#include "js/Wrapper.h" #include "vm/String.h" using namespace js; diff --git a/js/src/proxy/Wrapper.cpp b/js/src/proxy/Wrapper.cpp index 3d9c0d6ffbb8..5c421a51281d 100644 --- a/js/src/proxy/Wrapper.cpp +++ b/js/src/proxy/Wrapper.cpp @@ -4,8 +4,9 @@ * 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 "js/Wrapper.h" + #include "jsexn.h" -#include "jswrapper.h" #include "js/Proxy.h" #include "vm/ErrorObject.h" diff --git a/js/src/shell/OSObject.cpp b/js/src/shell/OSObject.cpp index 83f8be2e5d1e..1ef4c61ff1bf 100644 --- a/js/src/shell/OSObject.cpp +++ b/js/src/shell/OSObject.cpp @@ -23,10 +23,10 @@ // For JSFunctionSpecWithHelp #include "jsfriendapi.h" #include "jsstr.h" -#include "jswrapper.h" #include "gc/FreeOp.h" #include "js/Conversions.h" +#include "js/Wrapper.h" #include "shell/jsshell.h" #include "util/Windows.h" #include "vm/JSObject.h" diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index cfff9c9869c3..56c26d34abd1 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -49,13 +49,12 @@ # include # include #endif + #include "jsapi.h" #include "jsarray.h" #include "jsfriendapi.h" -#include "jsprf.h" #include "jstypes.h" #include "jsutil.h" -#include "jswrapper.h" #ifndef JS_POSIX_NSPR # include "prerror.h" # include "prlink.h" @@ -78,9 +77,11 @@ #include "js/Debug.h" #include "js/GCVector.h" #include "js/Initialization.h" +#include "js/Printf.h" #include "js/StructuredClone.h" #include "js/SweepingAPI.h" #include "js/TrackedOptimizationInfo.h" +#include "js/Wrapper.h" #include "perf/jsperf.h" #include "shell/jsoptparse.h" #include "shell/jsshell.h" diff --git a/js/src/shell/jsoptparse.h b/js/src/shell/jsoptparse.h index 0af1eb0cbe8a..27a59be41753 100644 --- a/js/src/shell/jsoptparse.h +++ b/js/src/shell/jsoptparse.h @@ -9,9 +9,9 @@ #include -#include "jsalloc.h" #include "jsutil.h" +#include "js/AllocPolicy.h" #include "js/Vector.h" namespace js { diff --git a/js/src/jsalloc.cpp b/js/src/util/AllocPolicy.cpp similarity index 95% rename from js/src/jsalloc.cpp rename to js/src/util/AllocPolicy.cpp index ad1e68c35673..d6b2054a94b9 100644 --- a/js/src/jsalloc.cpp +++ b/js/src/util/AllocPolicy.cpp @@ -4,7 +4,7 @@ * 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 "jsalloc.h" +#include "js/AllocPolicy.h" #include "vm/JSContext.h" diff --git a/js/src/util/DoubleToString.cpp b/js/src/util/DoubleToString.cpp index 2f83e5d2c055..399038303e4b 100644 --- a/js/src/util/DoubleToString.cpp +++ b/js/src/util/DoubleToString.cpp @@ -12,10 +12,11 @@ #include "mozilla/EndianUtils.h" -#include "jsprf.h" #include "jstypes.h" #include "jsutil.h" +#include "js/Printf.h" + using namespace js; #if MOZ_LITTLE_ENDIAN diff --git a/js/src/jsprf.cpp b/js/src/util/Printf.cpp similarity index 97% rename from js/src/jsprf.cpp rename to js/src/util/Printf.cpp index d07060111910..b66cb5c1c24d 100644 --- a/js/src/jsprf.cpp +++ b/js/src/util/Printf.cpp @@ -10,11 +10,11 @@ * Author: Kipp E.B. Hickman */ -#include "jsprf.h" +#include "js/Printf.h" #include "mozilla/Printf.h" -#include "jsalloc.h" +#include "js/AllocPolicy.h" using namespace js; diff --git a/js/src/vm/ArrayBufferObject.cpp b/js/src/vm/ArrayBufferObject.cpp index 2c59c6c09941..7f711feef951 100644 --- a/js/src/vm/ArrayBufferObject.cpp +++ b/js/src/vm/ArrayBufferObject.cpp @@ -28,7 +28,6 @@ #include "jsnum.h" #include "jstypes.h" #include "jsutil.h" -#include "jswrapper.h" #include "builtin/DataViewObject.h" #include "gc/Barrier.h" @@ -36,6 +35,7 @@ #include "gc/Memory.h" #include "js/Conversions.h" #include "js/MemoryMetrics.h" +#include "js/Wrapper.h" #include "util/Windows.h" #include "vm/GlobalObject.h" #include "vm/Interpreter.h" diff --git a/js/src/vm/BytecodeUtil.cpp b/js/src/vm/BytecodeUtil.cpp index c17daf344755..b0f0743d7cdf 100644 --- a/js/src/vm/BytecodeUtil.cpp +++ b/js/src/vm/BytecodeUtil.cpp @@ -25,7 +25,6 @@ #include "jsapi.h" #include "jsnum.h" -#include "jsprf.h" #include "jsstr.h" #include "jstypes.h" #include "jsutil.h" @@ -35,6 +34,7 @@ #include "gc/FreeOp.h" #include "gc/GCInternals.h" #include "js/CharacterEncoding.h" +#include "js/Printf.h" #include "vm/CodeCoverage.h" #include "vm/EnvironmentObject.h" #include "vm/JSAtom.h" diff --git a/js/src/vm/BytecodeUtil.h b/js/src/vm/BytecodeUtil.h index bc2347ee9d61..eef8e786db25 100644 --- a/js/src/vm/BytecodeUtil.h +++ b/js/src/vm/BytecodeUtil.h @@ -14,11 +14,11 @@ #include "mozilla/Attributes.h" #include "mozilla/EndianUtils.h" -#include "jsbytecode.h" #include "jstypes.h" #include "NamespaceImports.h" #include "frontend/SourceNotes.h" +#include "js/TypeDecls.h" #include "js/UniquePtr.h" #include "vm/Opcodes.h" #include "vm/Printer.h" diff --git a/js/src/vm/Caches.h b/js/src/vm/Caches.h index efe0957a48e7..f0674f07d122 100644 --- a/js/src/vm/Caches.h +++ b/js/src/vm/Caches.h @@ -7,12 +7,12 @@ #ifndef vm_Caches_h #define vm_Caches_h -#include "jsbytecode.h" #include "jsmath.h" #include "frontend/SourceNotes.h" #include "gc/Tracer.h" #include "js/RootingAPI.h" +#include "js/TypeDecls.h" #include "js/UniquePtr.h" #include "vm/ArrayObject.h" #include "vm/JSAtom.h" diff --git a/js/src/vm/CharacterEncoding.cpp b/js/src/vm/CharacterEncoding.cpp index 9317144644fe..baf93425ca55 100644 --- a/js/src/vm/CharacterEncoding.cpp +++ b/js/src/vm/CharacterEncoding.cpp @@ -12,8 +12,7 @@ #include #include -#include "jsprf.h" - +#include "js/Printf.h" #include "vm/JSContext.h" using namespace js; diff --git a/js/src/vm/CodeCoverage.cpp b/js/src/vm/CodeCoverage.cpp index 979905496e93..ba069e76289d 100644 --- a/js/src/vm/CodeCoverage.cpp +++ b/js/src/vm/CodeCoverage.cpp @@ -18,8 +18,7 @@ # include #endif -#include "jsprf.h" - +#include "js/Printf.h" #include "vm/BytecodeUtil.h" #include "vm/JSCompartment.h" #include "vm/JSScript.h" diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h index f1ee852352ff..377d3723c181 100644 --- a/js/src/vm/CommonPropertyNames.h +++ b/js/src/vm/CommonPropertyNames.h @@ -9,7 +9,7 @@ #ifndef vm_CommonPropertyNames_h #define vm_CommonPropertyNames_h -#include "jsprototypes.h" +#include "js/ProtoKey.h" #define FOR_EACH_COMMON_PROPERTYNAME(macro) \ macro(add, add, "add") \ diff --git a/js/src/vm/Compression.h b/js/src/vm/Compression.h index 2fb2df5b63a1..322e4a320951 100644 --- a/js/src/vm/Compression.h +++ b/js/src/vm/Compression.h @@ -9,9 +9,9 @@ #include -#include "jsalloc.h" #include "jstypes.h" +#include "js/AllocPolicy.h" #include "js/Vector.h" namespace js { diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp index 3650f3c3cc9e..fafb54733466 100644 --- a/js/src/vm/Debugger.cpp +++ b/js/src/vm/Debugger.cpp @@ -13,8 +13,6 @@ #include "jsfriendapi.h" #include "jsnum.h" -#include "jsprf.h" -#include "jswrapper.h" #include "frontend/BytecodeCompiler.h" #include "frontend/Parser.h" @@ -26,8 +24,10 @@ #include "jit/BaselineDebugModeOSR.h" #include "jit/BaselineJIT.h" #include "js/Date.h" +#include "js/Printf.h" #include "js/UbiNodeBreadthFirst.h" #include "js/Vector.h" +#include "js/Wrapper.h" #include "proxy/ScriptedProxyHandler.h" #include "vm/ArgumentsObject.h" #include "vm/AsyncFunction.h" diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h index 8a6a7a9d3b00..c79cdb84a291 100644 --- a/js/src/vm/Debugger.h +++ b/js/src/vm/Debugger.h @@ -14,8 +14,6 @@ #include "mozilla/TimeStamp.h" #include "mozilla/Vector.h" -#include "jswrapper.h" - #include "builtin/Promise.h" #include "ds/TraceableFifo.h" #include "gc/Barrier.h" @@ -23,6 +21,7 @@ #include "js/Debug.h" #include "js/GCVariant.h" #include "js/HashTable.h" +#include "js/Wrapper.h" #include "vm/GlobalObject.h" #include "vm/JSCompartment.h" #include "vm/JSContext.h" diff --git a/js/src/vm/DebuggerMemory.cpp b/js/src/vm/DebuggerMemory.cpp index ab8b97bcf3ce..e17eabc59ec8 100644 --- a/js/src/vm/DebuggerMemory.cpp +++ b/js/src/vm/DebuggerMemory.cpp @@ -12,10 +12,9 @@ #include -#include "jsalloc.h" - #include "builtin/MapObject.h" #include "gc/Marking.h" +#include "js/AllocPolicy.h" #include "js/Debug.h" #include "js/TracingAPI.h" #include "js/UbiNode.h" diff --git a/js/src/vm/GeckoProfiler.cpp b/js/src/vm/GeckoProfiler.cpp index 7efc902e281e..ae6415b1b87e 100644 --- a/js/src/vm/GeckoProfiler.cpp +++ b/js/src/vm/GeckoProfiler.cpp @@ -9,7 +9,6 @@ #include "mozilla/DebugOnly.h" #include "jsnum.h" -#include "jsprf.h" #include "gc/PublicIterators.h" #include "jit/BaselineFrame.h" @@ -17,6 +16,7 @@ #include "jit/JitcodeMap.h" #include "jit/JitFrames.h" #include "jit/JSJitFrameIter.h" +#include "js/Printf.h" #include "vm/JSScript.h" #include "vm/StringBuffer.h" diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp index cf9af04d9de5..deecb324ecca 100644 --- a/js/src/vm/GlobalObject.cpp +++ b/js/src/vm/GlobalObject.cpp @@ -10,7 +10,6 @@ #include "jsexn.h" #include "jsfriendapi.h" #include "jsmath.h" -#include "jsprototypes.h" #include "builtin/AtomicsObject.h" #include "builtin/DataViewObject.h" @@ -28,6 +27,7 @@ #include "builtin/WeakMapObject.h" #include "builtin/WeakSetObject.h" #include "gc/FreeOp.h" +#include "js/ProtoKey.h" #include "vm/Debugger.h" #include "vm/EnvironmentObject.h" #include "vm/HelperThreads.h" diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp index 3f23462c04b6..0a1c10242762 100644 --- a/js/src/vm/Interpreter.cpp +++ b/js/src/vm/Interpreter.cpp @@ -20,7 +20,6 @@ #include "jsarray.h" #include "jslibmath.h" #include "jsnum.h" -#include "jsprf.h" #include "jsstr.h" #include "builtin/Eval.h" @@ -29,6 +28,7 @@ #include "jit/Ion.h" #include "jit/IonAnalysis.h" #include "jit/Jit.h" +#include "js/Printf.h" #include "vm/AsyncFunction.h" #include "vm/AsyncIteration.h" #include "vm/BytecodeUtil.h" diff --git a/js/src/vm/JSCompartment.cpp b/js/src/vm/JSCompartment.cpp index c977497fb6eb..4396cf58dbe8 100644 --- a/js/src/vm/JSCompartment.cpp +++ b/js/src/vm/JSCompartment.cpp @@ -11,7 +11,6 @@ #include #include "jsfriendapi.h" -#include "jswrapper.h" #include "gc/Policy.h" #include "gc/PublicIterators.h" @@ -20,6 +19,7 @@ #include "js/Date.h" #include "js/Proxy.h" #include "js/RootingAPI.h" +#include "js/Wrapper.h" #include "proxy/DeadObjectProxy.h" #include "vm/Debugger.h" #include "vm/Iteration.h" diff --git a/js/src/vm/JSContext.cpp b/js/src/vm/JSContext.cpp index ea25b7675e15..724ceeb6dea8 100644 --- a/js/src/vm/JSContext.cpp +++ b/js/src/vm/JSContext.cpp @@ -27,8 +27,8 @@ #ifdef XP_WIN # include #endif // XP_WIN + #include "jsexn.h" -#include "jsprf.h" #include "jspubtd.h" #include "jsstr.h" #include "jstypes.h" @@ -38,6 +38,7 @@ #include "jit/Ion.h" #include "jit/PcScriptCache.h" #include "js/CharacterEncoding.h" +#include "js/Printf.h" #include "util/DoubleToString.h" #include "util/NativeStack.h" #include "util/Windows.h" diff --git a/js/src/vm/JSFunction.cpp b/js/src/vm/JSFunction.cpp index f90e65a84d50..9df57ba1b931 100644 --- a/js/src/vm/JSFunction.cpp +++ b/js/src/vm/JSFunction.cpp @@ -21,7 +21,6 @@ #include "jsarray.h" #include "jsstr.h" #include "jstypes.h" -#include "jswrapper.h" #include "builtin/Eval.h" #include "builtin/Object.h" @@ -34,6 +33,7 @@ #include "jit/Ion.h" #include "js/CallNonGenericMethod.h" #include "js/Proxy.h" +#include "js/Wrapper.h" #include "vm/AsyncFunction.h" #include "vm/AsyncIteration.h" #include "vm/Debugger.h" diff --git a/js/src/vm/JSONParser.cpp b/js/src/vm/JSONParser.cpp index eb003d38e887..1deb9e549ceb 100644 --- a/js/src/vm/JSONParser.cpp +++ b/js/src/vm/JSONParser.cpp @@ -14,8 +14,8 @@ #include "jsarray.h" #include "jsnum.h" -#include "jsprf.h" +#include "js/Printf.h" #include "vm/JSCompartment.h" #include "vm/StringBuffer.h" diff --git a/js/src/vm/JSObject.cpp b/js/src/vm/JSObject.cpp index a89bd2c94876..87ccd4db963b 100644 --- a/js/src/vm/JSObject.cpp +++ b/js/src/vm/JSObject.cpp @@ -22,11 +22,9 @@ #include "jsexn.h" #include "jsfriendapi.h" #include "jsnum.h" -#include "jsprf.h" #include "jsstr.h" #include "jstypes.h" #include "jsutil.h" -#include "jswrapper.h" #include "builtin/Eval.h" #include "builtin/Object.h" @@ -35,9 +33,11 @@ #include "gc/Policy.h" #include "jit/BaselineJIT.h" #include "js/MemoryMetrics.h" +#include "js/Printf.h" #include "js/Proxy.h" #include "js/UbiNode.h" #include "js/UniquePtr.h" +#include "js/Wrapper.h" #include "util/Windows.h" #include "vm/ArgumentsObject.h" #include "vm/BytecodeUtil.h" diff --git a/js/src/vm/JSScript.cpp b/js/src/vm/JSScript.cpp index a197c25e04ad..f31a899bf4d7 100644 --- a/js/src/vm/JSScript.cpp +++ b/js/src/vm/JSScript.cpp @@ -22,10 +22,8 @@ #include #include "jsapi.h" -#include "jsprf.h" #include "jstypes.h" #include "jsutil.h" -#include "jswrapper.h" #include "frontend/BytecodeCompiler.h" #include "frontend/BytecodeEmitter.h" @@ -35,7 +33,9 @@ #include "jit/Ion.h" #include "jit/IonCode.h" #include "js/MemoryMetrics.h" +#include "js/Printf.h" #include "js/Utility.h" +#include "js/Wrapper.h" #include "vm/ArgumentsObject.h" #include "vm/BytecodeUtil.h" #include "vm/Compression.h" diff --git a/js/src/vm/MallocProvider.h b/js/src/vm/MallocProvider.h index 52f605607ad1..35c00f6251fb 100644 --- a/js/src/vm/MallocProvider.h +++ b/js/src/vm/MallocProvider.h @@ -16,7 +16,7 @@ * * - AllocPolicy: An interface for the js allocators, for use with templates. * These allocators are for system memory whose lifetime is not associated - * with a GC thing. See js/src/jsalloc.h. + * with a GC thing. See js/public/AllocPolicy.h. * * - SystemAllocPolicy: No extra functionality over bare allocators. * diff --git a/js/src/vm/MatchPairs.h b/js/src/vm/MatchPairs.h index 1bd30d38327e..f716e106e813 100644 --- a/js/src/vm/MatchPairs.h +++ b/js/src/vm/MatchPairs.h @@ -7,9 +7,8 @@ #ifndef vm_MatchPairs_h #define vm_MatchPairs_h -#include "jsalloc.h" - #include "ds/LifoAlloc.h" +#include "js/AllocPolicy.h" #include "js/Vector.h" /* diff --git a/js/src/vm/ObjectGroup.h b/js/src/vm/ObjectGroup.h index c1e1bdbce624..4c2f8a46d448 100644 --- a/js/src/vm/ObjectGroup.h +++ b/js/src/vm/ObjectGroup.h @@ -7,13 +7,13 @@ #ifndef vm_ObjectGroup_h #define vm_ObjectGroup_h -#include "jsbytecode.h" #include "jsfriendapi.h" #include "ds/IdValuePair.h" #include "gc/Barrier.h" #include "js/CharacterEncoding.h" #include "js/GCHashTable.h" +#include "js/TypeDecls.h" #include "vm/TaggedProto.h" #include "vm/TypeInference.h" diff --git a/js/src/vm/RegExpShared.h b/js/src/vm/RegExpShared.h index 393fac0a3aab..029fb803ceed 100644 --- a/js/src/vm/RegExpShared.h +++ b/js/src/vm/RegExpShared.h @@ -15,12 +15,11 @@ #include "mozilla/Assertions.h" #include "mozilla/MemoryReporting.h" -#include "jsalloc.h" - #include "builtin/SelfHostingDefines.h" #include "gc/Barrier.h" #include "gc/Heap.h" #include "gc/Marking.h" +#include "js/AllocPolicy.h" #include "js/UbiNode.h" #include "js/Vector.h" #include "vm/ArrayObject.h" diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp index 7a44639aeb45..a0d1e8a43481 100644 --- a/js/src/vm/Runtime.cpp +++ b/js/src/vm/Runtime.cpp @@ -12,19 +12,17 @@ #include "mozilla/Unused.h" #if defined(XP_DARWIN) -#include +# include #elif defined(XP_UNIX) -#include +# include #endif // defined(XP_DARWIN) || defined(XP_UNIX) || defined(XP_WIN) - #include #include - #ifdef JS_CAN_CHECK_THREADSAFE_ACCESSES # include #endif + #include "jsmath.h" -#include "jswrapper.h" #include "builtin/Promise.h" #include "gc/FreeOp.h" @@ -38,6 +36,7 @@ #include "js/Date.h" #include "js/MemoryMetrics.h" #include "js/SliceBudget.h" +#include "js/Wrapper.h" #include "util/Windows.h" #include "vm/Debugger.h" #include "vm/JSAtom.h" diff --git a/js/src/vm/SavedFrame.h b/js/src/vm/SavedFrame.h index bfc51cdfc018..45cd8e12b4c8 100644 --- a/js/src/vm/SavedFrame.h +++ b/js/src/vm/SavedFrame.h @@ -9,10 +9,9 @@ #include "mozilla/Attributes.h" -#include "jswrapper.h" - #include "js/GCHashTable.h" #include "js/UbiNode.h" +#include "js/Wrapper.h" namespace js { diff --git a/js/src/vm/SavedStacks.h b/js/src/vm/SavedStacks.h index 3e3a322ea243..000ef264b0ba 100644 --- a/js/src/vm/SavedStacks.h +++ b/js/src/vm/SavedStacks.h @@ -11,9 +11,9 @@ #include "mozilla/FastBernoulliTrial.h" #include "jsmath.h" -#include "jswrapper.h" #include "js/HashTable.h" +#include "js/Wrapper.h" #include "vm/JSContext.h" #include "vm/SavedFrame.h" #include "vm/Stack.h" diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp index 2b3c0c6b5b7d..3236e30f7a48 100644 --- a/js/src/vm/SelfHosting.cpp +++ b/js/src/vm/SelfHosting.cpp @@ -15,7 +15,6 @@ #include "jsdate.h" #include "jsfriendapi.h" #include "jsstr.h" -#include "jswrapper.h" #include "selfhosted.out.h" #include "builtin/intl/Collator.h" @@ -42,6 +41,7 @@ #include "jit/InlinableNatives.h" #include "js/CharacterEncoding.h" #include "js/Date.h" +#include "js/Wrapper.h" #include "vm/Compression.h" #include "vm/GeneratorObject.h" #include "vm/Interpreter.h" diff --git a/js/src/vm/SharedArrayObject.cpp b/js/src/vm/SharedArrayObject.cpp index f7b6bba07e1e..a122064acee6 100644 --- a/js/src/vm/SharedArrayObject.cpp +++ b/js/src/vm/SharedArrayObject.cpp @@ -10,11 +10,11 @@ #include "mozilla/CheckedInt.h" #include "jsfriendapi.h" -#include "jsprf.h" -#include "jswrapper.h" #include "gc/FreeOp.h" #include "jit/AtomicOperations.h" +#include "js/Printf.h" +#include "js/Wrapper.h" #include "vm/SharedMem.h" #include "wasm/AsmJS.h" #include "wasm/WasmSignalHandlers.h" diff --git a/js/src/vm/StructuredClone.cpp b/js/src/vm/StructuredClone.cpp index 530436f89eb6..c7ddb7801cf4 100644 --- a/js/src/vm/StructuredClone.cpp +++ b/js/src/vm/StructuredClone.cpp @@ -37,12 +37,12 @@ #include "jsapi.h" #include "jsdate.h" -#include "jswrapper.h" #include "builtin/DataViewObject.h" #include "builtin/MapObject.h" #include "js/Date.h" #include "js/GCHashTable.h" +#include "js/Wrapper.h" #include "vm/JSContext.h" #include "vm/RegExpObject.h" #include "vm/SavedFrame.h" diff --git a/js/src/vm/Symbol.h b/js/src/vm/Symbol.h index b5c195a6c98e..0af6597c4caa 100644 --- a/js/src/vm/Symbol.h +++ b/js/src/vm/Symbol.h @@ -11,11 +11,11 @@ #include -#include "jsalloc.h" #include "jsapi.h" #include "gc/Barrier.h" #include "gc/Tracer.h" +#include "js/AllocPolicy.h" #include "js/GCHashTable.h" #include "js/RootingAPI.h" #include "js/TypeDecls.h" diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp index e9ec8c1e2f29..a2aecf235761 100644 --- a/js/src/vm/TraceLogging.cpp +++ b/js/src/vm/TraceLogging.cpp @@ -14,10 +14,10 @@ #include #include "jsapi.h" -#include "jsprf.h" #include "jit/BaselineJIT.h" #include "jit/CompileWrappers.h" +#include "js/Printf.h" #include "threading/LockGuard.h" #include "vm/JSScript.h" #include "vm/Runtime.h" diff --git a/js/src/vm/TraceLogging.h b/js/src/vm/TraceLogging.h index 605664f394c9..8646572f629e 100644 --- a/js/src/vm/TraceLogging.h +++ b/js/src/vm/TraceLogging.h @@ -11,8 +11,7 @@ #include "mozilla/LinkedList.h" #include "mozilla/MemoryReporting.h" -#include "jsalloc.h" - +#include "js/AllocPolicy.h" #include "js/HashTable.h" #include "js/TypeDecls.h" #include "js/Vector.h" diff --git a/js/src/vm/TraceLoggingTypes.h b/js/src/vm/TraceLoggingTypes.h index eb0b03f71535..d0522dd2b6b3 100644 --- a/js/src/vm/TraceLoggingTypes.h +++ b/js/src/vm/TraceLoggingTypes.h @@ -7,9 +7,10 @@ #ifndef TraceLoggingTypes_h #define TraceLoggingTypes_h -#include "jsalloc.h" #include "jsstr.h" +#include "js/AllocPolicy.h" + // Tree items, meaning they have a start and stop and form a nested tree. #define TRACELOGGER_TREE_ITEMS(_) \ _(AnnotateScripts) \ diff --git a/js/src/vm/TypeInference.cpp b/js/src/vm/TypeInference.cpp index 21eac0384d8d..dda32cf27df2 100644 --- a/js/src/vm/TypeInference.cpp +++ b/js/src/vm/TypeInference.cpp @@ -13,7 +13,6 @@ #include "mozilla/Sprintf.h" #include "jsapi.h" -#include "jsprf.h" #include "jsstr.h" #include "gc/HashUtil.h" @@ -24,6 +23,7 @@ #include "jit/JitCompartment.h" #include "jit/OptimizationTracking.h" #include "js/MemoryMetrics.h" +#include "js/Printf.h" #include "vm/HelperThreads.h" #include "vm/JSContext.h" #include "vm/JSObject.h" diff --git a/js/src/vm/TypeInference.h b/js/src/vm/TypeInference.h index 07155d3ece36..405fbb5bb21c 100644 --- a/js/src/vm/TypeInference.h +++ b/js/src/vm/TypeInference.h @@ -11,7 +11,6 @@ #include "mozilla/MemoryReporting.h" -#include "jsalloc.h" #include "jsfriendapi.h" #include "jstypes.h" @@ -19,6 +18,7 @@ #include "ds/LifoAlloc.h" #include "gc/Barrier.h" #include "jit/IonTypes.h" +#include "js/AllocPolicy.h" #include "js/UbiNode.h" #include "js/Utility.h" #include "js/Vector.h" diff --git a/js/src/vm/TypedArrayObject.cpp b/js/src/vm/TypedArrayObject.cpp index 4eda04f61188..76cea375cef3 100644 --- a/js/src/vm/TypedArrayObject.cpp +++ b/js/src/vm/TypedArrayObject.cpp @@ -22,7 +22,6 @@ #include "jsnum.h" #include "jstypes.h" #include "jsutil.h" -#include "jswrapper.h" #include "builtin/DataViewObject.h" #include "builtin/TypedObjectConstants.h" @@ -30,6 +29,7 @@ #include "gc/Marking.h" #include "jit/InlinableNatives.h" #include "js/Conversions.h" +#include "js/Wrapper.h" #include "util/Windows.h" #include "vm/ArrayBufferObject.h" #include "vm/GlobalObject.h" diff --git a/js/src/vm/WrapperObject.h b/js/src/vm/WrapperObject.h index b278dff8719a..3d517025f440 100644 --- a/js/src/vm/WrapperObject.h +++ b/js/src/vm/WrapperObject.h @@ -7,8 +7,7 @@ #ifndef vm_WrapperObject_h #define vm_WrapperObject_h -#include "jswrapper.h" - +#include "js/Wrapper.h" #include "vm/JSObject.h" #include "vm/ProxyObject.h" diff --git a/js/src/wasm/AsmJS.cpp b/js/src/wasm/AsmJS.cpp index 87bc2bd40de0..7cd106e90588 100644 --- a/js/src/wasm/AsmJS.cpp +++ b/js/src/wasm/AsmJS.cpp @@ -24,16 +24,16 @@ #include "mozilla/Unused.h" #include "jsmath.h" -#include "jsprf.h" #include "jsstr.h" #include "jsutil.h" -#include "jswrapper.h" #include "builtin/SIMD.h" #include "frontend/Parser.h" #include "gc/Policy.h" #include "jit/AtomicOperations.h" #include "js/MemoryMetrics.h" +#include "js/Printf.h" +#include "js/Wrapper.h" #include "vm/ErrorReporting.h" #include "vm/SelfHosting.h" #include "vm/StringBuffer.h" diff --git a/js/src/wasm/WasmBinaryIterator.h b/js/src/wasm/WasmBinaryIterator.h index f25715bf97d8..a06b6bde7d32 100644 --- a/js/src/wasm/WasmBinaryIterator.h +++ b/js/src/wasm/WasmBinaryIterator.h @@ -21,9 +21,8 @@ #include "mozilla/Poison.h" -#include "jsprf.h" - #include "jit/AtomicOp.h" +#include "js/Printf.h" #include "wasm/WasmValidate.h" namespace js { diff --git a/js/src/wasm/WasmBinaryToText.cpp b/js/src/wasm/WasmBinaryToText.cpp index 5208687dfc3c..4168096d3762 100644 --- a/js/src/wasm/WasmBinaryToText.cpp +++ b/js/src/wasm/WasmBinaryToText.cpp @@ -19,8 +19,8 @@ #include "wasm/WasmBinaryToText.h" #include "jsnum.h" -#include "jsprf.h" +#include "js/Printf.h" #include "vm/ArrayBufferObject.h" #include "vm/StringBuffer.h" #include "wasm/WasmAST.h" diff --git a/js/src/wasm/WasmCompile.cpp b/js/src/wasm/WasmCompile.cpp index 14417efe0744..4cdbb051c22a 100644 --- a/js/src/wasm/WasmCompile.cpp +++ b/js/src/wasm/WasmCompile.cpp @@ -21,9 +21,8 @@ #include "mozilla/Maybe.h" #include "mozilla/Unused.h" -#include "jsprf.h" - #include "jit/ProcessExecutableMemory.h" +#include "js/Printf.h" #include "wasm/WasmBaselineCompile.h" #include "wasm/WasmBinaryIterator.h" #include "wasm/WasmGenerator.h" diff --git a/js/src/wasm/WasmJS.cpp b/js/src/wasm/WasmJS.cpp index a3333c049e81..9bd3be0d9477 100644 --- a/js/src/wasm/WasmJS.cpp +++ b/js/src/wasm/WasmJS.cpp @@ -23,12 +23,11 @@ #include "mozilla/Maybe.h" #include "mozilla/RangedPtr.h" -#include "jsprf.h" - #include "builtin/Promise.h" #include "gc/FreeOp.h" #include "jit/AtomicOperations.h" #include "jit/JitOptions.h" +#include "js/Printf.h" #include "vm/Interpreter.h" #include "vm/String.h" #include "vm/StringBuffer.h" diff --git a/js/src/wasm/WasmTextToBinary.cpp b/js/src/wasm/WasmTextToBinary.cpp index 93c9d87166a9..0db46cf795db 100644 --- a/js/src/wasm/WasmTextToBinary.cpp +++ b/js/src/wasm/WasmTextToBinary.cpp @@ -23,12 +23,12 @@ #include "mozilla/Maybe.h" #include "jsnum.h" -#include "jsprf.h" #include "jsstr.h" #include "ds/LifoAlloc.h" #include "js/CharacterEncoding.h" #include "js/HashTable.h" +#include "js/Printf.h" #include "util/DoubleToString.h" #include "wasm/WasmAST.h" #include "wasm/WasmTypes.h" diff --git a/js/src/wasm/WasmValidate.cpp b/js/src/wasm/WasmValidate.cpp index d738251b71db..bb609a4cc0b8 100644 --- a/js/src/wasm/WasmValidate.cpp +++ b/js/src/wasm/WasmValidate.cpp @@ -20,9 +20,8 @@ #include "mozilla/CheckedInt.h" -#include "jsprf.h" - #include "jit/JitOptions.h" +#include "js/Printf.h" #include "vm/JSCompartment.h" #include "vm/JSContext.h" #include "wasm/WasmBinaryIterator.h" diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index 13b34f50942d..da7c97425720 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -17,6 +17,7 @@ #endif #include "jsapi.h" +#include "js/Printf.h" #include "nsCOMPtr.h" #include "nsAutoPtr.h" #include "nsIComponentManager.h" @@ -30,7 +31,6 @@ #include "nsIFileURL.h" #include "nsIJARURI.h" #include "nsNetUtil.h" -#include "jsprf.h" #include "nsJSPrincipals.h" #include "nsJSUtils.h" #include "xpcprivate.h" diff --git a/js/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/xpconnect/loader/mozJSSubScriptLoader.cpp index dd4c879ec5f8..3b9f1aec47fa 100644 --- a/js/xpconnect/loader/mozJSSubScriptLoader.cpp +++ b/js/xpconnect/loader/mozJSSubScriptLoader.cpp @@ -19,7 +19,7 @@ #include "jsapi.h" #include "jsfriendapi.h" #include "xpcprivate.h" // For xpc::OptionsBase -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/ToJSValue.h" diff --git a/js/xpconnect/src/ExportHelpers.cpp b/js/xpconnect/src/ExportHelpers.cpp index 9798f315b688..4cda826c6834 100644 --- a/js/xpconnect/src/ExportHelpers.cpp +++ b/js/xpconnect/src/ExportHelpers.cpp @@ -8,8 +8,8 @@ #include "WrapperFactory.h" #include "AccessCheck.h" #include "jsfriendapi.h" -#include "jswrapper.h" #include "js/Proxy.h" +#include "js/Wrapper.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/BlobBinding.h" #include "mozilla/dom/File.h" diff --git a/js/xpconnect/src/XPCCallContext.cpp b/js/xpconnect/src/XPCCallContext.cpp index dbbd50071746..67081e2dfc1d 100644 --- a/js/xpconnect/src/XPCCallContext.cpp +++ b/js/xpconnect/src/XPCCallContext.cpp @@ -7,8 +7,8 @@ /* Call context. */ #include "xpcprivate.h" -#include "jswrapper.h" #include "jsfriendapi.h" +#include "js/Wrapper.h" #include "nsContentUtils.h" using namespace mozilla; diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp index 3a58be844ca1..8e53ed8631da 100644 --- a/js/xpconnect/src/XPCConvert.cpp +++ b/js/xpconnect/src/XPCConvert.cpp @@ -22,7 +22,6 @@ #include "jsapi.h" #include "jsfriendapi.h" #include "js/CharacterEncoding.h" -#include "jsprf.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/DOMException.h" diff --git a/js/xpconnect/src/XPCDebug.cpp b/js/xpconnect/src/XPCDebug.cpp index 59f1244572cb..7855234e1882 100644 --- a/js/xpconnect/src/XPCDebug.cpp +++ b/js/xpconnect/src/XPCDebug.cpp @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "xpcprivate.h" -#include "jsprf.h" #include "nsThreadUtils.h" #include "nsContentUtils.h" diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp index 479c97bb8476..0fe8f6c018a3 100644 --- a/js/xpconnect/src/XPCJSContext.cpp +++ b/js/xpconnect/src/XPCJSContext.cpp @@ -38,7 +38,6 @@ #include "nsCycleCollectionNoteRootCallback.h" #include "nsCycleCollector.h" #include "jsapi.h" -#include "jsprf.h" #include "js/MemoryMetrics.h" #include "mozilla/dom/GeneratedAtomList.h" #include "mozilla/dom/BindingUtils.h" diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp index 933617efcc09..4301dd3dc561 100644 --- a/js/xpconnect/src/XPCJSRuntime.cpp +++ b/js/xpconnect/src/XPCJSRuntime.cpp @@ -39,7 +39,6 @@ #include "nsCycleCollectionNoteRootCallback.h" #include "nsCycleCollector.h" #include "jsapi.h" -#include "jsprf.h" #include "js/MemoryMetrics.h" #include "mozilla/dom/GeneratedAtomList.h" #include "mozilla/dom/BindingUtils.h" diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index a6050468dfc3..5af0ceab967b 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -7,7 +7,7 @@ #include "nsXULAppAPI.h" #include "jsapi.h" #include "jsfriendapi.h" -#include "jsprf.h" +#include "js/Printf.h" #include "mozilla/ChaosMode.h" #include "mozilla/dom/ScriptSettings.h" #include "mozilla/Preferences.h" diff --git a/js/xpconnect/src/XPCThrower.cpp b/js/xpconnect/src/XPCThrower.cpp index 9a33e85eadeb..cca3fe0668b3 100644 --- a/js/xpconnect/src/XPCThrower.cpp +++ b/js/xpconnect/src/XPCThrower.cpp @@ -8,7 +8,7 @@ #include "xpcprivate.h" #include "XPCWrapper.h" -#include "jsprf.h" +#include "js/Printf.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/DOMException.h" #include "mozilla/dom/Exceptions.h" diff --git a/js/xpconnect/src/XPCVariant.cpp b/js/xpconnect/src/XPCVariant.cpp index afffd9e253d3..0e766441615b 100644 --- a/js/xpconnect/src/XPCVariant.cpp +++ b/js/xpconnect/src/XPCVariant.cpp @@ -11,8 +11,7 @@ #include "xpcprivate.h" #include "jsfriendapi.h" -#include "jsprf.h" -#include "jswrapper.h" +#include "js/Wrapper.h" using namespace JS; using namespace mozilla; diff --git a/js/xpconnect/src/XPCWrappedJS.cpp b/js/xpconnect/src/XPCWrappedJS.cpp index afef14cbeeb0..7c2438580125 100644 --- a/js/xpconnect/src/XPCWrappedJS.cpp +++ b/js/xpconnect/src/XPCWrappedJS.cpp @@ -7,7 +7,6 @@ /* Class that wraps JS objects to appear as XPCOM objects. */ #include "xpcprivate.h" -#include "jsprf.h" #include "mozilla/DeferredFinalize.h" #include "mozilla/Sprintf.h" #include "mozilla/jsipc/CrossProcessObjectWrappers.h" diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp index 5ea497e6ea45..e510844497b0 100644 --- a/js/xpconnect/src/XPCWrappedJSClass.cpp +++ b/js/xpconnect/src/XPCWrappedJSClass.cpp @@ -7,7 +7,7 @@ /* Sharable code and data for wrapper around JSObjects. */ #include "xpcprivate.h" -#include "jsprf.h" +#include "js/Printf.h" #include "nsArrayEnumerator.h" #include "nsINamed.h" #include "nsIScriptError.h" diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp index f45d742100da..fd992eb22465 100644 --- a/js/xpconnect/src/XPCWrappedNative.cpp +++ b/js/xpconnect/src/XPCWrappedNative.cpp @@ -10,7 +10,7 @@ #include "mozilla/jsipc/CrossProcessObjectWrappers.h" #include "nsWrapperCacheInlines.h" #include "XPCLog.h" -#include "jsprf.h" +#include "js/Printf.h" #include "jsfriendapi.h" #include "AccessCheck.h" #include "WrapperFactory.h" diff --git a/js/xpconnect/src/XPCWrappedNativeInfo.cpp b/js/xpconnect/src/XPCWrappedNativeInfo.cpp index 84e312bf9341..e95c1053e8da 100644 --- a/js/xpconnect/src/XPCWrappedNativeInfo.cpp +++ b/js/xpconnect/src/XPCWrappedNativeInfo.cpp @@ -7,7 +7,7 @@ /* Manage the shared info about interfaces for use by wrappedNatives. */ #include "xpcprivate.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/MemoryReporting.h" #include "mozilla/XPTInterfaceInfoManager.h" diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp index e56be2929b13..c192fc924e71 100644 --- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp +++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp @@ -8,12 +8,12 @@ #include "xpcprivate.h" #include "xpc_make_class.h" -#include "jsprf.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/Preferences.h" #include "nsIAddonInterposition.h" #include "AddonWrapper.h" #include "js/Class.h" +#include "js/Printf.h" using namespace mozilla; using namespace JS; diff --git a/js/xpconnect/wrappers/AccessCheck.h b/js/xpconnect/wrappers/AccessCheck.h index 2fcbf12e51b7..44fc738bddd7 100644 --- a/js/xpconnect/wrappers/AccessCheck.h +++ b/js/xpconnect/wrappers/AccessCheck.h @@ -7,8 +7,8 @@ #ifndef __AccessCheck_h__ #define __AccessCheck_h__ -#include "jswrapper.h" #include "js/Id.h" +#include "js/Wrapper.h" #include "nsString.h" class nsIPrincipal; diff --git a/js/xpconnect/wrappers/AddonWrapper.h b/js/xpconnect/wrappers/AddonWrapper.h index 57d4d92af992..e548d342a6c1 100644 --- a/js/xpconnect/wrappers/AddonWrapper.h +++ b/js/xpconnect/wrappers/AddonWrapper.h @@ -11,7 +11,7 @@ #include "nsID.h" -#include "jswrapper.h" +#include "js/Wrapper.h" namespace xpc { diff --git a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp index 7c42f17e1a21..32422f1c2170 100644 --- a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp +++ b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp @@ -9,7 +9,7 @@ #include "AccessCheck.h" #include "xpcprivate.h" #include "jsapi.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "nsXULAppAPI.h" using namespace JS; diff --git a/js/xpconnect/wrappers/FilteringWrapper.h b/js/xpconnect/wrappers/FilteringWrapper.h index 6c9c2ceb2a59..32f3a83870f8 100644 --- a/js/xpconnect/wrappers/FilteringWrapper.h +++ b/js/xpconnect/wrappers/FilteringWrapper.h @@ -9,8 +9,8 @@ #include "XrayWrapper.h" #include "mozilla/Attributes.h" -#include "jswrapper.h" #include "js/CallNonGenericMethod.h" +#include "js/Wrapper.h" namespace JS { class AutoIdVector; diff --git a/js/xpconnect/wrappers/WaiveXrayWrapper.h b/js/xpconnect/wrappers/WaiveXrayWrapper.h index f43e0f1f4f90..247ebbbca155 100644 --- a/js/xpconnect/wrappers/WaiveXrayWrapper.h +++ b/js/xpconnect/wrappers/WaiveXrayWrapper.h @@ -9,7 +9,7 @@ #include "mozilla/Attributes.h" -#include "jswrapper.h" +#include "js/Wrapper.h" namespace xpc { diff --git a/js/xpconnect/wrappers/WrapperFactory.h b/js/xpconnect/wrappers/WrapperFactory.h index 122267830201..c5daf217f41a 100644 --- a/js/xpconnect/wrappers/WrapperFactory.h +++ b/js/xpconnect/wrappers/WrapperFactory.h @@ -7,7 +7,7 @@ #ifndef _xpc_WRAPPERFACTORY_H #define _xpc_WRAPPERFACTORY_H -#include "jswrapper.h" +#include "js/Wrapper.h" namespace xpc { diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp index bdf94c60d51f..eeac97b7c087 100644 --- a/js/xpconnect/wrappers/XrayWrapper.cpp +++ b/js/xpconnect/wrappers/XrayWrapper.cpp @@ -17,7 +17,6 @@ #include "xpcprivate.h" #include "jsapi.h" -#include "jsprf.h" #include "nsJSUtils.h" #include "nsPrintfCString.h" @@ -44,14 +43,14 @@ using namespace XrayUtils; static_assert(JSProto_URIError - JSProto_Error == 7, "New prototype added in error object range"); #define AssertErrorObjectKeyInBounds(key) \ - static_assert(Between(key, JSProto_Error, JSProto_URIError), "We depend on jsprototypes.h ordering here"); + static_assert(Between(key, JSProto_Error, JSProto_URIError), "We depend on js/ProtoKey.h ordering here"); MOZ_FOR_EACH(AssertErrorObjectKeyInBounds, (), (JSProto_Error, JSProto_InternalError, JSProto_EvalError, JSProto_RangeError, JSProto_ReferenceError, JSProto_SyntaxError, JSProto_TypeError, JSProto_URIError)); static_assert(JSProto_Uint8ClampedArray - JSProto_Int8Array == 8, "New prototype added in typed array range"); #define AssertTypedArrayKeyInBounds(key) \ - static_assert(Between(key, JSProto_Int8Array, JSProto_Uint8ClampedArray), "We depend on jsprototypes.h ordering here"); + static_assert(Between(key, JSProto_Int8Array, JSProto_Uint8ClampedArray), "We depend on js/ProtoKey.h ordering here"); MOZ_FOR_EACH(AssertTypedArrayKeyInBounds, (), (JSProto_Int8Array, JSProto_Uint8Array, JSProto_Int16Array, JSProto_Uint16Array, JSProto_Int32Array, JSProto_Uint32Array, JSProto_Float32Array, JSProto_Float64Array, JSProto_Uint8ClampedArray)); diff --git a/js/xpconnect/wrappers/XrayWrapper.h b/js/xpconnect/wrappers/XrayWrapper.h index 090bf9cec1c0..e543ace167ba 100644 --- a/js/xpconnect/wrappers/XrayWrapper.h +++ b/js/xpconnect/wrappers/XrayWrapper.h @@ -11,8 +11,8 @@ #include "WrapperFactory.h" -#include "jswrapper.h" #include "js/Proxy.h" +#include "js/Wrapper.h" // Slot where Xray functions for Web IDL methods store a pointer to // the Xray wrapper they're associated with. diff --git a/toolkit/components/mozintl/MozIntlHelper.cpp b/toolkit/components/mozintl/MozIntlHelper.cpp index a19d1d22bca6..dcf65a96ba14 100644 --- a/toolkit/components/mozintl/MozIntlHelper.cpp +++ b/toolkit/components/mozintl/MozIntlHelper.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "MozIntlHelper.h" -#include "jswrapper.h" +#include "js/Wrapper.h" #include "mozilla/ModuleUtils.h" #define MOZ_MOZINTLHELPER_CID \ diff --git a/xpcom/base/CycleCollectedJSContext.cpp b/xpcom/base/CycleCollectedJSContext.cpp index 64c963ca1e1e..13bbdcf295b3 100644 --- a/xpcom/base/CycleCollectedJSContext.cpp +++ b/xpcom/base/CycleCollectedJSContext.cpp @@ -24,7 +24,6 @@ #include "mozilla/dom/PromiseBinding.h" #include "mozilla/dom/PromiseDebugging.h" #include "mozilla/dom/ScriptSettings.h" -#include "jsprf.h" #include "js/Debug.h" #include "js/GCAPI.h" #include "js/Utility.h" diff --git a/xpcom/base/CycleCollectedJSRuntime.cpp b/xpcom/base/CycleCollectedJSRuntime.cpp index 1a9343a65e9e..c61e883219db 100644 --- a/xpcom/base/CycleCollectedJSRuntime.cpp +++ b/xpcom/base/CycleCollectedJSRuntime.cpp @@ -73,7 +73,6 @@ #include "mozilla/dom/PromiseBinding.h" #include "mozilla/dom/PromiseDebugging.h" #include "mozilla/dom/ScriptSettings.h" -#include "jsprf.h" #include "js/Debug.h" #include "js/GCAPI.h" #include "nsContentUtils.h"