AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[builtins][date] Fix -Wshadow warnings

Browse Source 
Bug: v8:12244,v8:12245
Change-Id: I5fdc754432c7f619f4a32f92eb2da81beb23e8ce
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3278689
Reviewed-by: Igor Sheludko <ishell@chromium.org>
Commit-Queue: Zhi An Ng <zhin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#77910}
This commit is contained in:
Ng Zhi An 2021-11-12 16:59:54 -08:00 committed by V8 LUCI CQ
parent 8bcb3f57b5
commit 6577c5e9e2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/builtins/builtins-date.cc
View File

@ -445,12 +445,12 @@ BUILTIN(DatePrototypeSetMinutes) {
// ES6 section 20.3.4.25 Date.prototype.setMonth ( month, date ) // ES6 section 20.3.4.25 Date.prototype.setMonth ( month, date )
BUILTIN(DatePrototypeSetMonth) { BUILTIN(DatePrototypeSetMonth) {
HandleScope scope(isolate); HandleScope scope(isolate);
CHECK_RECEIVER(JSDate, date, "Date.prototype.setMonth"); CHECK_RECEIVER(JSDate, this_date, "Date.prototype.setMonth");
int const argc = args.length() - 1; int const argc = args.length() - 1;
Handle<Object> month = args.atOrUndefined(isolate, 1); Handle<Object> month = args.atOrUndefined(isolate, 1);
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, month, ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, month,
Object::ToNumber(isolate, month)); Object::ToNumber(isolate, month));
double time_val = date->value().Number(); double time_val = this_date->value().Number();
if (!std::isnan(time_val)) { if (!std::isnan(time_val)) {
int64_t const time_ms = static_cast<int64_t>(time_val); int64_t const time_ms = static_cast<int64_t>(time_val);
int64_t local_time_ms = isolate->date_cache()->ToLocal(time_ms); int64_t local_time_ms = isolate->date_cache()->ToLocal(time_ms);
@ -468,7 +468,7 @@ BUILTIN(DatePrototypeSetMonth) {
} }
time_val = MakeDate(MakeDay(year, m, dt), time_within_day); time_val = MakeDate(MakeDay(year, m, dt), time_within_day);
} }
return SetLocalDateValue(isolate, date, time_val); return SetLocalDateValue(isolate, this_date, time_val);
} }
// ES6 section 20.3.4.26 Date.prototype.setSeconds ( sec, ms ) // ES6 section 20.3.4.26 Date.prototype.setSeconds ( sec, ms )
@ -662,12 +662,12 @@ BUILTIN(DatePrototypeSetUTCMinutes) {
// ES6 section 20.3.4.31 Date.prototype.setUTCMonth ( month, date ) // ES6 section 20.3.4.31 Date.prototype.setUTCMonth ( month, date )
BUILTIN(DatePrototypeSetUTCMonth) { BUILTIN(DatePrototypeSetUTCMonth) {
HandleScope scope(isolate); HandleScope scope(isolate);
CHECK_RECEIVER(JSDate, date, "Date.prototype.setUTCMonth"); CHECK_RECEIVER(JSDate, this_date, "Date.prototype.setUTCMonth");
int const argc = args.length() - 1; int const argc = args.length() - 1;
Handle<Object> month = args.atOrUndefined(isolate, 1); Handle<Object> month = args.atOrUndefined(isolate, 1);
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, month, ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, month,
Object::ToNumber(isolate, month)); Object::ToNumber(isolate, month));
double time_val = date->value().Number(); double time_val = this_date->value().Number();
if (!std::isnan(time_val)) { if (!std::isnan(time_val)) {
int64_t const time_ms = static_cast<int64_t>(time_val); int64_t const time_ms = static_cast<int64_t>(time_val);
int days = isolate->date_cache()->DaysFromTime(time_ms); int days = isolate->date_cache()->DaysFromTime(time_ms);
@ -684,7 +684,7 @@ BUILTIN(DatePrototypeSetUTCMonth) {
} }
time_val = MakeDate(MakeDay(year, m, dt), time_within_day); time_val = MakeDate(MakeDay(year, m, dt), time_within_day);
} }
return *JSDate::SetValue(date, DateCache::TimeClip(time_val)); return *JSDate::SetValue(this_date, DateCache::TimeClip(time_val));
} }
// ES6 section 20.3.4.34 Date.prototype.setUTCSeconds ( sec, ms ) // ES6 section 20.3.4.34 Date.prototype.setUTCSeconds ( sec, ms )

12
src/date/dateparser-inl.h
View File

@ -94,9 +94,9 @@ bool DateParser::Parse(Isolate* isolate, base::Vector<Char> str, double* out) {
} else if (scanner.SkipSymbol('.') && time.IsExpecting(n)) { } else if (scanner.SkipSymbol('.') && time.IsExpecting(n)) {
time.Add(n); time.Add(n);
if (!scanner.Peek().IsNumber()) return false; if (!scanner.Peek().IsNumber()) return false;
int n = ReadMilliseconds(scanner.Next()); int ms = ReadMilliseconds(scanner.Next());
if (n < 0) return false; if (ms < 0) return false;
time.AddFinal(n); time.AddFinal(ms);
} else if (tz.IsExpecting(n)) { } else if (tz.IsExpecting(n)) {
tz.SetAbsoluteMinute(n); tz.SetAbsoluteMinute(n);
} else if (time.IsExpecting(n)) { } else if (time.IsExpecting(n)) {
@ -138,9 +138,9 @@ bool DateParser::Parse(Isolate* isolate, base::Vector<Char> str, double* out) {
int n = 0; int n = 0;
int length = 0; int length = 0;
if (scanner.Peek().IsNumber()) { if (scanner.Peek().IsNumber()) {
DateToken token = scanner.Next(); DateToken next_token = scanner.Next();
length = token.length(); length = next_token.length();
n = token.number(); n = next_token.number();
} }
has_read_number = true; has_read_number = true;