Upgrade WebKit to 7b485a76e9

scripts/build/deps/webkit.ts

@@ -3,7 +3,7 @@
  * for local mode. Override via `--webkit-version=<hash>` to test a branch.
  * From https://github.com/oven-sh/WebKit releases.
  */
-export const WEBKIT_VERSION = "299c5323879e79af282d7bb7bac8b8446a0be3f3";
+export const WEBKIT_VERSION = "autobuild-preview-pr-725-bc120ee2";
 
 /**
  * WebKit (JavaScriptCore) — the JS engine.

scripts/verify-baseline-static/allowlist-x64-windows.txt

@@ -913,6 +913,7 @@ __std_find_trivial_1
 __std_find_trivial_2                                                                                       [AVX, AVX2]
 __std_find_trivial_4                                                                                       [AVX, AVX2]
 __std_find_trivial_8                                                                                       [AVX, AVX2, LZCNT]
+__std_max_8i                                                                                               [AVX, AVX2, AVX512F, AVX512VL]
 __std_min_8u                                                                                               [AVX, AVX2, AVX512F, AVX512VL]
 __std_minmax_8i                                                                                            [AVX, AVX2]
 __std_search_1                                                                                             [AVX, AVX2]

src/codegen/bundle-functions.ts

@@ -465,7 +465,7 @@ JSC::FunctionExecutable* ${lowerBasename}${cap(fn.name)}CodeGenerator(JSC::VM& v
 
   const initializeSourceCodeFn = (fn: BundledBuiltin, basename: string) => {
     const name = `${low(basename)}${cap(fn.name)}CodeSource`;
-    return `m_${name}(SourceCode(sourceProvider.copyRef(), ${fn.sourceOffset}, ${fn.source.length + fn.sourceOffset}, 1, 1))`;
+    return `m_${name}(SourceCode(sourceProvider.copyRef(), ${fn.sourceOffset}, ${fn.source.length + fn.sourceOffset}))`;
   };
   for (const { basename, internal, functions } of files) {
     bundledCPP += `

src/codegen/generate-classes.ts

@@ -852,7 +852,7 @@ JSC_DEFINE_HOST_FUNCTION(${symbolName(typeName, name)}Callback, (JSGlobalObject
      * from a debugger */
     SourceOrigin sourceOrigin = callFrame->callerSourceOrigin(vm);
     auto fileNameUTF8 = sourceOrigin.string().utf8();
