mirror of
https://github.com/oven-sh/bun
synced 2026-02-16 22:01:47 +00:00
WebKit Upgrade (#19839)
Co-authored-by: Jarred-Sumner <709451+Jarred-Sumner@users.noreply.github.com> Co-authored-by: Ben Grant <ben@bun.sh> Co-authored-by: 190n <7763597+190n@users.noreply.github.com>
This commit is contained in:
@@ -111,7 +111,7 @@ static JSC::SyntheticSourceProvider::SyntheticSourceGenerator generateInternalMo
|
||||
bool hasDefault = false;
|
||||
|
||||
for (auto& entry : properties) {
|
||||
if (UNLIKELY(entry == vm.propertyNames->defaultKeyword)) {
|
||||
if (entry == vm.propertyNames->defaultKeyword) [[unlikely]] {
|
||||
hasDefault = true;
|
||||
}
|
||||
exportNames.append(entry);
|
||||
@@ -219,7 +219,7 @@ OnLoadResult handleOnLoadResultNotPromise(Zig::GlobalObject* globalObject, JSC::
|
||||
}
|
||||
|
||||
JSC::JSObject* object = objectValue.getObject();
|
||||
if (UNLIKELY(!object)) {
|
||||
if (!object) [[unlikely]] {
|
||||
scope.throwException(globalObject, JSC::createError(globalObject, "Expected module mock to return an object"_s));
|
||||
|
||||
result.value.error = scope.exception();
|
||||
@@ -253,7 +253,7 @@ OnLoadResult handleOnLoadResultNotPromise(Zig::GlobalObject* globalObject, JSC::
|
||||
}
|
||||
}
|
||||
|
||||
if (UNLIKELY(loader == BunLoaderTypeNone)) {
|
||||
if (loader == BunLoaderTypeNone) [[unlikely]] {
|
||||
throwException(globalObject, scope, createError(globalObject, "Expected loader to be one of \"js\", \"jsx\", \"object\", \"ts\", \"tsx\", \"toml\", or \"json\""_s));
|
||||
result.value.error = scope.exception();
|
||||
return result;
|
||||
@@ -275,7 +275,7 @@ OnLoadResult handleOnLoadResultNotPromise(Zig::GlobalObject* globalObject, JSC::
|
||||
}
|
||||
}
|
||||
|
||||
if (UNLIKELY(result.value.sourceText.value.isEmpty())) {
|
||||
if (result.value.sourceText.value.isEmpty()) [[unlikely]] {
|
||||
throwException(globalObject, scope, createError(globalObject, "Expected \"contents\" to be a string or an ArrayBufferView"_s));
|
||||
result.value.error = scope.exception();
|
||||
return result;
|
||||
@@ -532,7 +532,8 @@ JSValue resolveAndFetchBuiltinModule(
|
||||
auto& vm = JSC::getVM(globalObject);
|
||||
auto scope = DECLARE_THROW_SCOPE(vm);
|
||||
ErrorableResolvedSource res;
|
||||
memset(&res, 0, sizeof(ErrorableResolvedSource));
|
||||
res.success = false;
|
||||
memset(&res.result, 0, sizeof res.result);
|
||||
if (Bun__resolveAndFetchBuiltinModule(bunVM, specifier, &res)) {
|
||||
ASSERT(res.success);
|
||||
|
||||
@@ -607,7 +608,8 @@ JSValue fetchCommonJSModule(
|
||||
auto& vm = JSC::getVM(globalObject);
|
||||
auto scope = DECLARE_THROW_SCOPE(vm);
|
||||
ErrorableResolvedSource resValue;
|
||||
memset(&resValue, 0, sizeof(ErrorableResolvedSource));
|
||||
resValue.success = false;
|
||||
memset(&resValue.result, 0, sizeof resValue.result);
|
||||
|
||||
ErrorableResolvedSource* res = &resValue;
|
||||
ResolvedSourceCodeHolder sourceCodeHolder(res);
|
||||
@@ -1074,8 +1076,9 @@ using namespace Bun;
|
||||
BUN_DEFINE_HOST_FUNCTION(jsFunctionOnLoadObjectResultResolve, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
|
||||
{
|
||||
auto& vm = JSC::getVM(globalObject);
|
||||
ErrorableResolvedSource res = {};
|
||||
ErrorableResolvedSource res;
|
||||
res.success = false;
|
||||
memset(&res.result, 0, sizeof res.result);
|
||||
JSC::JSValue objectResult = callFrame->argument(0);
|
||||
PendingVirtualModuleResult* pendingModule = JSC::jsCast<PendingVirtualModuleResult*>(callFrame->argument(1));
|
||||
JSC::JSValue specifierString = pendingModule->internalField(0).get();
|
||||
|
||||
Reference in New Issue
Block a user