From 4e4cc4c7cd57b6efb884b669cf6890651476f8cf Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Tue, 16 Jun 2026 12:42:56 -0700 Subject: [PATCH 1/2] Upgrade WebKit to b5ba38a21e17 - Bump WEBKIT_VERSION to oven-sh/WebKit@09f04cd5a489 (merges upstream b5ba38a21e17) - NodeVM: compare against vm.propertyNames->globalThis instead of allocating utf8(); the new CString==ASCIILiteral overload made the old comparison ambiguous --- scripts/build/deps/webkit.ts | 2 +- src/jsc/bindings/NodeVM.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/deps/webkit.ts b/scripts/build/deps/webkit.ts index 982088651f9..ed55d05b4c5 100644 --- a/scripts/build/deps/webkit.ts +++ b/scripts/build/deps/webkit.ts @@ -7,7 +7,7 @@ // -lto variants built with ThinLTO (per-module summaries for cross-language // importing), and the Windows ICU data table filtered + per-item zstd // compressed (lazily decompressed via bun_icu_decompress.cpp). -export const WEBKIT_VERSION = "9cb85a0716065c461bea14a0de9fe7139e5323aa"; +export const WEBKIT_VERSION = "09f04cd5a489b7c0b44aed255bfafce2a316eada"; /** * WebKit (JavaScriptCore) — the JS engine. diff --git a/src/jsc/bindings/NodeVM.cpp b/src/jsc/bindings/NodeVM.cpp index 910a4f392fe..85d3bd6207b 100644 --- a/src/jsc/bindings/NodeVM.cpp +++ b/src/jsc/bindings/NodeVM.cpp @@ -937,7 +937,7 @@ bool NodeVMSpecialSandbox::getOwnPropertySlot(JSObject* cell, JSGlobalObject* gl auto* thisObject = uncheckedDowncast(cell); NodeVMGlobalObject* parentGlobal = thisObject->parentGlobal(); - if (propertyName.uid()->utf8() == "globalThis") [[unlikely]] { + if (propertyName == vm.propertyNames->globalThis) [[unlikely]] { slot.disableCaching(); slot.setThisValue(thisObject); slot.setValue(thisObject, slot.attributes(), thisObject); @@ -963,7 +963,7 @@ bool NodeVMGlobalObject::getOwnPropertySlot(JSObject* cell, JSGlobalObject* glob bool notContextified = thisObject->isNotContextified(); - if (notContextified && propertyName.uid()->utf8() == "globalThis") [[unlikely]] { + if (notContextified && propertyName == vm.propertyNames->globalThis) [[unlikely]] { slot.disableCaching(); slot.setThisValue(thisObject); slot.setValue(thisObject, slot.attributes(), thisObject->specialSandbox()); From 0e5f9a062baa7f16c9c171252a9827ca677bd902 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Tue, 16 Jun 2026 13:37:01 -0700 Subject: [PATCH 2/2] ci: retrigger after autobuild release