Bug 1439063 - Part 1: Move several public headers from js/src to js/public. r=jandem.

js/src/jsalloc.h -> js/public/AllocPolicy.h
jsalloc.cpp -> js/src/util/AllocPolicy.cpp
jsbytecode.h -> merge into js/public/TypeDecls.h
jsprf.h -> js/public/Printf.h
jsprf.cpp -> js/src/util/Printf.cpp
jsprototypes.h -> public/ProtoKey.h
jswrapper.h -> js/Wrapper.h

--HG--
rename : js/src/jsalloc.h => js/public/AllocPolicy.h
rename : js/src/jsprf.h => js/public/Printf.h
rename : js/src/jsprototypes.h => js/public/ProtoKey.h
rename : js/src/jswrapper.h => js/public/Wrapper.h
rename : js/src/jsalloc.cpp => js/src/util/AllocPolicy.cpp
rename : js/src/jsprf.cpp => js/src/util/Printf.cpp
extra : rebase_source : 98b16d94c469202eab0303a8da844f1d0b6aa809
extra : amend_source : e0b16c1077226d6fe240f4d7096537f93b43f2b8
extra : histedit_source : d94e0ba7904a7d66742c7fac43f638aaec4fa4e5

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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 {

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"

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"

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"

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"
 

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"

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"

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;

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"

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 {

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"

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 */

js/public/HashTable.h

@@ -56,7 +56,7 @@ using Generation = mozilla::Opaque<uint64_t>;
 // 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

js/public/MemoryMetrics.h

@@ -16,9 +16,9 @@
 
 #include <string.h>
 
-#include "jsalloc.h"
 #include "jspubtd.h"
 
+#include "js/AllocPolicy.h"
 #include "js/HashTable.h"
 #include "js/TracingAPI.h"
 #include "js/Utility.h"

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 */

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"

js/public/ProfilingStack.h

@@ -10,8 +10,8 @@
 #include <algorithm>
 #include <stdint.h>
 
-#include "jsbytecode.h"
 #include "jstypes.h"
+
 #include "js/TypeDecls.h"
 #include "js/Utility.h"
 

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 */

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"

js/public/TypeDecls.h

@@ -22,6 +22,8 @@
 
 #include "js-config.h"
 
+typedef uint8_t jsbytecode;
+
 class JSAtom;
 struct JSCompartment;
 struct JSContext;

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"

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"

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"
 

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 */

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 {

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"

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

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"

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"

js/src/builtin/intl/SharedIntlData.h

@@ -11,8 +11,7 @@
 
 #include <stddef.h>
 
-#include "jsalloc.h"
-
+#include "js/AllocPolicy.h"
 #include "js/CharacterEncoding.h"
 #include "js/GCAPI.h"
 #include "js/GCHashTable.h"

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"

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"

js/src/ds/Bitmap.h

@@ -9,8 +9,7 @@
 
 #include <algorithm>
 
-#include "jsalloc.h"
-
+#include "js/AllocPolicy.h"
 #include "js/HashTable.h"
 #include "js/Vector.h"
 

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 {

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"
 

js/src/fuzz-tests/tests.cpp

@@ -8,8 +8,7 @@
 
 #include <stdio.h>
 
-#include "jsalloc.h"
-
+#include "js/AllocPolicy.h"
 #include "js/Initialization.h"
 #include "js/RootingAPI.h"
 #include "vm/JSContext.h"

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
 

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"

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"

js/src/gc/RootMarking.cpp

@@ -8,7 +8,6 @@
 # include <valgrind/memcheck.h>
 #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"

js/src/gc/Statistics.cpp

@@ -16,11 +16,11 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#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"

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"

js/src/gc/StoreBuffer.h

@@ -13,11 +13,10 @@
 
 #include <algorithm>
 
-#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 {

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"

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 <valgrind/memcheck.h>
-#endif
-
 #include "mozilla/DebugOnly.h"
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/Sprintf.h"
 
-#include "jsprf.h"
+#ifdef MOZ_VALGRIND
+# include <valgrind/memcheck.h>
+#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"

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"

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;

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"

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"

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 {

js/src/jit/ExecutableAllocator.h

@@ -35,18 +35,17 @@
 #include <limits>
 #include <stddef.h> // 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"

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"

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"

js/src/jit/IonOptimizationLevels.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/EnumeratedArray.h"
 
-#include "jsbytecode.h"
 #include "jstypes.h"
 
 #include "jit/JitOptions.h"

js/src/jit/JitSpewer.cpp

@@ -16,16 +16,12 @@
 #else
 #include <unistd.h>
 #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"
 

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"
 

js/src/jit/LIR.cpp

@@ -10,11 +10,10 @@
 
 #include <ctype.h>
 
-#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;

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"

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"

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;

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 {
 

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.

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 {
 

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"
 

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;
 

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"

js/src/jsapi-tests/testParseJSON.cpp

@@ -8,9 +8,9 @@
 #include <limits>
 #include <string.h>
 
-#include "jsprf.h"
 #include "jsstr.h"
 
+#include "js/Printf.h"
 #include "jsapi-tests/tests.h"
 
 using namespace js;

js/src/jsapi-tests/testPrintf.cpp

@@ -10,7 +10,7 @@
 #include <cfloat>
 #include <stdarg.h>
 
-#include "jsprf.h"
+#include "js/Printf.h"
 
 #include "jsapi-tests/tests.h"
 

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"
 

js/src/jsapi-tests/tests.h

@@ -15,9 +15,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "jsalloc.h"
-
 #include "gc/GC.h"
+#include "js/AllocPolicy.h"
 #include "js/Vector.h"
 #include "vm/JSContext.h"
 

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"

js/src/jsapi.h

@@ -23,9 +23,9 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "jsalloc.h"
 #include "jspubtd.h"
 
+#include "js/AllocPolicy.h"
 #include "js/CallArgs.h"
 #include "js/CharacterEncoding.h"
 #include "js/Class.h"

js/src/jsbytecode.h

@@ -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 <stdint.h>
-
-typedef uint8_t jsbytecode;
-
-#endif /* jsbytecode_h */

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"

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"

js/src/jsfriendapi.cpp

@@ -10,15 +10,14 @@
 
 #include <stdint.h>
 
-#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"

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

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"

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',

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"

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"
 

js/src/proxy/Proxy.cpp

@@ -11,8 +11,8 @@
 #include <string.h>
 
 #include "jsapi.h"
-#include "jswrapper.h"
 
+#include "js/Wrapper.h"
 #include "proxy/DeadObjectProxy.h"
 #include "proxy/ScriptedProxyHandler.h"
 #include "vm/JSContext.h"

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;

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"

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"

js/src/shell/js.cpp

@@ -49,13 +49,12 @@
 # include <sys/wait.h>
 # include <unistd.h>
 #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"

js/src/shell/jsoptparse.h

@@ -9,9 +9,9 @@
 
 #include <stdio.h>
 
-#include "jsalloc.h"
 #include "jsutil.h"
 
+#include "js/AllocPolicy.h"
 #include "js/Vector.h"
 
 namespace js {

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"
 

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

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;