Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1874684 - Part 15: Prefer int64_t in Add24HourDaysToNormalizedTimeDuration. r=sfink

Browse Source 
Switch to `int64_t` to avoid some unnecessary `int64_t -> double -> int64_t` conversions.

Differential Revision: https://phabricator.services.mozilla.com/D198549
This commit is contained in:
André Bargull 2024-04-15 18:27:23 +00:00
parent 8c9d45d621
commit fb66d8df7a
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/src/builtin/temporal/Duration.cpp
View File

@ -7,6 +7,7 @@
#include "builtin/temporal/Duration.h"
#include "mozilla/Assertions.h"
#include "mozilla/Casting.h"
#include "mozilla/CheckedInt.h"
#include "mozilla/EnumSet.h"
#include "mozilla/FloatingPoint.h"
@ -314,18 +315,11 @@ static mozilla::Maybe<NormalizedTimeDuration> NormalizeSeconds(
* Normalize a days amount into a time duration. Return Nothing if the value is
* too large.
*/
static mozilla::Maybe<NormalizedTimeDuration> NormalizeDays(double days) {
MOZ_ASSERT(IsInteger(days));
static mozilla::Maybe<NormalizedTimeDuration> NormalizeDays(int64_t days) {
do {
int64_t intDays;
if (!mozilla::NumberEqualsInt64(days, &intDays)) {
break;
}
// Compute the overall amount of milliseconds.
auto millis =
mozilla::CheckedInt64(intDays) * ToMilliseconds(TemporalUnit::Day);
mozilla::CheckedInt64(days) * ToMilliseconds(TemporalUnit::Day);
if (!millis.isValid()) {
break;
}
@ -485,10 +479,9 @@ static bool SubtractNormalizedTimeDuration(JSContext* cx,
* Add24HourDaysToNormalizedTimeDuration ( d, days )
*/
bool js::temporal::Add24HourDaysToNormalizedTimeDuration(
JSContext* cx, const NormalizedTimeDuration& d, double days,
JSContext* cx, const NormalizedTimeDuration& d, int64_t days,
NormalizedTimeDuration* result) {
MOZ_ASSERT(IsValidNormalizedTimeDuration(d));
MOZ_ASSERT(IsInteger(days));
// Step 1.
auto normalizedDays = NormalizeDays(days);
@ -2084,8 +2077,13 @@ static bool AddDuration(JSContext* cx, const Duration& one, const Duration& two,
}
// Step 6.e.
if (!Add24HourDaysToNormalizedTimeDuration(
cx, normalized, one.days + two.days, &normalized)) {
int64_t days1 = mozilla::AssertedCast<int64_t>(one.days);
int64_t days2 = mozilla::AssertedCast<int64_t>(two.days);
auto totalDays = mozilla::CheckedInt64(days1) + days2;
MOZ_ASSERT(totalDays.isValid(), "adding two duration days can't overflow");
if (!Add24HourDaysToNormalizedTimeDuration(cx, normalized, totalDays.value(),
&normalized)) {
return false;
}
@ -4564,7 +4562,7 @@ static bool Duration_compare(JSContext* cx, unsigned argc, Value* vp) {
}
// Steps 13-14.
double days1, days2;
int64_t days1, days2;
if (calendarUnitsPresent) {
// FIXME: spec issue - directly throw an error if plainRelativeTo is undef.
@ -4607,10 +4605,10 @@ static bool Duration_compare(JSContext* cx, unsigned argc, Value* vp) {
days2 = unbalanceResult2.days;
} else {
// Step 14.a.
days1 = one.days;
days1 = mozilla::AssertedCast<int64_t>(one.days);
// Step 14.b.
days2 = two.days;
days2 = mozilla::AssertedCast<int64_t>(two.days);
}
// Step 15.

2
js/src/builtin/temporal/Duration.h
View File

@ -190,7 +190,7 @@ inline int32_t NormalizedTimeDurationSign(const NormalizedTimeDuration& d) {
*/
bool Add24HourDaysToNormalizedTimeDuration(JSContext* cx,
const NormalizedTimeDuration& d,
double days,
int64_t days,
NormalizedTimeDuration* result);
/**