Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: V8: backport 0d5d6e71bbb0 #55115

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.9',
'v8_embedder_string': '-node.10',

##### V8 defaults for Node.js #####

Expand Down
1 change: 0 additions & 1 deletion deps/v8/src/flags/flag-definitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ DEFINE_BOOL(js_shipping, true, "enable all shipped JavaScript features")
V(harmony_import_attributes, "harmony import attributes")

#define JAVASCRIPT_SHIPPING_FEATURES_BASE(V) \
V(js_promise_withresolvers, "Promise.withResolvers") \
V(js_regexp_duplicate_named_groups, "RegExp duplicate named groups") \
V(js_regexp_modifiers, "RegExp modifiers") \
V(js_promise_try, "Promise.try")
Expand Down
27 changes: 9 additions & 18 deletions deps/v8/src/init/bootstrapper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3228,6 +3228,15 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
InstallFunctionWithBuiltinId(isolate_, promise_fun, "reject",
Builtin::kPromiseReject, 1, true);

std::array<Handle<Name>, 3> fields{factory->promise_string(),
factory->resolve_string(),
factory->reject_string()};
DirectHandle<Map> result_map =
CreateLiteralObjectMapFromCache(isolate_, fields);
native_context()->set_promise_withresolvers_result_map(*result_map);
InstallFunctionWithBuiltinId(isolate_, promise_fun, "withResolvers",
Builtin::kPromiseWithResolvers, 0, true);

SetConstructorInstanceType(isolate_, promise_fun,
JS_PROMISE_CONSTRUCTOR_TYPE);

Expand Down Expand Up @@ -5504,24 +5513,6 @@ void Genesis::InitializeGlobal_js_promise_try() {
Builtin::kPromiseTry, 1, false);
}

void Genesis::InitializeGlobal_js_promise_withresolvers() {
if (!v8_flags.js_promise_withresolvers) return;

Factory* factory = isolate()->factory();

std::array<Handle<Name>, 3> fields{factory->promise_string(),
factory->resolve_string(),
factory->reject_string()};
DirectHandle<Map> result_map =
CreateLiteralObjectMapFromCache(isolate(), fields);
native_context()->set_promise_withresolvers_result_map(*result_map);

Handle<JSFunction> promise_fun =
handle(native_context()->promise_function(), isolate());
InstallFunctionWithBuiltinId(isolate(), promise_fun, "withResolvers",
Builtin::kPromiseWithResolvers, 0, true);
}

void Genesis::InitializeGlobal_harmony_set_methods() {
if (!v8_flags.harmony_set_methods) return;

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/mjsunit/harmony/promise-withresolvers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// Flags: --js-promise-withresolvers --allow-natives-syntax
// Flags: --allow-natives-syntax

const desc = Object.getOwnPropertyDescriptor(Promise, 'withResolvers');
assertTrue(desc.configurable);
Expand Down
1 change: 0 additions & 1 deletion deps/v8/test/test262/testcfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
'json-parse-with-source': '--harmony-json-parse-with-source',
'iterator-helpers': '--harmony-iterator-helpers',
'set-methods': '--harmony-set-methods',
'promise-with-resolvers': '--js-promise-withresolvers',
'import-attributes': '--harmony-import-attributes',
'regexp-duplicate-named-groups': '--js-regexp-duplicate-named-groups',
'regexp-modifiers': '--js-regexp-modifiers',
Expand Down
Loading