-    const char* fileName = fileNameUTF8.data();
+    const char* fileName = fileNameUTF8.legacyCStringPointer();
     static const char* lastFileName = nullptr;
     if (lastFileName != fileName) {
       lastFileName = fileName;

src/jsc/bindings/BunAnalyzeTranspiledModule.cpp

@@ -276,11 +276,11 @@ static EncodedJSValue fallbackParse(JSGlobalObject* globalObject, JSModuleLoader
         auto actual = dumpRecordInfo(resultValue);
         auto expected = dumpRecordInfo(moduleRecord);
         if (actual != expected) {
-            dataLog("\n\n\n\n\n\n\x1b[95mBEGIN analyzeTranspiledModule\x1b(B\x1b[m\n  --- module key ---\n", moduleKey.utf8().data(), "\n  --- code ---\n\n", sourceCode.toUTF8().data(), "\n");
+            dataLog("\n\n\n\n\n\n\x1b[95mBEGIN analyzeTranspiledModule\x1b(B\x1b[m\n  --- module key ---\n", moduleKey.utf8(), "\n  --- code ---\n\n", sourceCode.toUTF8(), "\n");
             dataLog("  ------", "\n");
             dataLog("  BunAnalyzeTranspiledModule:", "\n");
 
-            zig__renderDiff(expected.utf8().data(), expected.utf8().length(), actual.utf8().data(), actual.utf8().length());
+            zig__renderDiff(expected.utf8().legacyCStringPointer(), expected.utf8().length(), actual.utf8().legacyCStringPointer(), actual.utf8().length());
 
             RELEASE_AND_RETURN(scope, JSValue::encode(rejectWithError(createError(globalObject, WTF::String::fromLatin1("Imports different between parseFromSourceCode and fallbackParse")))));
         }

src/jsc/bindings/BunClientData.cpp

@@ -168,7 +168,7 @@ void JSVMClientData::create(VM* vm, void* bunVM, WorkerMessagingProxy* worker)
     // (~VM -> lastChanceToFinalize -> delete clientData), so the capture stays
     // valid for every collection.
     vm->heap.addMarkingConstraint(makeUnique<JSC::SimpleMarkingConstraint>(
-        "Srb", "Bun StrongRootBlocks",
+        "Srb"_s, "Bun StrongRootBlocks"_s,
         MAKE_MARKING_CONSTRAINT_EXECUTOR_PAIR(([clientData](auto& visitor) {
             JSC::SetRootMarkReasonScope rootScope(visitor, JSC::RootMarkReason::StrongHandles);
             visitor.appendUnbarriered(clientData->m_strongRootBlockHead);
@@ -179,7 +179,7 @@ void JSVMClientData::create(VM* vm, void* bunVM, WorkerMessagingProxy* worker)
 
     // The common string cache: slots filled by the JS thread, read here with the world stopped (as above).
     vm->heap.addMarkingConstraint(makeUnique<JSC::SimpleMarkingConstraint>(
-        "Bcs", "Bun CommonStrings",
+        "Bcs"_s, "Bun CommonStrings"_s,
         MAKE_MARKING_CONSTRAINT_EXECUTOR_PAIR(([clientData](auto& visitor) {
             JSC::SetRootMarkReasonScope rootScope(visitor, JSC::RootMarkReason::StrongHandles);
             clientData->commonStrings.visit(visitor);

src/jsc/bindings/BunGCOutputConstraint.cpp

@@ -102,7 +102,7 @@ namespace WebCore {
 using namespace JSC;
 
 DOMGCOutputConstraint::DOMGCOutputConstraint(VM& vm, JSHeapData& heapData)
-    : MarkingConstraint("Domo", "DOM Output", ConstraintVolatility::SeldomGreyed, ConstraintConcurrency::Concurrent, ConstraintParallelism::Parallel)
+    : MarkingConstraint("Domo"_s, "DOM Output"_s, ConstraintVolatility::SeldomGreyed, ConstraintConcurrency::Concurrent, ConstraintParallelism::Parallel)
     , m_vm(vm)
     , m_heapData(heapData)
     , m_lastExecutionVersion(vm.heap.mutatorExecutionVersion())

src/jsc/bindings/BunProcess.cpp

@@ -324,7 +324,7 @@ static JSValue constructProcessReleaseObject(VM& vm, JSObject* processObject)
     auto* release = JSC::constructEmptyObject(globalObject);
 
     release->putDirect(vm, vm.propertyNames->name, jsOwnedString(vm, String("node"_s)), 0); // maybe this should be 'bun' eventually
-    putDirectNamed(vm, release, "sourceUrl"_s, jsOwnedString(vm, WTF::String(std::span { Bun__githubURL, strlen(Bun__githubURL) })));
+    putDirectNamed(vm, release, "sourceUrl"_s, jsOwnedString(vm, String::fromLatin1(Bun__githubURL)));
     putDirectNamed(vm, release, "headersUrl"_s, jsOwnedString(vm, String("https://nodejs.org/download/release/v" REPORTED_NODEJS_VERSION "/node-v" REPORTED_NODEJS_VERSION "-headers.tar.gz"_s)));
 
     RETURN_IF_EXCEPTION(scope, {});
@@ -3370,7 +3370,7 @@ static JSValue maybe_uid_by_name(JSC::ThrowScope& throwScope, JSGlobalObject* gl
     auto str = value.getString(globalObject);
     RETURN_IF_EXCEPTION(throwScope, {});
     auto utf8 = str.utf8();
-    auto name = utf8.data();
+    auto name = utf8.legacyCStringPointer();
     struct passwd pwd;
     struct passwd* pp = nullptr;
     char buf[8192];
@@ -3392,7 +3392,7 @@ static JSValue maybe_gid_by_name(JSC::ThrowScope& throwScope, JSGlobalObject* gl
     auto str = value.getString(globalObject);
     RETURN_IF_EXCEPTION(throwScope, {});
     auto utf8 = str.utf8();
-    auto name = utf8.data();
+    auto name = utf8.legacyCStringPointer();
     struct group pwd;
     struct group* pp = nullptr;
     char buf[8192];

src/jsc/bindings/BunSecureContextCache.h

@@ -24,7 +24,7 @@ class SecureContextCache {
     }
 
     JSC::JSObject* get(uint64_t key) { return m_map.get(key); }
-    void set(uint64_t key, JSC::JSObject* value) { m_map.set(key, JSC::Weak<JSC::JSObject>(value)); }
+    void set(uint64_t key, JSC::JSObject* value) { m_map.set(key, value); }
 
 private:
     JSC::WeakGCMap<uint64_t, JSC::JSObject, WTF::IntHash<uint64_t>, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>> m_map;

src/jsc/bindings/CookieMap.cpp

@@ -18,7 +18,7 @@ static void CookieMap__writeFetchHeadersToUWSResponse(CookieMap* cookie_map, JSC
     // Loop over modified cookies and write Set-Cookie headers to the response
     for (auto& cookie : cookie_map->getAllChanges()) {
         auto utf8 = cookie->toString(global_this->vm()).utf8();
-        res->writeHeader("Set-Cookie", utf8.data());
+        res->writeHeader("Set-Cookie", utf8.legacyCStringPointer());
     }
 }
 extern "C" void CookieMap__write(CookieMap* cookie_map, JSC::JSGlobalObject* global_this, UWSResponseKind kind, void* arg2)

src/jsc/bindings/ErrorStackFrame.cpp

@@ -65,10 +65,12 @@ void adjustPositionBackwards(ZigStackFramePosition& pos, int amount, CodeBlock*
 ZigStackFramePosition getAdjustedPositionForBytecode(JSC::CodeBlock* code, JSC::BytecodeIndex bc)
 {
     auto expr = code->expressionInfoForBytecodeIndex(bc);
+    // Expression info has offsets only. The provider derives the line and the column from the divot.
+    auto lineColumn = code->source().provider()->documentLineColumnForOffset(expr.divot);
 
     ZigStackFramePosition pos {
-        .line_zero_based = OrdinalNumber::fromOneBasedInt(expr.lineColumn.line).zeroBasedInt(),
-        .column_zero_based = OrdinalNumber::fromOneBasedInt(expr.lineColumn.column).zeroBasedInt(),
+        .line_zero_based = OrdinalNumber::fromOneBasedInt(lineColumn.line).zeroBasedInt(),
+        .column_zero_based = OrdinalNumber::fromOneBasedInt(lineColumn.column).zeroBasedInt(),
         .byte_position = (int)expr.divot,
     };
 

src/jsc/bindings/FuzzilliREPRL.cpp

@@ -150,7 +150,7 @@ static JSC::EncodedJSValue JSC_HOST_CALL_ATTRIBUTES functionFuzzilli(JSC::JSGlob
             // the fuzzer harness).
             static FILE* f = fdopen(REPRL_DWFD, "w");
             if (f) {
-                fprintf(f, "%s\n", output.utf8().data());
+                fprintf(f, "%s\n", output.utf8().legacyCStringPointer());
                 fflush(f);
             }
         }

src/jsc/bindings/InspectorBunFrontendDevServerAgent.h

@@ -16,11 +16,14 @@ class FrontendRouter;
 class BackendDispatcher;
 class BunFrontendDevServerFrontendDispatcher;
 
-class InspectorBunFrontendDevServerAgent final : public InspectorAgentBase, public Inspector::BunFrontendDevServerBackendDispatcherHandler {
+class InspectorBunFrontendDevServerAgent final : public InspectorAgentBase, public Inspector::BunFrontendDevServerBackendDispatcherHandler, public CanMakeThreadSafeCheckedPtr<InspectorBunFrontendDevServerAgent> {
     WTF_MAKE_NONCOPYABLE(InspectorBunFrontendDevServerAgent);
     WTF_MAKE_TZONE_ALLOCATED(InspectorBunFrontendDevServerAgent);
+    WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(InspectorBunFrontendDevServerAgent);
 
 public:
+    OVERRIDE_ABSTRACT_CAN_MAKE_CHECKEDPTR(CanMakeThreadSafeCheckedPtr);
+
     InspectorBunFrontendDevServerAgent(JSC::JSGlobalObject&);
     virtual ~InspectorBunFrontendDevServerAgent() final;
 

src/jsc/bindings/InspectorHTTPServerAgent.h

@@ -19,11 +19,14 @@ enum class DisconnectReason;
 
 using AnyServerPtr = void*;
 
-class InspectorHTTPServerAgent final : public InspectorAgentBase, public Inspector::HTTPServerBackendDispatcherHandler {
+class InspectorHTTPServerAgent final : public InspectorAgentBase, public Inspector::HTTPServerBackendDispatcherHandler, public CanMakeThreadSafeCheckedPtr<InspectorHTTPServerAgent> {
     WTF_MAKE_NONCOPYABLE(InspectorHTTPServerAgent);
     WTF_MAKE_TZONE_ALLOCATED(InspectorHTTPServerAgent);
+    WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(InspectorHTTPServerAgent);
 
 public:
+    OVERRIDE_ABSTRACT_CAN_MAKE_CHECKEDPTR(CanMakeThreadSafeCheckedPtr);
+
     InspectorHTTPServerAgent(JSC::JSGlobalObject&);
     virtual ~InspectorHTTPServerAgent();
 

src/jsc/bindings/InspectorLifecycleAgent.h

@@ -16,11 +16,14 @@ class BackendDispatcher;
 class LifecycleReporterFrontendDispatcher;
 enum class DisconnectReason;
 
-class InspectorLifecycleAgent final : public InspectorAgentBase, public Inspector::LifecycleReporterBackendDispatcherHandler {
+class InspectorLifecycleAgent final : public InspectorAgentBase, public Inspector::LifecycleReporterBackendDispatcherHandler, public CanMakeThreadSafeCheckedPtr<InspectorLifecycleAgent> {
     WTF_MAKE_NONCOPYABLE(InspectorLifecycleAgent);
     WTF_MAKE_TZONE_ALLOCATED(InspectorLifecycleAgent);
+    WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(InspectorLifecycleAgent);
 
 public:
+    OVERRIDE_ABSTRACT_CAN_MAKE_CHECKEDPTR(CanMakeThreadSafeCheckedPtr);
+
     InspectorLifecycleAgent(JSC::JSGlobalObject&);
     virtual ~InspectorLifecycleAgent();
 

src/jsc/bindings/InspectorTestReporterAgent.h

@@ -16,11 +16,14 @@ class BackendDispatcher;
 class TestReporterFrontendDispatcher;
 enum class DisconnectReason;
 
-class InspectorTestReporterAgent final : public InspectorAgentBase, public Inspector::TestReporterBackendDispatcherHandler {
+class InspectorTestReporterAgent final : public InspectorAgentBase, public Inspector::TestReporterBackendDispatcherHandler, public CanMakeThreadSafeCheckedPtr<InspectorTestReporterAgent> {
     WTF_MAKE_NONCOPYABLE(InspectorTestReporterAgent);
     WTF_MAKE_TZONE_ALLOCATED(InspectorTestReporterAgent);
+    WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(InspectorTestReporterAgent);
 
 public:
+    OVERRIDE_ABSTRACT_CAN_MAKE_CHECKEDPTR(CanMakeThreadSafeCheckedPtr);
+
     InspectorTestReporterAgent(JSC::JSGlobalObject&);
     virtual ~InspectorTestReporterAgent();
 

src/jsc/bindings/InternalModuleRegistry.cpp

@@ -90,7 +90,7 @@ static String internalModuleSource(uint32_t id)
     if (!contents) {
         printf("\nFATAL: bun-debug failed to load bundled version of \"%s\" at \"%s\" (was it deleted?)\n"
                "Please re-compile Bun to continue.\n\n",
-            moduleName.utf8().span().data(), file.utf8().span().data());
+            moduleName.utf8().legacyCStringPointer(), file.utf8().legacyCStringPointer());
         CRASH();
     }
     return WTF::String::fromUTF8(contents.value());
@@ -146,7 +146,7 @@ JSC::JSValue generateInternalModule(JSC::JSGlobalObject* globalObject, JSC::VM&
     ASSERT(
         result && result.isCell() && dynamicDowncast<JSObject>(result),
         "Expected \"%s\" to export a JSObject. Bun is going to crash.",
-        moduleName.utf8().span().data());
+        moduleName.utf8().legacyCStringPointer());
     return result;
 }
 

src/jsc/bindings/JS2Native.cpp

@@ -19,7 +19,7 @@ JSC_DEFINE_HOST_FUNCTION(jsDollarLazy, (JSC::JSGlobalObject * lexicalGlobalObjec
     JSC::JSValue target = callFrame->uncheckedArgument(0);
 
 #if ASSERT_ENABLED
-    ASSERT_WITH_MESSAGE(target.isInt32(), "In call to $lazy: expected Int32, got %s", target.toWTFString(lexicalGlobalObject).utf8().data());
+    ASSERT_WITH_MESSAGE(target.isInt32(), "In call to $lazy: expected Int32, got %s", target.toWTFString(lexicalGlobalObject).utf8().legacyCStringPointer());
 #endif
 
     int id = target.asInt32();

src/jsc/bindings/JSCommonJSModule.cpp

@@ -173,7 +173,7 @@ static bool evaluateCommonJSModuleOnce(JSC::VM& vm, Zig::GlobalObject* globalObj
     auto scope = DECLARE_THROW_SCOPE(vm);
     SourceCode code = WTF::move(moduleObject->sourceCode);
     if (JSModuleGraph* graph = moduleObject->moduleGraph(); graph && code.provider())
-        code = SourceCode(RefPtr<JSC::SourceProvider>(GraphCommonJSSourceProvider::create(*code.provider(), graph->overlayShape())), code.startOffset(), code.endOffset(), code.firstLine().oneBasedInt(), code.startColumn().oneBasedInt());
+        code = SourceCode(RefPtr<JSC::SourceProvider>(GraphCommonJSSourceProvider::create(*code.provider(), graph->overlayShape())), code.startOffset(), code.endOffset());
 
     // If an exception occurred somewhere else, we might have cleared the source code.
     if (code.isNull()) [[unlikely]] {

src/jsc/bindings/JSSecrets.cpp

@@ -75,9 +75,9 @@ struct SecretsJobOptions {
     };
 
     Operation op;
-    CString service; // UTF-8 encoded, thread-safe
-    CString name; // UTF-8 encoded, thread-safe
-    CString password; // UTF-8 encoded, thread-safe (only for SET)
+    UTF8CString service; // thread-safe
+    UTF8CString name; // thread-safe
+    UTF8CString password; // thread-safe (only for SET)
     bool allowUnrestrictedAccess = false; // Controls security vs headless access (only for SET)
     Secrets::Persist persist; // Windows only (only for SET)
 
@@ -86,7 +86,7 @@ struct SecretsJobOptions {
     std::optional<WTF::Vector<uint8_t>> resultPassword;
     bool deleted = false;
 
-    SecretsJobOptions(Operation op, CString&& service, CString&& name, CString&& password, bool allowUnrestrictedAccess, Secrets::Persist persist)
+    SecretsJobOptions(Operation op, UTF8CString&& service, UTF8CString&& name, UTF8CString&& password, bool allowUnrestrictedAccess, Secrets::Persist persist)
         : op(op)
         , service(service)
         , name(name)

src/jsc/bindings/ModuleLoader.cpp

@@ -82,7 +82,7 @@ static JSC::SyntheticSourceProvider::LazySyntheticSourceGenerator generateIntern
         JSValue requireResult = globalObject->internalModuleRegistry()->requireId(globalObject, vm, moduleId);
         RETURN_IF_EXCEPTION(throwScope, nullptr);
         auto* object = requireResult.getObject();
-        ASSERT_WITH_MESSAGE(object, "Expected object from requireId %s", moduleKey.string().string().utf8().data());
+        ASSERT_WITH_MESSAGE(object, "Expected object from requireId %s", moduleKey.string().string().utf8().legacyCStringPointer());
 
         JSC::EnsureStillAliveScope stillAlive(object);