Skip to content

V
V8
Commit c987cf88 authored by Frank Tang's avatar Frank Tang Committed by V8 LUCI CQ
Browse files
Options

[Temporal] Implement getters forwarding to calendar 

Bug: v8:11544
Change-Id: I1a942badc31c0428e8eb07b7e2884f0aab803676
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3373930Reviewed-by: 's avatarShu-yu Guo <syg@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78713}
parent 116ca00f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 161 deletions
src/builtins/builtins-temporal.cc
View file @ c987cf88
This diff is collapsed.
src/objects/js-temporal-objects.cc
View file @ c987cf88
......@@ -1041,7 +1041,8 @@ MaybeHandle<FixedArray> GetPossibleInstantsFor(Isolate* isolate,
Handle<Object> argv[] = {date_time};
ASSIGN_RETURN_ON_EXCEPTION(
isolate, possible_instants,
Execution::Call(isolate, function, time_zone, 1, argv), FixedArray);
Execution::Call(isolate, function, time_zone, arraysize(argv), argv),
FixedArray);
}
// Step 4-6 of GetPossibleInstantsFor is implemented inside
......@@ -1052,7 +1053,7 @@ MaybeHandle<FixedArray> GetPossibleInstantsFor(Isolate* isolate,
isolate, possible_instants,
Execution::CallBuiltin(
isolate, isolate->temporal_instant_fixed_array_from_iterable(),
possible_instants, 1, argv),
possible_instants, arraysize(argv), argv),
FixedArray);
}
DCHECK(possible_instants->IsFixedArray());
......@@ -1782,7 +1783,7 @@ MaybeHandle<JSTemporalPlainDate> CalendarDateAdd(
Handle<Object> added_date;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, added_date,
Execution::Call(isolate, date_add, calendar, 3, argv),
Execution::Call(isolate, date_add, calendar, arraysize(argv), argv),
JSTemporalPlainDate);
// 4. Perform ? RequireInternalSlot(addedDate, [[InitializedTemporalDate]]).
if (!added_date->IsJSTemporalPlainDate()) {
......@@ -1819,7 +1820,7 @@ MaybeHandle<JSTemporalDuration> CalendarDateUntil(
Handle<Object> duration;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, duration,
Execution::Call(isolate, date_until, calendar, 3, argv),
Execution::Call(isolate, date_until, calendar, arraysize(argv), argv),
JSTemporalDuration);
// 4. Perform ? RequireInternalSlot(duration,
// [[InitializedTemporalDuration]]).
......@@ -1886,9 +1887,143 @@ Maybe<int64_t> GetOffsetNanosecondsFor(Isolate* isolate,
return Just(offset_nanoseconds_int);
}
MaybeHandle<Object> ToIntegerThrowOnInfinity(Isolate* isolate,
Handle<Object> argument);
MaybeHandle<Object> ToPositiveInteger(Isolate* isolate,
Handle<Object> argument) {
TEMPORAL_ENTER_FUNC();
// 1. Let integer be ? ToInteger(argument).
ASSIGN_RETURN_ON_EXCEPTION(
isolate, argument, ToIntegerThrowOnInfinity(isolate, argument), Object);
// 2. If integer ≤ 0, then
if (NumberToInt32(*argument) <= 0) {
// a. Throw a RangeError exception.
THROW_NEW_ERROR(isolate, NEW_TEMPORAL_INVALD_ARG_RANGE_ERROR(), Object);
}
return argument;
}
} // namespace
namespace temporal {
MaybeHandle<Object> InvokeCalendarMethod(Isolate* isolate,
Handle<JSReceiver> calendar,
Handle<String> name,
Handle<JSReceiver> date_like) {
Handle<Object> result;
/* 1. Assert: Type(calendar) is Object. */
DCHECK(calendar->IsObject());
/* 2. Let result be ? Invoke(calendar, #name, « dateLike »). */
Handle<Object> function;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, function, Object::GetProperty(isolate, calendar, name), Object);
if (!function->IsCallable()) {
THROW_NEW_ERROR(isolate,
NewTypeError(MessageTemplate::kCalledNonCallable, name),
Object);
}
Handle<Object> argv[] = {date_like};
ASSIGN_RETURN_ON_EXCEPTION(
isolate, result,
Execution::Call(isolate, function, calendar, arraysize(argv), argv),
Object);
return result;
}
#define CALENDAR_ABSTRACT_OPERATION_INT_ACTION(Name, name, Action) \
MaybeHandle<Object> Calendar##Name(Isolate* isolate, \
Handle<JSReceiver> calendar, \
Handle<JSReceiver> date_like) { \
/* 1. Assert: Type(calendar) is Object. */ \
/* 2. Let result be ? Invoke(calendar, property, « dateLike »). */ \
Handle<Object> result; \
ASSIGN_RETURN_ON_EXCEPTION( \
isolate, result, \
InvokeCalendarMethod(isolate, calendar, \
isolate->factory()->name##_string(), date_like), \
Object); \
/* 3. If result is undefined, throw a RangeError exception. */ \
if (result->IsUndefined()) { \
THROW_NEW_ERROR(isolate, NEW_TEMPORAL_INVALD_ARG_RANGE_ERROR(), Object); \
} \
/* 4. Return ? Action(result). */ \
ASSIGN_RETURN_ON_EXCEPTION(isolate, result, Action(isolate, result), \
Object); \
return Handle<Smi>(Smi::FromInt(result->Number()), isolate); \
}
// #sec-temporal-calendaryear
CALENDAR_ABSTRACT_OPERATION_INT_ACTION(Year, year, ToIntegerThrowOnInfinity)
// #sec-temporal-calendarmonth
CALENDAR_ABSTRACT_OPERATION_INT_ACTION(Month, month, ToPositiveInteger)
// #sec-temporal-calendarday
CALENDAR_ABSTRACT_OPERATION_INT_ACTION(Day, day, ToPositiveInteger)
// #sec-temporal-calendarmonthcode
MaybeHandle<Object> CalendarMonthCode(Isolate* isolate,
Handle<JSReceiver> calendar,
Handle<JSReceiver> date_like) {
// 1. Assert: Type(calendar) is Object.
// 2. Let result be ? Invoke(calendar, monthCode , « dateLike »).
Handle<Object> result;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, result,
InvokeCalendarMethod(isolate, calendar,
isolate->factory()->monthCode_string(), date_like),
Object);
/* 3. If result is undefined, throw a RangeError exception. */
if (result->IsUndefined()) {
THROW_NEW_ERROR(isolate, NEW_TEMPORAL_INVALD_ARG_RANGE_ERROR(), Object);
}
// 4. Return ? ToString(result).
return Object::ToString(isolate, result);
}
#ifdef V8_INTL_SUPPORT
// #sec-temporal-calendarerayear
MaybeHandle<Object> CalendarEraYear(Isolate* isolate,
Handle<JSReceiver> calendar,
Handle<JSReceiver> date_like) {
// 1. Assert: Type(calendar) is Object.
// 2. Let result be ? Invoke(calendar, eraYear , « dateLike »).
Handle<Object> result;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, result,
InvokeCalendarMethod(isolate, calendar,
isolate->factory()->eraYear_string(), date_like),
Object);
// 3. If result is not undefined, set result to ? ToIntegerOrInfinity(result).
if (!result->IsUndefined()) {
ASSIGN_RETURN_ON_EXCEPTION(
isolate, result, ToIntegerThrowOnInfinity(isolate, result), Object);
}
// 4. Return result.
return result;
}
// #sec-temporal-calendarera
MaybeHandle<Object> CalendarEra(Isolate* isolate, Handle<JSReceiver> calendar,
Handle<JSReceiver> date_like) {
// 1. Assert: Type(calendar) is Object.
// 2. Let result be ? Invoke(calendar, era , « dateLike »).
Handle<Object> result;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, result,
InvokeCalendarMethod(isolate, calendar, isolate->factory()->era_string(),
date_like),
Object);
// 3. If result is not undefined, set result to ? ToString(result).
if (!result->IsUndefined()) {
ASSIGN_RETURN_ON_EXCEPTION(isolate, result,
Object::ToString(isolate, result), Object);
}
// 4. Return result.
return result;
}
#endif // V8_INTL_SUPPORT
// #sec-temporal-getiso8601calendar
MaybeHandle<JSTemporalCalendar> GetISO8601Calendar(Isolate* isolate) {
return CreateTemporalCalendar(isolate, isolate->factory()->iso8601_string());
......
src/objects/js-temporal-objects.h
View file @ c987cf88
......@@ -291,6 +291,23 @@ V8_WARN_UNUSED_RESULT MaybeHandle<JSTemporalInstant> CreateTemporalInstant(
V8_WARN_UNUSED_RESULT MaybeHandle<JSTemporalInstant> CreateTemporalInstant(
Isolate* isolate, Handle<BigInt> epoch_nanoseconds);
// #sec-temporal-calendaryear
#define DECLARE_CALENDAR_ABSTRACT_OPERATION(Name) \
V8_WARN_UNUSED_RESULT MaybeHandle<Object> Calendar##Name( \
Isolate* isolate, Handle<JSReceiver> calendar, \
Handle<JSReceiver> date_like);
DECLARE_CALENDAR_ABSTRACT_OPERATION(Year)
DECLARE_CALENDAR_ABSTRACT_OPERATION(Month)
DECLARE_CALENDAR_ABSTRACT_OPERATION(MonthCode)
DECLARE_CALENDAR_ABSTRACT_OPERATION(Day)
#ifdef V8_INTL_SUPPORT
DECLARE_CALENDAR_ABSTRACT_OPERATION(Era)
DECLARE_CALENDAR_ABSTRACT_OPERATION(EraYear)
#endif // V8_INTL_SUPPORT
#undef DECLARE_CALENDAR_ABSTRACT_OPERATION
// #sec-temporal-getiso8601calendar
V8_WARN_UNUSED_RESULT MaybeHandle<JSTemporalCalendar> GetISO8601Calendar(
Isolate* isolate);
......@@ -303,6 +320,10 @@ BuiltinTimeZoneGetPlainDateTimeFor(Isolate* isolate,
Handle<JSReceiver> calendar,
const char* method);
V8_WARN_UNUSED_RESULT MaybeHandle<Object> InvokeCalendarMethod(
Isolate* isolate, Handle<JSReceiver> calendar, Handle<String> name,
Handle<JSReceiver> temporal_like);
} // namespace temporal
} // namespace internal
} // namespace v8
......
test/mjsunit/mjsunit.status
View file @ c987cf88
......@@ -85,44 +85,16 @@
'temporal/plain-date-compare': [FAIL],
'temporal/plain-date-equals': [FAIL],
'temporal/plain-date-from': [FAIL],
'temporal/plain-date-get-day': [FAIL],
'temporal/plain-date-get-dayOfWeek': [FAIL],
'temporal/plain-date-get-dayOfYear': [FAIL],
'temporal/plain-date-get-daysInMonth': [FAIL],
'temporal/plain-date-get-daysInWeek': [FAIL],
'temporal/plain-date-get-daysInYear': [FAIL],
'temporal/plain-date-get-era': [FAIL],
'temporal/plain-date-get-eraYear': [FAIL],
'temporal/plain-date-get-inLeapYear': [FAIL],
'temporal/plain-date-get-month': [FAIL],
'temporal/plain-date-get-monthCode': [FAIL],
'temporal/plain-date-get-monthsInYear': [FAIL],
'temporal/plain-date-get-weekOfYear': [FAIL],
'temporal/plain-date-get-year': [FAIL],
'temporal/plain-date-time-add': [FAIL],
'temporal/plain-date-time-compare': [FAIL],
'temporal/plain-date-time-equals': [FAIL],
'temporal/plain-date-time-from': [FAIL],
'temporal/plain-date-time-get-day': [FAIL],
'temporal/plain-date-time-get-dayOfWeek': [FAIL],
'temporal/plain-date-time-get-dayOfYear': [FAIL],
'temporal/plain-date-time-get-daysInMonth': [FAIL],
'temporal/plain-date-time-get-daysInWeek': [FAIL],
'temporal/plain-date-time-get-daysInYear': [FAIL],
'temporal/plain-date-time-get-era': [FAIL],
'temporal/plain-date-time-get-eraYear': [FAIL],
'temporal/plain-date-time-get-hour': [FAIL],
'temporal/plain-date-time-get-inLeapYear': [FAIL],
'temporal/plain-date-time-get-microsecond': [FAIL],
'temporal/plain-date-time-get-millisecond': [FAIL],
'temporal/plain-date-time-get-minute': [FAIL],
'temporal/plain-date-time-get-month': [FAIL],
'temporal/plain-date-time-get-monthCode': [FAIL],
'temporal/plain-date-time-get-monthsInYear': [FAIL],
'temporal/plain-date-time-get-nanosecond': [FAIL],
'temporal/plain-date-time-get-second': [FAIL],
'temporal/plain-date-time-get-weekOfYear': [FAIL],
'temporal/plain-date-time-get-year': [FAIL],
'temporal/plain-date-time-subtract': [FAIL],
'temporal/plain-date-time-to-json': [FAIL],
'temporal/plain-date-time-to-plain-date': [FAIL],
......@@ -547,6 +519,10 @@
# Temporal intl tests won't work in no_i18n
'temporal/function-exist': [FAIL],
'temporal/plain-date-get-era': [FAIL],
'temporal/plain-date-get-eraYear': [FAIL],
'temporal/plain-date-time-get-era': [FAIL],
'temporal/plain-date-time-get-eraYear': [FAIL],
# Non-BMP characters currently aren't considered identifiers in no_i18n
'harmony/private-name-surrogate-pair': [PASS,FAIL],
......
test/test262/test262.status
View file @ c987cf88
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment