Skip to content

Commit

Permalink
Bug 1840374 - Part 11: Don't call ToString in Temporal.Calendar.proto…
Browse files Browse the repository at this point in the history
…type.toJSON. r=spidermonkey-reviewers,dminor

Also per <tc39/proposal-temporal#2482>.

Depends on D182028

Differential Revision: https://phabricator.services.mozilla.com/D182029

UltraBlame original commit: 06d1f2c99d3655bb48f32c40284c4b676d578f5c
  • Loading branch information
marco-c committed Jul 21, 2023
1 parent e59d098 commit 95ac47e
Showing 1 changed file with 14 additions and 26 deletions.
40 changes: 14 additions & 26 deletions js/src/builtin/temporal/Calendar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18287,13 +18287,10 @@ CallArgs
args
)
{
Rooted
<
CalendarValue
>
auto
*
calendar
(
cx
=
&
args
.
Expand All @@ -18304,28 +18301,14 @@ thisv
toObject
(
)
)
;
JSString
*
str
=
CalendarToString
(
cx
calendar
)
;
if
.
as
<
CalendarObject
>
(
!
str
)
{
return
false
;
}
args
.
rval
Expand All @@ -18334,7 +18317,12 @@ rval
.
setString
(
str
calendar
-
>
identifier
(
)
)
;
return
Expand Down

0 comments on commit 95ac47e

Please sign in to comment.