From 7b6784cb00be98045d811901dbfc9936308a7331 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Fri, 21 Jul 2023 19:09:23 +0000 Subject: [PATCH] Bug 1840374 - Part 5: Remove calendar from PlainTime. r=spidermonkey-reviewers,mgaudet PlainTime objects no longer have an associated calendar slot. See . Depends on D182022 Differential Revision: https://phabricator.services.mozilla.com/D182023 UltraBlame original commit: ece2a09b9b46acf5245b5e04f96a79a3ed3c9c3e --- js/src/builtin/temporal/Calendar.cpp | 67 ------ js/src/builtin/temporal/PlainMonthDay.cpp | 66 ------ js/src/builtin/temporal/PlainTime.cpp | 258 ---------------------- js/src/builtin/temporal/PlainTime.h | 113 +--------- 4 files changed, 1 insertion(+), 503 deletions(-) diff --git a/js/src/builtin/temporal/Calendar.cpp b/js/src/builtin/temporal/Calendar.cpp index 8a15f50177c5..992d4137dd3c 100644 --- a/js/src/builtin/temporal/Calendar.cpp +++ b/js/src/builtin/temporal/Calendar.cpp @@ -2925,70 +2925,6 @@ T ) ) { -if -constexpr -( -std -: -: -is_same_v -< -T -PlainTimeObject -> -) -{ -AutoRealm -ar -( -cx -unwrapped -) -; -Rooted -< -PlainTimeObject -* -> -plainTime -( -cx -unwrapped -) -; -auto -* -calendar -= -PlainTimeObject -: -: -getOrCreateCalendar -( -cx -plainTime -) -; -if -( -! -calendar -) -{ -return -false -; -} -result -. -set -( -calendar -) -; -} -else -{ result . set @@ -3001,7 +2937,6 @@ calendar ) ) ; -} return cx - @@ -3160,7 +3095,6 @@ ToTemporalCalendar PlainDateObject PlainDateTimeObject PlainMonthDayObject -PlainTimeObject PlainYearMonthObject ZonedDateTimeObject > @@ -3582,7 +3516,6 @@ ToTemporalCalendar PlainDateObject PlainDateTimeObject PlainMonthDayObject -PlainTimeObject PlainYearMonthObject ZonedDateTimeObject > diff --git a/js/src/builtin/temporal/PlainMonthDay.cpp b/js/src/builtin/temporal/PlainMonthDay.cpp index f4f891ef6d35..4e3ad39aedac 100644 --- a/js/src/builtin/temporal/PlainMonthDay.cpp +++ b/js/src/builtin/temporal/PlainMonthDay.cpp @@ -904,70 +904,6 @@ T ) ) { -if -constexpr -( -std -: -: -is_same_v -< -T -PlainTimeObject -> -) -{ -AutoRealm -ar -( -cx -unwrapped -) -; -Rooted -< -PlainTimeObject -* -> -plainTime -( -cx -unwrapped -) -; -auto -* -calendar -= -PlainTimeObject -: -: -getOrCreateCalendar -( -cx -plainTime -) -; -if -( -! -calendar -) -{ -return -false -; -} -result -. -set -( -calendar -) -; -} -else -{ result . set @@ -980,7 +916,6 @@ calendar ) ) ; -} return cx - @@ -1134,7 +1069,6 @@ ToTemporalCalendarForMonthDay < PlainDateObject PlainDateTimeObject -PlainTimeObject PlainYearMonthObject ZonedDateTimeObject > diff --git a/js/src/builtin/temporal/PlainTime.cpp b/js/src/builtin/temporal/PlainTime.cpp index c0cbc7d3db27..9764d73d7a13 100644 --- a/js/src/builtin/temporal/PlainTime.cpp +++ b/js/src/builtin/temporal/PlainTime.cpp @@ -1824,20 +1824,6 @@ nanosecond ) ) ; -object -- -> -setFixedSlot -( -PlainTimeObject -: -: -CALENDAR_SLOT -NullValue -( -) -) -; return object ; @@ -2000,20 +1986,6 @@ nanosecond ) ) ; -object -- -> -setFixedSlot -( -PlainTimeObject -: -: -CALENDAR_SLOT -NullValue -( -) -) -; return object ; @@ -8512,61 +8484,6 @@ return true ; } -JSObject -* -js -: -: -temporal -: -: -PlainTimeObject -: -: -createCalendar -( -JSContext -* -cx -Handle -< -PlainTimeObject -* -> -obj -) -{ -auto -* -calendar -= -GetISO8601Calendar -( -cx -) -; -if -( -! -calendar -) -{ -return -nullptr -; -} -obj -- -> -setCalendar -( -calendar -) -; -return -calendar -; -} static bool PlainTimeConstructor @@ -9189,120 +9106,6 @@ true } static bool -PlainTime_calendar -( -JSContext -* -cx -const -CallArgs -& -args -) -{ -Rooted -< -PlainTimeObject -* -> -temporalTime -( -cx -& -args -. -thisv -( -) -. -toObject -( -) -. -as -< -PlainTimeObject -> -( -) -) -; -auto -* -calendar -= -PlainTimeObject -: -: -getOrCreateCalendar -( -cx -temporalTime -) -; -if -( -! -calendar -) -{ -return -false -; -} -args -. -rval -( -) -. -setObject -( -* -calendar -) -; -return -true -; -} -static -bool -PlainTime_calendar -( -JSContext -* -cx -unsigned -argc -Value -* -vp -) -{ -CallArgs -args -= -CallArgsFromVp -( -argc -vp -) -; -return -CallNonGenericMethod -< -IsPlainTime -PlainTime_calendar -> -( -cx -args -) -; -} -static -bool PlainTime_hour ( JSContext @@ -11500,29 +11303,6 @@ ToPlainTime temporalTime ) ; -auto -* -calendar -= -PlainTimeObject -: -: -getOrCreateCalendar -( -cx -temporalTime -) -; -if -( -! -calendar -) -{ -return -false -; -} Rooted < IdValueVector @@ -11552,36 +11332,6 @@ names ( ) . -calendar -) -ObjectValue -( -* -calendar -) -) -) -{ -return -false -; -} -if -( -! -fields -. -emplaceBack -( -NameToId -( -cx -- -> -names -( -) -. isoHour ) Int32Value @@ -12643,14 +12393,6 @@ PlainTime_prototype_properties JS_PSG ( " -calendar -" -PlainTime_calendar -0 -) -JS_PSG -( -" hour " PlainTime_hour diff --git a/js/src/builtin/temporal/PlainTime.h b/js/src/builtin/temporal/PlainTime.h index 2fb1a82a1c45..0dd62beed2e4 100644 --- a/js/src/builtin/temporal/PlainTime.h +++ b/js/src/builtin/temporal/PlainTime.h @@ -126,16 +126,9 @@ ISO_NANOSECOND_SLOT static constexpr uint32_t -CALENDAR_SLOT -= -6 -; -static -constexpr -uint32_t SLOT_COUNT = -7 +6 ; int32_t isoHour @@ -239,113 +232,9 @@ toInt32 ) ; } -JSObject -* -getCalendar -( -) -const -{ -return -getFixedSlot -( -CALENDAR_SLOT -) -. -toObjectOrNull -( -) -; -} -void -setCalendar -( -JSObject -* -calendar -) -{ -setFixedSlot -( -CALENDAR_SLOT -JS -: -: -ObjectValue -( -* -calendar -) -) -; -} -static -JSObject -* -getOrCreateCalendar -( -JSContext -* -cx -JS -: -: -Handle -< -PlainTimeObject -* -> -obj -) -{ -if -( -auto -* -calendar -= -obj -- -> -getCalendar -( -) -) -{ -return -calendar -; -} -return -createCalendar -( -cx -obj -) -; -} private : static -JSObject -* -createCalendar -( -JSContext -* -cx -JS -: -: -Handle -< -PlainTimeObject -* -> -obj -) -; -static const ClassSpec classSpec_