Skip to content

Commit 964d069

Browse files
deps: patch V8 to 13.7.152.18
Refs: v8/v8@13.7.152.14...13.7.152.18
1 parent eafbe27 commit 964d069

17 files changed

+202
-69
lines changed

deps/v8/include/v8-version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 13
1212
#define V8_MINOR_VERSION 7
1313
#define V8_BUILD_NUMBER 152
14-
#define V8_PATCH_LEVEL 14
14+
#define V8_PATCH_LEVEL 18
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/execution/isolate.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3875,7 +3875,7 @@ void Isolate::SwitchStacks(wasm::StackMemory* from, wasm::StackMemory* to) {
38753875
// TODO(388533754): This check won't hold anymore with core stack-switching.
38763876
// Instead, we will need to validate all the intermediate stacks and also
38773877
// check that they don't hold central stack frames.
3878-
DCHECK_EQ(from->jmpbuf()->parent, to);
3878+
SBXCHECK_EQ(from->jmpbuf()->parent, to);
38793879
}
38803880
uintptr_t limit = reinterpret_cast<uintptr_t>(to->jmpbuf()->stack_limit);
38813881
stack_guard()->SetStackLimitForStackSwitching(limit);

deps/v8/src/objects/js-break-iterator.cc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ MaybeDirectHandle<JSV8BreakIterator> JSV8BreakIterator::New(
4343
MAYBE_RETURN(maybe_locale_matcher, MaybeDirectHandle<JSV8BreakIterator>());
4444
Intl::MatcherOption matcher = maybe_locale_matcher.FromJust();
4545

46-
Maybe<Intl::ResolvedLocale> maybe_resolve_locale =
47-
Intl::ResolveLocale(isolate, JSV8BreakIterator::GetAvailableLocales(),
48-
requested_locales, matcher, {});
49-
if (maybe_resolve_locale.IsNothing()) {
46+
Intl::ResolvedLocale r;
47+
if (!Intl::ResolveLocale(isolate, JSV8BreakIterator::GetAvailableLocales(),
48+
requested_locales, matcher, {})
49+
.To(&r)) {
5050
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError));
5151
}
52-
Intl::ResolvedLocale r = maybe_resolve_locale.FromJust();
5352

5453
// Extract type from options
5554
enum class Type { CHARACTER, WORD, SENTENCE, LINE };

deps/v8/src/objects/js-collator.cc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,18 +357,16 @@ MaybeHandle<JSCollator> JSCollator::New(Isolate* isolate, DirectHandle<Map> map,
357357
// https://tc39.github.io/ecma402/#sec-intl-collator-internal-slots
358358
//
359359
// 16. Let relevantExtensionKeys be %Collator%.[[RelevantExtensionKeys]].
360-
std::set<std::string> relevant_extension_keys{"co", "kn", "kf"};
361360

362361
// 17. Let r be ResolveLocale(%Collator%.[[AvailableLocales]],
363362
// requestedLocales, opt, %Collator%.[[RelevantExtensionKeys]],
364363
// localeData).
365-
Maybe<Intl::ResolvedLocale> maybe_resolve_locale =
366-
Intl::ResolveLocale(isolate, JSCollator::GetAvailableLocales(),
367-
requested_locales, matcher, relevant_extension_keys);
368-
if (maybe_resolve_locale.IsNothing()) {
364+
Intl::ResolvedLocale r;
365+
if (!Intl::ResolveLocale(isolate, JSCollator::GetAvailableLocales(),
366+
requested_locales, matcher, {"co", "kn", "kf"})
367+
.To(&r)) {
369368
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError));
370369
}
371-
Intl::ResolvedLocale r = maybe_resolve_locale.FromJust();
372370

373371
// 18. Set collator.[[Locale]] to r.[[locale]].
374372
icu::Locale icu_locale = r.icu_locale;

deps/v8/src/objects/js-date-time-format.cc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2249,20 +2249,19 @@ MaybeDirectHandle<JSDateTimeFormat> JSDateTimeFormat::CreateDateTimeFormat(
22492249
// ecma402/#sec-intl.datetimeformat-internal-slots
22502250
// The value of the [[RelevantExtensionKeys]] internal slot is
22512251
// « "ca", "nu", "hc" ».
2252-
std::set<std::string> relevant_extension_keys = {"nu", "ca", "hc"};
22532252

22542253
// 10. Let localeData be %DateTimeFormat%.[[LocaleData]].
22552254
// 11. Let r be ResolveLocale( %DateTimeFormat%.[[AvailableLocales]],
22562255
// requestedLocales, opt, %DateTimeFormat%.[[RelevantExtensionKeys]],
22572256
// localeData).
22582257
//
2259-
Maybe<Intl::ResolvedLocale> maybe_resolve_locale = Intl::ResolveLocale(
2260-
isolate, JSDateTimeFormat::GetAvailableLocales(), requested_locales,
2261-
locale_matcher, relevant_extension_keys);
2262-
if (maybe_resolve_locale.IsNothing()) {
2258+
Intl::ResolvedLocale r;
2259+
if (!Intl::ResolveLocale(isolate, JSDateTimeFormat::GetAvailableLocales(),
2260+
requested_locales, locale_matcher,
2261+
{"nu", "ca", "hc"})
2262+
.To(&r)) {
22632263
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError));
22642264
}
2265-
Intl::ResolvedLocale r = maybe_resolve_locale.FromJust();
22662265

22672266
icu::Locale icu_locale = r.icu_locale;
22682267
DCHECK(!icu_locale.isBogus());

deps/v8/src/objects/js-display-names.cc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -436,16 +436,14 @@ MaybeDirectHandle<JSDisplayNames> JSDisplayNames::New(
436436
// ecma402/#sec-Intl.DisplayNames-internal-slots
437437
// The value of the [[RelevantExtensionKeys]] internal slot is
438438
// « ».
439-
std::set<std::string> relevant_extension_keys = {};
440439
// 9. Let r be ResolveLocale(%DisplayNames%.[[AvailableLocales]],
441440
// requestedLocales, opt, %DisplayNames%.[[RelevantExtensionKeys]]).
442-
Maybe<Intl::ResolvedLocale> maybe_resolve_locale =
443-
Intl::ResolveLocale(isolate, JSDisplayNames::GetAvailableLocales(),
444-
requested_locales, matcher, relevant_extension_keys);
445-
if (maybe_resolve_locale.IsNothing()) {
441+
Intl::ResolvedLocale r;
442+
if (!Intl::ResolveLocale(isolate, JSDisplayNames::GetAvailableLocales(),
443+
requested_locales, matcher, {})
444+
.To(&r)) {
446445
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError));
447446
}
448-
Intl::ResolvedLocale r = maybe_resolve_locale.FromJust();
449447

450448
icu::Locale icu_locale = r.icu_locale;
451449

deps/v8/src/objects/js-duration-format.cc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -289,13 +289,12 @@ MaybeDirectHandle<JSDurationFormat> JSDurationFormat::New(
289289
// 9. Let r be ResolveLocale(%DurationFormat%.[[AvailableLocales]],
290290
// requestedLocales, opt, %DurationFormat%.[[RelevantExtensionKeys]],
291291
// %DurationFormat%.[[LocaleData]]).
292-
std::set<std::string> relevant_extension_keys{"nu"};
293292
Intl::ResolvedLocale r;
294-
MAYBE_ASSIGN_RETURN_ON_EXCEPTION_VALUE(
295-
isolate, r,
296-
Intl::ResolveLocale(isolate, JSDurationFormat::GetAvailableLocales(),
297-
requested_locales, matcher, relevant_extension_keys),
298-
DirectHandle<JSDurationFormat>());
293+
if (!Intl::ResolveLocale(isolate, JSDurationFormat::GetAvailableLocales(),
294+
requested_locales, matcher, {"nu"})
295+
.To(&r)) {
296+
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError));
297+
}
299298

300299
// 10. Let locale be r.[[locale]].
301300
icu::Locale r_locale = r.icu_locale;

deps/v8/src/objects/js-list-format.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ MaybeDirectHandle<JSListFormat> JSListFormat::New(
8787

8888
// 10. Let r be ResolveLocale(%ListFormat%.[[AvailableLocales]],
8989
// requestedLocales, opt, undefined, localeData).
90-
Maybe<Intl::ResolvedLocale> maybe_resolve_locale =
91-
Intl::ResolveLocale(isolate, JSListFormat::GetAvailableLocales(),
92-
requested_locales, matcher, {});
93-
if (maybe_resolve_locale.IsNothing()) {
90+
Intl::ResolvedLocale r;
91+
if (!Intl::ResolveLocale(isolate, JSListFormat::GetAvailableLocales(),
92+
requested_locales, matcher, {})
93+
.To(&r)) {
9494
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError));
9595
}
96-
Intl::ResolvedLocale r = maybe_resolve_locale.FromJust();
96+
9797
DirectHandle<String> locale_str =
9898
isolate->factory()->NewStringFromAsciiChecked(r.locale.c_str());
9999

deps/v8/src/objects/js-number-format.cc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,14 +1108,12 @@ MaybeDirectHandle<JSNumberFormat> JSNumberFormat::New(
11081108
// 10. Let r be ResolveLocale(%NumberFormat%.[[AvailableLocales]],
11091109
// requestedLocales, opt, %NumberFormat%.[[RelevantExtensionKeys]],
11101110
// localeData).
1111-
std::set<std::string> relevant_extension_keys{"nu"};
1112-
Maybe<Intl::ResolvedLocale> maybe_resolve_locale =
1113-
Intl::ResolveLocale(isolate, JSNumberFormat::GetAvailableLocales(),
1114-
requested_locales, matcher, relevant_extension_keys);
1115-
if (maybe_resolve_locale.IsNothing()) {
1111+
Intl::ResolvedLocale r;
1112+
if (!Intl::ResolveLocale(isolate, JSNumberFormat::GetAvailableLocales(),
1113+
requested_locales, matcher, {"nu"})
1114+
.To(&r)) {
11161115
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError));
11171116
}
1118-
Intl::ResolvedLocale r = maybe_resolve_locale.FromJust();
11191117

11201118
icu::Locale icu_locale = r.icu_locale;
11211119
UErrorCode status = U_ZERO_ERROR;

deps/v8/src/objects/js-plural-rules.cc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,12 @@ MaybeDirectHandle<JSPluralRules> JSPluralRules::New(
107107
// 11. Let r be ResolveLocale(%PluralRules%.[[AvailableLocales]],
108108
// requestedLocales, opt, %PluralRules%.[[RelevantExtensionKeys]],
109109
// localeData).
110-
Maybe<Intl::ResolvedLocale> maybe_resolve_locale =
111-
Intl::ResolveLocale(isolate, JSPluralRules::GetAvailableLocales(),
112-
requested_locales, matcher, {});
113-
if (maybe_resolve_locale.IsNothing()) {
110+
Intl::ResolvedLocale r;
111+
if (!Intl::ResolveLocale(isolate, JSPluralRules::GetAvailableLocales(),
112+
requested_locales, matcher, {})
113+
.To(&r)) {
114114
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError));
115115
}
116-
Intl::ResolvedLocale r = maybe_resolve_locale.FromJust();
117116
DirectHandle<String> locale_str =
118117
isolate->factory()->NewStringFromAsciiChecked(r.locale.c_str());
119118

0 commit comments

Comments
 (0)