diff options
author | 2023-04-13 04:11:12 -0700 | |
---|---|---|
committer | 2023-04-13 04:11:12 -0700 | |
commit | aeb3bb949b0052d0573bef507f1b66bbcf4f3dc0 (patch) | |
tree | 2b9e76e71f666a81071a01ced1171fe80d244c15 /src/bun.js/bindings/ZigGlobalObject.cpp | |
parent | db15a23a637468c3fc67f2a6446698d758f58fbe (diff) | |
download | bun-aeb3bb949b0052d0573bef507f1b66bbcf4f3dc0.tar.gz bun-aeb3bb949b0052d0573bef507f1b66bbcf4f3dc0.tar.zst bun-aeb3bb949b0052d0573bef507f1b66bbcf4f3dc0.zip |
Upgrade WebKit (#2643)
* Missing export
* Regenerate builtins
* Fix crash in require()
* Various breaking JSC changes
* hopefully speed up C++ compilation a little
* Skip failing test fo rnow
* Update WebKit
* Add a comment
* Fix error in postinstall
* Update WebKit
---------
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'src/bun.js/bindings/ZigGlobalObject.cpp')
-rw-r--r-- | src/bun.js/bindings/ZigGlobalObject.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp index 303be6190..b969acf4c 100644 --- a/src/bun.js/bindings/ZigGlobalObject.cpp +++ b/src/bun.js/bindings/ZigGlobalObject.cpp @@ -1,7 +1,8 @@ #include "root.h" #include "ZigGlobalObject.h" - +#include <JavaScriptCore/GlobalObjectMethodTable.h> #include "helpers.h" +#include "BunClientData.h" #include "JavaScriptCore/AggregateError.h" #include "JavaScriptCore/BytecodeIndex.h" @@ -54,7 +55,6 @@ #include "JavaScriptCore/StackFrame.h" #include "JavaScriptCore/StackVisitor.h" #include "JavaScriptCore/VM.h" -#include "JavaScriptCore/VMEntryScope.h" #include "JavaScriptCore/WasmFaultSignalHandler.h" #include "wtf/Gigacage.h" #include "wtf/URL.h" @@ -111,6 +111,8 @@ #include "JavaScriptCore/DateInstance.h" #include "BunPlugin.h" +#include "JSEnvironmentVariableMap.h" +#include "DOMIsoSubspaces.h" #if ENABLE(REMOTE_INSPECTOR) #include "JavaScriptCore/RemoteInspectorServer.h" @@ -169,6 +171,11 @@ namespace JSCastingHelpers = JSC::JSCastingHelpers; #include "JSDOMFormData.h" +#include "ErrorStackTrace.h" +#include "CallSite.h" +#include "CallSitePrototype.h" +#include "DOMWrapperWorld-class.h" + constexpr size_t DEFAULT_ERROR_STACK_TRACE_LIMIT = 10; #ifdef __APPLE__ @@ -195,7 +202,7 @@ extern "C" void JSCInitialize(const char* envp[], size_t envc, void (*onCrash)(c JSC::Options::AllowUnfinalizedAccessScope scope; JSC::Options::useConcurrentJIT() = true; - JSC::Options::useSigillCrashAnalyzer() = true; + // JSC::Options::useSigillCrashAnalyzer() = true; JSC::Options::useWebAssembly() = true; JSC::Options::useSourceProviderCache() = true; // JSC::Options::useUnlinkedCodeBlockJettisoning() = false; @@ -3082,6 +3089,17 @@ JSC_DEFINE_HOST_FUNCTION(functionGetDirectStreamDetails, (JSC::JSGlobalObject * return JSC::JSValue::encode(resultObject); } +JSC::GCClient::IsoSubspace* GlobalObject::subspaceForImpl(JSC::VM& vm) +{ + return WebCore::subspaceForImpl<GlobalObject, WebCore::UseCustomHeapCellType::Yes>( + vm, + [](auto& spaces) { return spaces.m_clientSubspaceForWorkerGlobalScope.get(); }, + [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForWorkerGlobalScope = std::forward<decltype(space)>(space); }, + [](auto& spaces) { return spaces.m_subspaceForWorkerGlobalScope.get(); }, + [](auto& spaces, auto&& space) { spaces.m_subspaceForWorkerGlobalScope = std::forward<decltype(space)>(space); }, + [](auto& server) -> JSC::HeapCellType& { return server.m_heapCellTypeForJSWorkerGlobalScope; }); +} + void GlobalObject::addBuiltinGlobals(JSC::VM& vm) { m_builtinInternalFunctions.initialize(*this); |