From 64f6d80bdccb13ff08c5ff17865e44de66eab8f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Bargull?= Date: Mon, 15 Apr 2024 18:27:23 +0000 Subject: [PATCH] Bug 1874684 - Part 16: Fix "const auto" warnings from clang-tidy. r=allstarschh Differential Revision: https://phabricator.services.mozilla.com/D198550 --- js/src/builtin/temporal/Calendar.cpp | 6 ++--- js/src/builtin/temporal/Duration.cpp | 38 +++++++++++++++--------------- js/src/builtin/temporal/Instant.cpp | 2 +- js/src/builtin/temporal/PlainDate.cpp | 10 ++++---- js/src/builtin/temporal/PlainDateTime.cpp | 9 +++---- js/src/builtin/temporal/PlainMonthDay.cpp | 2 +- js/src/builtin/temporal/PlainTime.cpp | 14 +++++++---- js/src/builtin/temporal/PlainYearMonth.cpp | 2 +- js/src/builtin/temporal/Temporal.cpp | 16 +++++++++---- js/src/builtin/temporal/TemporalFields.cpp | 8 +++---- js/src/builtin/temporal/TimeZone.cpp | 2 +- 11 files changed, 61 insertions(+), 48 deletions(-) diff --git a/js/src/builtin/temporal/Calendar.cpp b/js/src/builtin/temporal/Calendar.cpp index 3bd291cfe8bd..a3cf7dffddcc 100644 --- a/js/src/builtin/temporal/Calendar.cpp +++ b/js/src/builtin/temporal/Calendar.cpp @@ -312,7 +312,7 @@ int32_t js::temporal::ToISODayOfYear(const PlainDate& date) { MOZ_ASSERT(ISODateTimeWithinLimits(date)); // Steps 1-5. - auto& [year, month, day] = date; + const auto& [year, month, day] = date; return ::ToISODayOfYear(year, month, day); } @@ -423,7 +423,7 @@ struct YearWeek final { static YearWeek ToISOWeekOfYear(const PlainDate& date) { MOZ_ASSERT(ISODateTimeWithinLimits(date)); - auto& [year, month, day] = date; + const auto& [year, month, day] = date; // TODO: https://en.wikipedia.org/wiki/Week#The_ISO_week_date_system // TODO: https://en.wikipedia.org/wiki/ISO_week_date#Algorithms @@ -2850,7 +2850,7 @@ static bool ISOFieldKeysToIgnore(JSContext* cx, const PropertyVector& keys, // Step 2. bool seenMonthOrMonthCode = false; - for (auto& key : keys) { + for (const auto& key : keys) { // Reorder the substeps in order to use |putNew| instead of |put|, because // the former is slightly faster. diff --git a/js/src/builtin/temporal/Duration.cpp b/js/src/builtin/temporal/Duration.cpp index 3a08746f80e3..b0052ac10b01 100644 --- a/js/src/builtin/temporal/Duration.cpp +++ b/js/src/builtin/temporal/Duration.cpp @@ -83,8 +83,8 @@ static bool IsIntegerOrInfinity(double d) { } static bool IsIntegerOrInfinityDuration(const Duration& duration) { - auto& [years, months, weeks, days, hours, minutes, seconds, milliseconds, - microseconds, nanoseconds] = duration; + const auto& [years, months, weeks, days, hours, minutes, seconds, + milliseconds, microseconds, nanoseconds] = duration; // Integers exceeding the Number range are represented as infinity. @@ -96,8 +96,8 @@ static bool IsIntegerOrInfinityDuration(const Duration& duration) { } static bool IsIntegerDuration(const Duration& duration) { - auto& [years, months, weeks, days, hours, minutes, seconds, milliseconds, - microseconds, nanoseconds] = duration; + const auto& [years, months, weeks, days, hours, minutes, seconds, + milliseconds, microseconds, nanoseconds] = duration; return IsInteger(years) && IsInteger(months) && IsInteger(weeks) && IsInteger(days) && IsInteger(hours) && IsInteger(minutes) && @@ -125,8 +125,8 @@ static constexpr bool IsSafeInteger(const Int128& x) { int32_t js::temporal::DurationSign(const Duration& duration) { MOZ_ASSERT(IsIntegerOrInfinityDuration(duration)); - auto& [years, months, weeks, days, hours, minutes, seconds, milliseconds, - microseconds, nanoseconds] = duration; + const auto& [years, months, weeks, days, hours, minutes, seconds, + milliseconds, microseconds, nanoseconds] = duration; // Step 1. for (auto v : {years, months, weeks, days, hours, minutes, seconds, @@ -151,7 +151,7 @@ int32_t js::temporal::DurationSign(const Duration& duration) { * milliseconds, microseconds, nanoseconds ) */ static int32_t DurationSign(const DateDuration& duration) { - auto& [years, months, weeks, days] = duration; + const auto& [years, months, weeks, days] = duration; // Step 1. for (auto v : {years, months, weeks, days}) { @@ -557,8 +557,8 @@ js::temporal::NormalizedTimeDurationFromEpochNanosecondsDifference( bool js::temporal::IsValidDuration(const Duration& duration) { MOZ_ASSERT(IsIntegerOrInfinityDuration(duration)); - auto& [years, months, weeks, days, hours, minutes, seconds, milliseconds, - microseconds, nanoseconds] = duration; + const auto& [years, months, weeks, days, hours, minutes, seconds, + milliseconds, microseconds, nanoseconds] = duration; // Step 1. int32_t sign = DurationSign(duration); @@ -646,8 +646,8 @@ bool js::temporal::ThrowIfInvalidDuration(JSContext* cx, const Duration& duration) { MOZ_ASSERT(IsIntegerOrInfinityDuration(duration)); - auto& [years, months, weeks, days, hours, minutes, seconds, milliseconds, - microseconds, nanoseconds] = duration; + const auto& [years, months, weeks, days, hours, minutes, seconds, + milliseconds, microseconds, nanoseconds] = duration; // Step 1. int32_t sign = DurationSign(duration); @@ -742,7 +742,7 @@ bool js::temporal::ThrowIfInvalidDuration(JSContext* cx, */ bool js::temporal::ThrowIfInvalidDuration(JSContext* cx, const DateDuration& duration) { - auto& [years, months, weeks, days] = duration; + const auto& [years, months, weeks, days] = duration; // Step 1. int32_t sign = ::DurationSign(duration); @@ -872,8 +872,8 @@ static TemporalUnit DefaultTemporalLargestUnit(const Duration& duration) { static DurationObject* CreateTemporalDuration(JSContext* cx, const CallArgs& args, const Duration& duration) { - auto& [years, months, weeks, days, hours, minutes, seconds, milliseconds, - microseconds, nanoseconds] = duration; + const auto& [years, months, weeks, days, hours, minutes, seconds, + milliseconds, microseconds, nanoseconds] = duration; // Step 1. if (!ThrowIfInvalidDuration(cx, duration)) { @@ -920,8 +920,8 @@ static DurationObject* CreateTemporalDuration(JSContext* cx, */ DurationObject* js::temporal::CreateTemporalDuration(JSContext* cx, const Duration& duration) { - auto& [years, months, weeks, days, hours, minutes, seconds, milliseconds, - microseconds, nanoseconds] = duration; + const auto& [years, months, weeks, days, hours, minutes, seconds, + milliseconds, microseconds, nanoseconds] = duration; MOZ_ASSERT(IsInteger(years)); MOZ_ASSERT(IsInteger(months)); @@ -1940,7 +1940,7 @@ static bool BalanceDateDurationRelative( } // Step 10.b. - auto& yearsMonthsWeeksDaysDuration = duration; + const auto& yearsMonthsWeeksDaysDuration = duration; // Steps 10.c-d. Duration untilResult; @@ -1974,7 +1974,7 @@ static bool BalanceDateDurationRelative( } // Step 11.c. - auto& monthsWeeksDaysDuration = duration; + const auto& monthsWeeksDaysDuration = duration; // Steps 11.d-e. Duration untilResult; @@ -2002,7 +2002,7 @@ static bool BalanceDateDurationRelative( MOZ_ASSERT(months == 0); // Step 15. - auto& weeksDaysDuration = duration; + const auto& weeksDaysDuration = duration; // Steps 16-17. Duration untilResult; diff --git a/js/src/builtin/temporal/Instant.cpp b/js/src/builtin/temporal/Instant.cpp index 5f30980d755a..1ce48d2c6832 100644 --- a/js/src/builtin/temporal/Instant.cpp +++ b/js/src/builtin/temporal/Instant.cpp @@ -348,7 +348,7 @@ BigInt* js::temporal::ToEpochNanoseconds(JSContext* cx, * microsecond, nanosecond [ , offsetNanoseconds ] ) */ Instant js::temporal::GetUTCEpochNanoseconds(const PlainDateTime& dateTime) { - auto& [date, time] = dateTime; + const auto& [date, time] = dateTime; // Step 1. MOZ_ASSERT(IsValidISODateTime(dateTime)); diff --git a/js/src/builtin/temporal/PlainDate.cpp b/js/src/builtin/temporal/PlainDate.cpp index 8b16d47891f8..196d79bad9c1 100644 --- a/js/src/builtin/temporal/PlainDate.cpp +++ b/js/src/builtin/temporal/PlainDate.cpp @@ -112,7 +112,7 @@ static bool IsValidISODate(T year, T month, T day) { * IsValidISODate ( year, month, day ) */ bool js::temporal::IsValidISODate(const PlainDate& date) { - auto& [year, month, day] = date; + const auto& [year, month, day] = date; return ::IsValidISODate(year, month, day); } @@ -183,7 +183,7 @@ static bool ThrowIfInvalidISODate(JSContext* cx, T year, T month, T day) { * IsValidISODate ( year, month, day ) */ bool js::temporal::ThrowIfInvalidISODate(JSContext* cx, const PlainDate& date) { - auto& [year, month, day] = date; + const auto& [year, month, day] = date; return ::ThrowIfInvalidISODate(cx, year, month, day); } @@ -201,7 +201,7 @@ bool js::temporal::ThrowIfInvalidISODate(JSContext* cx, double year, * With |overflow = "constrain"|. */ static PlainDate ConstrainISODate(const PlainDate& date) { - auto& [year, month, day] = date; + const auto& [year, month, day] = date; // Step 1.a. int32_t m = std::clamp(month, 1, 12); @@ -336,7 +336,7 @@ static PlainDateObject* CreateTemporalDate(JSContext* cx, const CallArgs& args, */ PlainDateObject* js::temporal::CreateTemporalDate( JSContext* cx, const PlainDate& date, Handle calendar) { - auto& [isoYear, isoMonth, isoDay] = date; + const auto& [isoYear, isoMonth, isoDay] = date; // Step 1. if (!ThrowIfInvalidISODate(cx, date)) { @@ -962,7 +962,7 @@ static bool AddDate(JSContext* cx, const PlainDate& date, // Steps 1-4. (Not applicable) // Step 5. (Not applicable) - auto& timeDuration = duration.time; + const auto& timeDuration = duration.time; // Step 6. int64_t balancedDays = diff --git a/js/src/builtin/temporal/PlainDateTime.cpp b/js/src/builtin/temporal/PlainDateTime.cpp index acd491186e39..947498264e07 100644 --- a/js/src/builtin/temporal/PlainDateTime.cpp +++ b/js/src/builtin/temporal/PlainDateTime.cpp @@ -229,7 +229,7 @@ bool js::temporal::ISODateTimeWithinLimits(double year, double month, * millisecond, microsecond, nanosecond ) */ bool js::temporal::ISODateTimeWithinLimits(const PlainDateTime& dateTime) { - auto& [date, time] = dateTime; + const auto& [date, time] = dateTime; return ::ISODateTimeWithinLimits(date.year, date.month, date.day, time.hour, time.minute, time.second, time.millisecond, time.microsecond, time.nanosecond); @@ -342,9 +342,10 @@ static PlainDateTimeObject* CreateTemporalDateTime( PlainDateTimeObject* js::temporal::CreateTemporalDateTime( JSContext* cx, const PlainDateTime& dateTime, Handle calendar) { - auto& [date, time] = dateTime; - auto& [isoYear, isoMonth, isoDay] = date; - auto& [hour, minute, second, millisecond, microsecond, nanosecond] = time; + const auto& [date, time] = dateTime; + const auto& [isoYear, isoMonth, isoDay] = date; + const auto& [hour, minute, second, millisecond, microsecond, nanosecond] = + time; // Steps 1-2. if (!ThrowIfInvalidISODateTime(cx, dateTime)) { diff --git a/js/src/builtin/temporal/PlainMonthDay.cpp b/js/src/builtin/temporal/PlainMonthDay.cpp index 0896100a3f0b..e2f06e8bb8cd 100644 --- a/js/src/builtin/temporal/PlainMonthDay.cpp +++ b/js/src/builtin/temporal/PlainMonthDay.cpp @@ -117,7 +117,7 @@ static PlainMonthDayObject* CreateTemporalMonthDay( */ PlainMonthDayObject* js::temporal::CreateTemporalMonthDay( JSContext* cx, const PlainDate& date, Handle calendar) { - auto& [isoYear, isoMonth, isoDay] = date; + const auto& [isoYear, isoMonth, isoDay] = date; // Step 1. if (!ThrowIfInvalidISODate(cx, date)) { diff --git a/js/src/builtin/temporal/PlainTime.cpp b/js/src/builtin/temporal/PlainTime.cpp index 89bae5928fea..6f71eb4a434e 100644 --- a/js/src/builtin/temporal/PlainTime.cpp +++ b/js/src/builtin/temporal/PlainTime.cpp @@ -119,7 +119,8 @@ static bool IsValidTime(T hour, T minute, T second, T millisecond, * IsValidTime ( hour, minute, second, millisecond, microsecond, nanosecond ) */ bool js::temporal::IsValidTime(const PlainTime& time) { - auto& [hour, minute, second, millisecond, microsecond, nanosecond] = time; + const auto& [hour, minute, second, millisecond, microsecond, nanosecond] = + time; return ::IsValidTime(hour, minute, second, millisecond, microsecond, nanosecond); } @@ -215,7 +216,8 @@ static bool ThrowIfInvalidTime(JSContext* cx, T hour, T minute, T second, * IsValidTime ( hour, minute, second, millisecond, microsecond, nanosecond ) */ bool js::temporal::ThrowIfInvalidTime(JSContext* cx, const PlainTime& time) { - auto& [hour, minute, second, millisecond, microsecond, nanosecond] = time; + const auto& [hour, minute, second, millisecond, microsecond, nanosecond] = + time; return ::ThrowIfInvalidTime(cx, hour, minute, second, millisecond, microsecond, nanosecond); } @@ -261,7 +263,8 @@ static PlainTime ConstrainTime(double hour, double minute, double second, */ bool js::temporal::RegulateTime(JSContext* cx, const TemporalTimeLike& time, TemporalOverflow overflow, PlainTime* result) { - auto& [hour, minute, second, millisecond, microsecond, nanosecond] = time; + const auto& [hour, minute, second, millisecond, microsecond, nanosecond] = + time; // Step 1. MOZ_ASSERT(IsInteger(hour)); @@ -362,7 +365,8 @@ static PlainTimeObject* CreateTemporalTime(JSContext* cx, const CallArgs& args, */ PlainTimeObject* js::temporal::CreateTemporalTime(JSContext* cx, const PlainTime& time) { - auto& [hour, minute, second, millisecond, microsecond, nanosecond] = time; + const auto& [hour, minute, second, millisecond, microsecond, nanosecond] = + time; // Step 1. if (!ThrowIfInvalidTime(cx, time)) { @@ -1136,7 +1140,7 @@ static bool PlainTime_from(JSContext* cx, unsigned argc, Value* vp) { } // Steps 4-5. - auto result = ToTemporalTime(cx, args.get(0), overflow); + auto* result = ToTemporalTime(cx, args.get(0), overflow); if (!result) { return false; } diff --git a/js/src/builtin/temporal/PlainYearMonth.cpp b/js/src/builtin/temporal/PlainYearMonth.cpp index f4ee350b7fbf..ba997a73bec0 100644 --- a/js/src/builtin/temporal/PlainYearMonth.cpp +++ b/js/src/builtin/temporal/PlainYearMonth.cpp @@ -151,7 +151,7 @@ static PlainYearMonthObject* CreateTemporalYearMonth( */ PlainYearMonthObject* js::temporal::CreateTemporalYearMonth( JSContext* cx, const PlainDate& date, Handle calendar) { - auto& [isoYear, isoMonth, isoDay] = date; + const auto& [isoYear, isoMonth, isoDay] = date; // Step 1. if (!ThrowIfInvalidISODate(cx, date)) { diff --git a/js/src/builtin/temporal/Temporal.cpp b/js/src/builtin/temporal/Temporal.cpp index e42f30ee0d7f..31486373e970 100644 --- a/js/src/builtin/temporal/Temporal.cpp +++ b/js/src/builtin/temporal/Temporal.cpp @@ -1358,10 +1358,18 @@ static bool TemporalClassFinish(JSContext* cx, Handle temporal, }; // Add the constructor properties. - for (const auto& protoKey : - {JSProto_Calendar, JSProto_Duration, JSProto_Instant, JSProto_PlainDate, - JSProto_PlainDateTime, JSProto_PlainMonthDay, JSProto_PlainTime, - JSProto_PlainYearMonth, JSProto_TimeZone, JSProto_ZonedDateTime}) { + for (const auto& protoKey : { + JSProto_Calendar, + JSProto_Duration, + JSProto_Instant, + JSProto_PlainDate, + JSProto_PlainDateTime, + JSProto_PlainMonthDay, + JSProto_PlainTime, + JSProto_PlainYearMonth, + JSProto_TimeZone, + JSProto_ZonedDateTime, + }) { if (!defineProperty(protoKey, ClassName(protoKey, cx))) { return false; } diff --git a/js/src/builtin/temporal/TemporalFields.cpp b/js/src/builtin/temporal/TemporalFields.cpp index 9ac2e44639ee..72027123e7bd 100644 --- a/js/src/builtin/temporal/TemporalFields.cpp +++ b/js/src/builtin/temporal/TemporalFields.cpp @@ -214,7 +214,7 @@ static Value TemporalFieldDefaultValue(TemporalField field) { static bool TemporalFieldConvertValue(JSContext* cx, TemporalField field, MutableHandle value) { - auto* name = ToCString(field); + const auto* name = ToCString(field); switch (field) { case TemporalField::Year: case TemporalField::Hour: @@ -365,7 +365,7 @@ bool js::temporal::PrepareTemporalFields( Rooted value(cx); for (auto fieldName : fieldNames) { auto* property = ToPropertyName(cx, fieldName); - auto* cstr = ToCString(fieldName); + const auto* cstr = ToCString(fieldName); // Step 6.a. (Not applicable in our implementation.) @@ -837,8 +837,8 @@ bool js::temporal::AppendSorted( return false; } - auto* left = std::prev(fieldNames.end(), additionalNames.size()); - auto* right = additionalNames.end(); + const auto* left = std::prev(fieldNames.end(), additionalNames.size()); + const auto* right = additionalNames.end(); auto* out = fieldNames.end(); // Write backwards into the newly allocated space. diff --git a/js/src/builtin/temporal/TimeZone.cpp b/js/src/builtin/temporal/TimeZone.cpp index 1a88b2c87d84..b5e60183662f 100644 --- a/js/src/builtin/temporal/TimeZone.cpp +++ b/js/src/builtin/temporal/TimeZone.cpp @@ -1389,7 +1389,7 @@ static PlainDateTime BalanceISODateTime(const PlainDateTime& dateTime, MOZ_ASSERT(ISODateTimeWithinLimits(dateTime)); MOZ_ASSERT(std::abs(nanoseconds) < ToNanoseconds(TemporalUnit::Day)); - auto& [date, time] = dateTime; + const auto& [date, time] = dateTime; // Step 1. auto balancedTime = BalanceTime(time, nanoseconds); -- 2.11.4.GIT