diff --git a/cmake/tools/SetupWebKit.cmake b/cmake/tools/SetupWebKit.cmake index b572088db5..b6c79de049 100644 --- a/cmake/tools/SetupWebKit.cmake +++ b/cmake/tools/SetupWebKit.cmake @@ -2,7 +2,7 @@ option(WEBKIT_VERSION "The version of WebKit to use") option(WEBKIT_LOCAL "If a local version of WebKit should be used instead of downloading") if(NOT WEBKIT_VERSION) - set(WEBKIT_VERSION 1098cc50652ab1eab171f58f7669e19ca6c276ae) + set(WEBKIT_VERSION 642e2252f6298387edb6d2f991a0408fd0320466) endif() string(SUBSTRING ${WEBKIT_VERSION} 0 16 WEBKIT_VERSION_PREFIX) diff --git a/src/bun.js/bindings/BunClientData.h b/src/bun.js/bindings/BunClientData.h index c1901cf70a..7820bf50cc 100644 --- a/src/bun.js/bindings/BunClientData.h +++ b/src/bun.js/bindings/BunClientData.h @@ -36,7 +36,7 @@ enum class UseCustomHeapCellType { Yes, class JSHeapData { WTF_MAKE_NONCOPYABLE(JSHeapData); - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(JSHeapData); friend class JSVMClientData; public: @@ -77,7 +77,7 @@ DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(JSVMClientData); class JSVMClientData : public JSC::VM::ClientData { WTF_MAKE_NONCOPYABLE(JSVMClientData); - WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(JSVMClientData); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(JSVMClientData, JSVMClientData); public: explicit JSVMClientData(JSC::VM&, RefPtr); diff --git a/src/bun.js/bindings/BunGCOutputConstraint.h b/src/bun.js/bindings/BunGCOutputConstraint.h index eaf4ef9ecd..b19d4c37a0 100644 --- a/src/bun.js/bindings/BunGCOutputConstraint.h +++ b/src/bun.js/bindings/BunGCOutputConstraint.h @@ -36,7 +36,7 @@ namespace WebCore { class JSHeapData; class DOMGCOutputConstraint : public JSC::MarkingConstraint { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(DOMEGCOutputConstraint); public: DOMGCOutputConstraint(JSC::VM&, JSHeapData&); diff --git a/src/bun.js/bindings/ConsoleObject.h b/src/bun.js/bindings/ConsoleObject.h index 60608f9b8c..52032f44c3 100644 --- a/src/bun.js/bindings/ConsoleObject.h +++ b/src/bun.js/bindings/ConsoleObject.h @@ -20,7 +20,7 @@ using InspectorScriptProfilerAgent = Inspector::InspectorScriptProfilerAgent; using namespace JSC; class ConsoleObject final : public JSC::ConsoleClient { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(ConsoleObject); public: ~ConsoleObject() final {} diff --git a/src/bun.js/bindings/DOMFormData.h b/src/bun.js/bindings/DOMFormData.h index 8a25f0b60a..c8ceab1817 100644 --- a/src/bun.js/bindings/DOMFormData.h +++ b/src/bun.js/bindings/DOMFormData.h @@ -46,7 +46,7 @@ class HTMLFormElement; DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(DOMFormData); class DOMFormData : public RefCounted, public ContextDestructionObserver { - WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(DOMFormData); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(DOMFormData, DOMFormData); public: using FormDataEntryValue = std::variant>; diff --git a/src/bun.js/bindings/ErrorStackTrace.h b/src/bun.js/bindings/ErrorStackTrace.h index 617e416b71..3df2c966c0 100644 --- a/src/bun.js/bindings/ErrorStackTrace.h +++ b/src/bun.js/bindings/ErrorStackTrace.h @@ -132,7 +132,7 @@ public: } bool isConstructor() const { - return m_codeBlock && (JSC::CodeForConstruct == m_codeBlock->specializationKind()); + return m_codeBlock && (JSC::CodeSpecializationKind::CodeForConstruct == m_codeBlock->specializationKind()); } private: diff --git a/src/bun.js/bindings/InspectorBunFrontendDevServerAgent.cpp b/src/bun.js/bindings/InspectorBunFrontendDevServerAgent.cpp index 071f40521c..81039a09de 100644 --- a/src/bun.js/bindings/InspectorBunFrontendDevServerAgent.cpp +++ b/src/bun.js/bindings/InspectorBunFrontendDevServerAgent.cpp @@ -31,7 +31,7 @@ InspectorBunFrontendDevServerAgent::InspectorBunFrontendDevServerAgent(JSC::JSGl InspectorBunFrontendDevServerAgent::~InspectorBunFrontendDevServerAgent() = default; -void InspectorBunFrontendDevServerAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) +void InspectorBunFrontendDevServerAgent::didCreateFrontendAndBackend() { } diff --git a/src/bun.js/bindings/InspectorBunFrontendDevServerAgent.h b/src/bun.js/bindings/InspectorBunFrontendDevServerAgent.h index ec4aa23f29..2ba0e33284 100644 --- a/src/bun.js/bindings/InspectorBunFrontendDevServerAgent.h +++ b/src/bun.js/bindings/InspectorBunFrontendDevServerAgent.h @@ -25,7 +25,7 @@ public: virtual ~InspectorBunFrontendDevServerAgent() final; // InspectorAgentBase - virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) final; + virtual void didCreateFrontendAndBackend() final; virtual void willDestroyFrontendAndBackend(DisconnectReason) final; // BunFrontendDevServerBackendDispatcherHandler diff --git a/src/bun.js/bindings/InspectorHTTPServerAgent.cpp b/src/bun.js/bindings/InspectorHTTPServerAgent.cpp index 9d40ff74ba..cc376d13ac 100644 --- a/src/bun.js/bindings/InspectorHTTPServerAgent.cpp +++ b/src/bun.js/bindings/InspectorHTTPServerAgent.cpp @@ -38,7 +38,7 @@ InspectorHTTPServerAgent::~InspectorHTTPServerAgent() } } -void InspectorHTTPServerAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) +void InspectorHTTPServerAgent::didCreateFrontendAndBackend() { } diff --git a/src/bun.js/bindings/InspectorHTTPServerAgent.h b/src/bun.js/bindings/InspectorHTTPServerAgent.h index 3ae1827c6d..432a5fc877 100644 --- a/src/bun.js/bindings/InspectorHTTPServerAgent.h +++ b/src/bun.js/bindings/InspectorHTTPServerAgent.h @@ -28,7 +28,7 @@ public: virtual ~InspectorHTTPServerAgent(); // InspectorAgentBase - virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) final; + virtual void didCreateFrontendAndBackend() final; virtual void willDestroyFrontendAndBackend(DisconnectReason) final; // HTTPServerBackendDispatcherHandler diff --git a/src/bun.js/bindings/InspectorLifecycleAgent.cpp b/src/bun.js/bindings/InspectorLifecycleAgent.cpp index 6dae95566d..ceaf52a491 100644 --- a/src/bun.js/bindings/InspectorLifecycleAgent.cpp +++ b/src/bun.js/bindings/InspectorLifecycleAgent.cpp @@ -61,7 +61,7 @@ InspectorLifecycleAgent::~InspectorLifecycleAgent() } } -void InspectorLifecycleAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) +void InspectorLifecycleAgent::didCreateFrontendAndBackend() { } diff --git a/src/bun.js/bindings/InspectorLifecycleAgent.h b/src/bun.js/bindings/InspectorLifecycleAgent.h index 28cfc79562..d598e7013b 100644 --- a/src/bun.js/bindings/InspectorLifecycleAgent.h +++ b/src/bun.js/bindings/InspectorLifecycleAgent.h @@ -25,7 +25,7 @@ public: virtual ~InspectorLifecycleAgent(); // InspectorAgentBase - virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) final; + virtual void didCreateFrontendAndBackend() final; virtual void willDestroyFrontendAndBackend(DisconnectReason) final; // LifecycleReporterBackendDispatcherHandler diff --git a/src/bun.js/bindings/InspectorTestReporterAgent.cpp b/src/bun.js/bindings/InspectorTestReporterAgent.cpp index 7543dde846..ff8de98807 100644 --- a/src/bun.js/bindings/InspectorTestReporterAgent.cpp +++ b/src/bun.js/bindings/InspectorTestReporterAgent.cpp @@ -109,7 +109,7 @@ InspectorTestReporterAgent::~InspectorTestReporterAgent() } } -void InspectorTestReporterAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) +void InspectorTestReporterAgent::didCreateFrontendAndBackend() { } diff --git a/src/bun.js/bindings/InspectorTestReporterAgent.h b/src/bun.js/bindings/InspectorTestReporterAgent.h index 3f5b22d0e3..b97bd89dcf 100644 --- a/src/bun.js/bindings/InspectorTestReporterAgent.h +++ b/src/bun.js/bindings/InspectorTestReporterAgent.h @@ -25,7 +25,7 @@ public: virtual ~InspectorTestReporterAgent(); // InspectorAgentBase - virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) final; + virtual void didCreateFrontendAndBackend() final; virtual void willDestroyFrontendAndBackend(DisconnectReason) final; // TestReporterBackendDispatcherHandler diff --git a/src/bun.js/bindings/JSCommonJSModule.cpp b/src/bun.js/bindings/JSCommonJSModule.cpp index 2b469c502f..c0c740ec02 100644 --- a/src/bun.js/bindings/JSCommonJSModule.cpp +++ b/src/bun.js/bindings/JSCommonJSModule.cpp @@ -123,17 +123,20 @@ static bool evaluateCommonJSModuleOnce(JSC::VM& vm, Zig::GlobalObject* globalObj JSFunction* resolveFunction = nullptr; JSFunction* requireFunction = nullptr; const auto initializeModuleObject = [&]() { + SourceCode resolveSourceCode = makeSource("resolve"_s, SourceOrigin(), SourceTaintedOrigin::Untainted); resolveFunction = JSC::JSBoundFunction::create(vm, globalObject, globalObject->requireResolveFunctionUnbound(), moduleObject->filename(), - ArgList(), 1, globalObject->commonStrings().resolveString(globalObject)); + ArgList(), 1, globalObject->commonStrings().resolveString(globalObject), resolveSourceCode); RETURN_IF_EXCEPTION(scope, ); + + SourceCode requireSourceCode = makeSource("require"_s, SourceOrigin(), SourceTaintedOrigin::Untainted); requireFunction = JSC::JSBoundFunction::create(vm, globalObject, globalObject->requireFunctionUnbound(), moduleObject, - ArgList(), 1, globalObject->commonStrings().requireString(globalObject)); + ArgList(), 1, globalObject->commonStrings().requireString(globalObject), requireSourceCode); RETURN_IF_EXCEPTION(scope, ); requireFunction->putDirect(vm, vm.propertyNames->resolve, resolveFunction, 0); RETURN_IF_EXCEPTION(scope, ); @@ -1549,18 +1552,22 @@ JSObject* JSCommonJSModule::createBoundRequireFunction(VM& vm, JSGlobalObject* l globalObject->CommonJSModuleObjectStructure(), filename, filename, dirname, SourceCode()); + SourceCode requireSourceCode = makeSource("require"_s, SourceOrigin(), SourceTaintedOrigin::Untainted); + JSFunction* requireFunction = JSC::JSBoundFunction::create(vm, globalObject, globalObject->requireFunctionUnbound(), moduleObject, - ArgList(), 1, globalObject->commonStrings().requireString(globalObject)); + ArgList(), 1, globalObject->commonStrings().requireString(globalObject), requireSourceCode); RETURN_IF_EXCEPTION(scope, nullptr); + SourceCode resolveSourceCode = makeSource("resolve"_s, SourceOrigin(), SourceTaintedOrigin::Untainted); + JSFunction* resolveFunction = JSC::JSBoundFunction::create(vm, globalObject, globalObject->requireResolveFunctionUnbound(), moduleObject->filename(), - ArgList(), 1, globalObject->commonStrings().resolveString(globalObject)); + ArgList(), 1, globalObject->commonStrings().resolveString(globalObject), resolveSourceCode); RETURN_IF_EXCEPTION(scope, nullptr); requireFunction->putDirect(vm, vm.propertyNames->resolve, resolveFunction, 0); diff --git a/src/bun.js/bindings/JSFFIFunction.cpp b/src/bun.js/bindings/JSFFIFunction.cpp index 0e5c296607..ee99be8c8e 100644 --- a/src/bun.js/bindings/JSFFIFunction.cpp +++ b/src/bun.js/bindings/JSFFIFunction.cpp @@ -39,7 +39,7 @@ class FFICallbackFunctionWrapper { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(FFICallbackFunctionWrapper); public: JSC::Strong m_function; diff --git a/src/bun.js/bindings/JSPropertyIterator.cpp b/src/bun.js/bindings/JSPropertyIterator.cpp index d9bd3ed52f..5b066bf933 100644 --- a/src/bun.js/bindings/JSPropertyIterator.cpp +++ b/src/bun.js/bindings/JSPropertyIterator.cpp @@ -33,7 +33,7 @@ public: return new JSPropertyIterator(vm, data); } - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(JSPropertyIterator); }; extern "C" JSPropertyIterator* Bun__JSPropertyIterator__create(JSC::JSGlobalObject* globalObject, JSC::EncodedJSValue encodedValue, size_t* count, bool own_properties_only, bool only_non_index_properties) diff --git a/src/bun.js/bindings/ScriptExecutionContext.h b/src/bun.js/bindings/ScriptExecutionContext.h index c17894f892..ed142b9649 100644 --- a/src/bun.js/bindings/ScriptExecutionContext.h +++ b/src/bun.js/bindings/ScriptExecutionContext.h @@ -41,7 +41,7 @@ DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(ScriptExecutionContext); #endif class ScriptExecutionContext : public CanMakeWeakPtr, public RefCounted { #if ENABLE(MALLOC_BREAKDOWN) - WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(ScriptExecutionContext); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(ScriptExecutionContext, ScriptExecutionContext); #else WTF_MAKE_TZONE_ALLOCATED(ScriptExecutionContext); #endif diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp index 91fc27aa34..74d0769383 100644 --- a/src/bun.js/bindings/ZigGlobalObject.cpp +++ b/src/bun.js/bindings/ZigGlobalObject.cpp @@ -4464,7 +4464,8 @@ static JSC::JSPromise* handleResponseOnStreamingAction(JSGlobalObject* lexicalGl JSC::JSLockHolder locker(vm); auto promise = JSC::JSPromise::create(vm, globalObject->promiseStructure()); - auto compiler = JSC::Wasm::StreamingCompiler::create(vm, mode, globalObject, promise, importObject); + auto sourceCode = makeSource("[wasm code]"_s, SourceOrigin(), SourceTaintedOrigin::Untainted); + auto compiler = JSC::Wasm::StreamingCompiler::create(vm, mode, globalObject, promise, importObject, sourceCode); // getBodyStreamOrBytesForWasmStreaming throws the proper exception. Since this is being // executed in a .then(...) callback, throwing is perfectly fine. diff --git a/src/bun.js/bindings/ZigSourceProvider.h b/src/bun.js/bindings/ZigSourceProvider.h index eddb638665..40362880f7 100644 --- a/src/bun.js/bindings/ZigSourceProvider.h +++ b/src/bun.js/bindings/ZigSourceProvider.h @@ -25,7 +25,7 @@ JSC::SourceID sourceIDForSourceURL(const WTF::String& sourceURL); void* sourceMappingForSourceURL(const WTF::String& sourceURL); JSC::SourceOrigin toSourceOrigin(const String& sourceURL, bool isBuiltin); class SourceProvider final : public JSC::SourceProvider { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(SourceProvider); using Base = JSC::SourceProvider; using BytecodeCacheGenerator = JSC::BytecodeCacheGenerator; using UnlinkedFunctionExecutable = JSC::UnlinkedFunctionExecutable; diff --git a/src/bun.js/bindings/sqlite/JSSQLStatement.cpp b/src/bun.js/bindings/sqlite/JSSQLStatement.cpp index 8a059c7e66..50a6364bdb 100644 --- a/src/bun.js/bindings/sqlite/JSSQLStatement.cpp +++ b/src/bun.js/bindings/sqlite/JSSQLStatement.cpp @@ -202,7 +202,7 @@ static inline JSC::JSValue jsBigIntFromSQLite(JSC::JSGlobalObject* globalObject, DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(VersionSqlite3); class VersionSqlite3 { - WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(VersionSqlite3); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(VersionSqlite3, VersionSqlite3); public: explicit VersionSqlite3(sqlite3* db) diff --git a/src/bun.js/bindings/webcore/DOMClientIsoSubspaces.h b/src/bun.js/bindings/webcore/DOMClientIsoSubspaces.h index cfe8e1f653..44063bfc74 100644 --- a/src/bun.js/bindings/webcore/DOMClientIsoSubspaces.h +++ b/src/bun.js/bindings/webcore/DOMClientIsoSubspaces.h @@ -10,7 +10,7 @@ using namespace JSC; class DOMClientIsoSubspaces { WTF_MAKE_NONCOPYABLE(DOMClientIsoSubspaces); - WTF_MAKE_FAST_ALLOCATED(DOMClientIsoSubspaces); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(DOMClientIsoSubspaces); public: DOMClientIsoSubspaces() = default; diff --git a/src/bun.js/bindings/webcore/DOMConstructors.h b/src/bun.js/bindings/webcore/DOMConstructors.h index e2feb50296..d83ef6cfe3 100644 --- a/src/bun.js/bindings/webcore/DOMConstructors.h +++ b/src/bun.js/bindings/webcore/DOMConstructors.h @@ -868,7 +868,7 @@ static constexpr unsigned numberOfDOMConstructors = numberOfDOMConstructorsBase class DOMConstructors { WTF_MAKE_NONCOPYABLE(DOMConstructors); - WTF_MAKE_FAST_ALLOCATED(DOMConstructors); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(DOMConstructors); public: using ConstructorArray = std::array, numberOfDOMConstructors>; diff --git a/src/bun.js/bindings/webcore/DOMIsoSubspaces.h b/src/bun.js/bindings/webcore/DOMIsoSubspaces.h index 9335b8a3f8..ee4b3c2147 100644 --- a/src/bun.js/bindings/webcore/DOMIsoSubspaces.h +++ b/src/bun.js/bindings/webcore/DOMIsoSubspaces.h @@ -11,7 +11,7 @@ using namespace JSC; class DOMIsoSubspaces { WTF_MAKE_NONCOPYABLE(DOMIsoSubspaces); - WTF_MAKE_FAST_ALLOCATED(DOMIsoSubspaces); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(DOMIsoSubspaces); public: DOMIsoSubspaces() = default; diff --git a/src/bun.js/bindings/webcore/DOMPromiseProxy.h b/src/bun.js/bindings/webcore/DOMPromiseProxy.h index 70d42122b7..765528460b 100644 --- a/src/bun.js/bindings/webcore/DOMPromiseProxy.h +++ b/src/bun.js/bindings/webcore/DOMPromiseProxy.h @@ -35,7 +35,7 @@ namespace WebCore { template class DOMPromiseProxy { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(DOMPromiseProxy); public: using Value = typename IDLType::StorageType; @@ -62,7 +62,7 @@ private: template<> class DOMPromiseProxy { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(DOMPromiseProxy); public: DOMPromiseProxy() = default; @@ -88,7 +88,7 @@ private: // FontFace and FontFaceSet. template class DOMPromiseProxyWithResolveCallback { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(DOMPromiseProxyWithResolveCallback); public: using ResolveCallback = Function; diff --git a/src/bun.js/bindings/webcore/EventContext.h b/src/bun.js/bindings/webcore/EventContext.h index 13f0469eb8..41214c9d3c 100644 --- a/src/bun.js/bindings/webcore/EventContext.h +++ b/src/bun.js/bindings/webcore/EventContext.h @@ -35,7 +35,7 @@ namespace WebCore { class EventContext { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(EventContext); public: using EventInvokePhase = EventTarget::EventInvokePhase; diff --git a/src/bun.js/bindings/webcore/EventNames.h b/src/bun.js/bindings/webcore/EventNames.h index 600be7daf6..dfd9feccd6 100644 --- a/src/bun.js/bindings/webcore/EventNames.h +++ b/src/bun.js/bindings/webcore/EventNames.h @@ -42,7 +42,7 @@ namespace WebCore { struct EventNames { WTF_MAKE_NONCOPYABLE(EventNames); - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(EventNames); public: #define DOM_EVENT_NAMES_DECLARE(name) const AtomString name##Event; diff --git a/src/bun.js/bindings/webcore/EventSender.h b/src/bun.js/bindings/webcore/EventSender.h index 246329841d..53bd9183e0 100644 --- a/src/bun.js/bindings/webcore/EventSender.h +++ b/src/bun.js/bindings/webcore/EventSender.h @@ -35,7 +35,7 @@ class Page; template class EventSender { WTF_MAKE_NONCOPYABLE(EventSender); - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(EventSender); public: explicit EventSender(const AtomString& eventType); diff --git a/src/bun.js/bindings/webcore/FetchHeaders.h b/src/bun.js/bindings/webcore/FetchHeaders.h index eac56928c7..c7b7d73eb9 100644 --- a/src/bun.js/bindings/webcore/FetchHeaders.h +++ b/src/bun.js/bindings/webcore/FetchHeaders.h @@ -41,7 +41,7 @@ class ScriptExecutionContext; DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(FetchHeaders); class FetchHeaders : public RefCounted { - WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(FetchHeaders); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(FetchHeaders, FetchHeaders); public: enum class Guard { diff --git a/src/bun.js/bindings/webcore/JSCallbackData.h b/src/bun.js/bindings/webcore/JSCallbackData.h index aaf58e24b8..4351a5ab5c 100644 --- a/src/bun.js/bindings/webcore/JSCallbackData.h +++ b/src/bun.js/bindings/webcore/JSCallbackData.h @@ -42,7 +42,7 @@ namespace WebCore { // (and synchronization would be slow). class JSCallbackData { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(JSCallbackData); public: enum class CallbackType { Function, diff --git a/src/bun.js/bindings/webcore/JSDOMPromiseDeferred.h b/src/bun.js/bindings/webcore/JSDOMPromiseDeferred.h index 0cb1a98a11..9baae7d982 100644 --- a/src/bun.js/bindings/webcore/JSDOMPromiseDeferred.h +++ b/src/bun.js/bindings/webcore/JSDOMPromiseDeferred.h @@ -213,7 +213,7 @@ private: }; class DOMPromiseDeferredBase { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(DOMPromiseDeferredBase); public: DOMPromiseDeferredBase(Ref&& genericPromise) diff --git a/src/bun.js/bindings/webcore/JSEventEmitterCustom.h b/src/bun.js/bindings/webcore/JSEventEmitterCustom.h index 91c9f8732f..e06e79101e 100644 --- a/src/bun.js/bindings/webcore/JSEventEmitterCustom.h +++ b/src/bun.js/bindings/webcore/JSEventEmitterCustom.h @@ -7,7 +7,7 @@ namespace WebCore { // Wrapper type for JSEventEmitter's castedThis because JSDOMWindow and JSWorkerGlobalScope do not inherit JSEventEmitter. class JSEventEmitterWrapper { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(JSEventEmitterWrapper); public: JSEventEmitterWrapper(EventEmitter& wrapped, JSC::JSObject* wrapper) diff --git a/src/bun.js/bindings/webcore/JSEventTargetCustom.h b/src/bun.js/bindings/webcore/JSEventTargetCustom.h index e719800691..8987f8226d 100644 --- a/src/bun.js/bindings/webcore/JSEventTargetCustom.h +++ b/src/bun.js/bindings/webcore/JSEventTargetCustom.h @@ -32,7 +32,7 @@ namespace WebCore { // Wrapper type for JSEventTarget's castedThis because JSDOMWindow and JSWorkerGlobalScope do not inherit JSEventTarget. class JSEventTargetWrapper { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(JSEventTargetWrapper); public: JSEventTargetWrapper(EventTarget& wrapped, JSC::JSObject& wrapper) diff --git a/src/bun.js/bindings/webcore/NetworkLoadMetrics.h b/src/bun.js/bindings/webcore/NetworkLoadMetrics.h index 5e1951f84e..b1591cf203 100644 --- a/src/bun.js/bindings/webcore/NetworkLoadMetrics.h +++ b/src/bun.js/bindings/webcore/NetworkLoadMetrics.h @@ -61,7 +61,7 @@ constexpr MonotonicTime reusedTLSConnectionSentinel { MonotonicTime::fromRawSeco struct AdditionalNetworkLoadMetricsForWebInspector; class NetworkLoadMetrics { - WTF_MAKE_FAST_ALLOCATED(NetworkLoadMetrics); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(NetworkLoadMetrics); public: WEBCORE_EXPORT NetworkLoadMetrics(); diff --git a/src/bun.js/bindings/webcore/PerformanceEntry.h b/src/bun.js/bindings/webcore/PerformanceEntry.h index 1fb135c68f..bb4ed94db7 100644 --- a/src/bun.js/bindings/webcore/PerformanceEntry.h +++ b/src/bun.js/bindings/webcore/PerformanceEntry.h @@ -39,7 +39,7 @@ namespace WebCore { DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(PerformanceEntry); class PerformanceEntry : public RefCounted { - WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(PerformanceEntry); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(PerformanceEntry, PerformanceEntry); public: virtual ~PerformanceEntry(); diff --git a/src/bun.js/bindings/webcore/PerformanceObserverEntryList.h b/src/bun.js/bindings/webcore/PerformanceObserverEntryList.h index 61f615c888..ac1bc2823a 100644 --- a/src/bun.js/bindings/webcore/PerformanceObserverEntryList.h +++ b/src/bun.js/bindings/webcore/PerformanceObserverEntryList.h @@ -34,7 +34,7 @@ namespace WebCore { class PerformanceEntry; class PerformanceObserverEntryList : public RefCounted { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(PerformanceObserverEntryList); public: static Ref create(Vector>&& entries); diff --git a/src/bun.js/bindings/webcore/PerformanceUserTiming.h b/src/bun.js/bindings/webcore/PerformanceUserTiming.h index 69f734fd73..4973c1f05d 100644 --- a/src/bun.js/bindings/webcore/PerformanceUserTiming.h +++ b/src/bun.js/bindings/webcore/PerformanceUserTiming.h @@ -42,7 +42,7 @@ class Performance; using PerformanceEntryMap = HashMap>>; class PerformanceUserTiming { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(PerformanceUserTiming); public: explicit PerformanceUserTiming(Performance&); diff --git a/src/bun.js/bindings/webcore/ResourceTiming.h b/src/bun.js/bindings/webcore/ResourceTiming.h index b3a763971b..996874cfe8 100644 --- a/src/bun.js/bindings/webcore/ResourceTiming.h +++ b/src/bun.js/bindings/webcore/ResourceTiming.h @@ -42,7 +42,7 @@ class SecurityOrigin; DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(ResourceTiming); class ResourceTiming { - WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(ResourceTiming); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(ResourceTiming, ResourceTiming); public: // static ResourceTiming fromMemoryCache(const URL&, const String& initiator const ResourceResponse&, const NetworkLoadMetrics&, const SecurityOrigin&); diff --git a/src/bun.js/bindings/webcore/SerializedScriptValue.h b/src/bun.js/bindings/webcore/SerializedScriptValue.h index f3ed0f33d3..11342a26c5 100644 --- a/src/bun.js/bindings/webcore/SerializedScriptValue.h +++ b/src/bun.js/bindings/webcore/SerializedScriptValue.h @@ -86,7 +86,7 @@ using WasmMemoryHandleArray = Vector>; DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(SerializedScriptValue); class SerializedScriptValue : public ThreadSafeRefCounted { - WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(SerializedScriptValue); + WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(SerializedScriptValue, SerializedScriptValue); public: static SYSV_ABI void writeBytesForBun(CloneSerializer*, const uint8_t*, uint32_t); @@ -249,7 +249,7 @@ void SerializedScriptValue::encode(Encoder& encoder) const for (const auto& videoChunk : m_serializedVideoChunks) encoder << videoChunk->data(); - // FIXME: encode video frames + // FIXME: encode video frames #endif } diff --git a/src/bun.js/bindings/webcrypto/CryptoAlgorithmParameters.h b/src/bun.js/bindings/webcrypto/CryptoAlgorithmParameters.h index cb6ec5d551..b84a2d331d 100644 --- a/src/bun.js/bindings/webcrypto/CryptoAlgorithmParameters.h +++ b/src/bun.js/bindings/webcrypto/CryptoAlgorithmParameters.h @@ -34,7 +34,7 @@ namespace WebCore { class CryptoAlgorithmParameters { - WTF_MAKE_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_FAST_ALLOCATED(CryptoAlgorithmParameters); public: enum class Class { diff --git a/src/bun.js/bindings/webcrypto/CryptoDigest.cpp b/src/bun.js/bindings/webcrypto/CryptoDigest.cpp index e3c83484fb..0c8f3aa5e8 100644 --- a/src/bun.js/bindings/webcrypto/CryptoDigest.cpp +++ b/src/bun.js/bindings/webcrypto/CryptoDigest.cpp @@ -75,7 +75,7 @@ struct CryptoDigestContext { template struct CryptoDigestContextImpl : public CryptoDigestContext { - WTF_MAKE_STRUCT_FAST_ALLOCATED; + WTF_DEPRECATED_MAKE_STRUCT_FAST_ALLOCATED(CryptoDigestContextImpl); static std::unique_ptr create() { diff --git a/src/bun.js/modules/BunJSCModule.h b/src/bun.js/modules/BunJSCModule.h index e5aed312d2..326a944945 100644 --- a/src/bun.js/modules/BunJSCModule.h +++ b/src/bun.js/modules/BunJSCModule.h @@ -225,10 +225,10 @@ JSC_DEFINE_HOST_FUNCTION(functionMemoryUsageStatistics, } const auto createdSortedTypeCounts = - [&](JSC::TypeCountSet* typeCounts) -> JSC::JSValue { + [&](JSC::TypeCountSet const& typeCounts) -> JSC::JSValue { WTF::Vector> counts; - counts.reserveInitialCapacity(typeCounts->size()); - for (auto& it : *typeCounts) { + counts.reserveInitialCapacity(typeCounts.size()); + for (auto& it : typeCounts) { if (it.value > 0) counts.append( std::make_pair(Identifier::fromString(vm, it.key), it.value)); @@ -264,8 +264,8 @@ JSC_DEFINE_HOST_FUNCTION(functionMemoryUsageStatistics, return objectTypeCounts; }; - JSValue objectTypeCounts = createdSortedTypeCounts(vm.heap.objectTypeCounts().get()); - JSValue protectedCounts = createdSortedTypeCounts(vm.heap.protectedObjectTypeCounts().get()); + JSValue objectTypeCounts = createdSortedTypeCounts(vm.heap.objectTypeCounts()); + JSValue protectedCounts = createdSortedTypeCounts(vm.heap.protectedObjectTypeCounts()); JSObject* object = constructEmptyObject(globalObject); object->putDirect(vm, Identifier::fromString(vm, "objectTypeCounts"_s),