From 26fdf659e379a29afb47f1fd46e709b3576645fd Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Sat, 9 Dec 2023 12:27:08 +0100 Subject: [PATCH] Make Date methods argument coercion spec compliant (bnoordhuis) --- quickjs.c | 21 ++++++++++----------- test262_errors.txt | 24 ------------------------ 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/quickjs.c b/quickjs.c index 4837885..35211d6 100644 --- a/quickjs.c +++ b/quickjs.c @@ -47816,20 +47816,19 @@ static JSValue set_date_field(JSContext *ctx, JSValueConst this_val, res = get_date_fields(ctx, this_val, fields, is_local, first_field == 0); if (res < 0) return JS_EXCEPTION; + + // Argument coercion is observable and must be done unconditionally. + n = min_int(argc, end_field - first_field); + for(i = 0; i < n; i++) { + if (JS_ToFloat64(ctx, &a, argv[i])) + return JS_EXCEPTION; + if (!isfinite(a)) + res = FALSE; + fields[first_field + i] = trunc(a); + } if (res && argc > 0) { - n = end_field - first_field; - if (argc < n) - n = argc; - for(i = 0; i < n; i++) { - if (JS_ToFloat64(ctx, &a, argv[i])) - return JS_EXCEPTION; - if (!isfinite(a)) - goto done; - fields[first_field + i] = trunc(a); - } d = set_date_fields(fields, is_local); } -done: return JS_SetThisTimeValue(ctx, this_val, d); } diff --git a/test262_errors.txt b/test262_errors.txt index 572dcb9..81b1ea2 100644 --- a/test262_errors.txt +++ b/test262_errors.txt @@ -5,30 +5,6 @@ test262/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedStart-brok test262/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedStart-broken-promise.js:34: strict mode: TypeError: $DONE() not called test262/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-broken-promise-try-catch.js:39: TypeError: $DONE() not called test262/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-broken-promise-try-catch.js:39: strict mode: TypeError: $DONE() not called -test262/test/built-ins/Date/prototype/setDate/arg-coercion-order.js:28: Test262Error: ToNumber invoked exactly once Expected SameValue(«0», «1») to be true -test262/test/built-ins/Date/prototype/setDate/arg-coercion-order.js:28: strict mode: Test262Error: ToNumber invoked exactly once Expected SameValue(«0», «1») to be true -test262/test/built-ins/Date/prototype/setHours/arg-coercion-order.js:57: Test262Error: Expected [] and [valueOf hour, valueOf min, valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setHours/arg-coercion-order.js:57: strict mode: Test262Error: Expected [] and [valueOf hour, valueOf min, valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setMilliseconds/arg-coercion-order.js:28: Test262Error: ToNumber invoked exactly once Expected SameValue(«0», «1») to be true -test262/test/built-ins/Date/prototype/setMilliseconds/arg-coercion-order.js:28: strict mode: Test262Error: ToNumber invoked exactly once Expected SameValue(«0», «1») to be true -test262/test/built-ins/Date/prototype/setMinutes/arg-coercion-order.js:49: Test262Error: Expected [] and [valueOf min, valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setMinutes/arg-coercion-order.js:49: strict mode: Test262Error: Expected [] and [valueOf min, valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setMonth/arg-coercion-order.js:41: Test262Error: Expected [] and [valueOf month, valueOf date] to have the same contents. -test262/test/built-ins/Date/prototype/setMonth/arg-coercion-order.js:41: strict mode: Test262Error: Expected [] and [valueOf month, valueOf date] to have the same contents. -test262/test/built-ins/Date/prototype/setSeconds/arg-coercion-order.js:41: Test262Error: Expected [] and [valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setSeconds/arg-coercion-order.js:41: strict mode: Test262Error: Expected [] and [valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setUTCDate/arg-coercion-order.js:25: Test262Error: ToNumber invoked exactly once Expected SameValue(«0», «1») to be true -test262/test/built-ins/Date/prototype/setUTCDate/arg-coercion-order.js:25: strict mode: Test262Error: ToNumber invoked exactly once Expected SameValue(«0», «1») to be true -test262/test/built-ins/Date/prototype/setUTCHours/arg-coercion-order.js:50: Test262Error: Expected [] and [valueOf hour, valueOf min, valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setUTCHours/arg-coercion-order.js:50: strict mode: Test262Error: Expected [] and [valueOf hour, valueOf min, valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setUTCMilliseconds/arg-coercion-order.js:26: Test262Error: ToNumber invoked exactly once Expected SameValue(«0», «1») to be true -test262/test/built-ins/Date/prototype/setUTCMilliseconds/arg-coercion-order.js:26: strict mode: Test262Error: ToNumber invoked exactly once Expected SameValue(«0», «1») to be true -test262/test/built-ins/Date/prototype/setUTCMinutes/arg-coercion-order.js:42: Test262Error: Expected [] and [valueOf min, valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setUTCMinutes/arg-coercion-order.js:42: strict mode: Test262Error: Expected [] and [valueOf min, valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setUTCMonth/arg-coercion-order.js:34: Test262Error: Expected [] and [valueOf month, valueOf date] to have the same contents. -test262/test/built-ins/Date/prototype/setUTCMonth/arg-coercion-order.js:34: strict mode: Test262Error: Expected [] and [valueOf month, valueOf date] to have the same contents. -test262/test/built-ins/Date/prototype/setUTCSeconds/arg-coercion-order.js:34: Test262Error: Expected [] and [valueOf sec, valueOf ms] to have the same contents. -test262/test/built-ins/Date/prototype/setUTCSeconds/arg-coercion-order.js:34: strict mode: Test262Error: Expected [] and [valueOf sec, valueOf ms] to have the same contents. test262/test/built-ins/Function/internals/Construct/derived-this-uninitialized-realm.js:20: Test262Error: Expected a ReferenceError but got a different error constructor with the same name test262/test/built-ins/Function/internals/Construct/derived-this-uninitialized-realm.js:20: strict mode: Test262Error: Expected a ReferenceError but got a different error constructor with the same name test262/test/built-ins/RegExp/lookahead-quantifier-match-groups.js:27: Test262Error: Expected [a, abc] and [a, undefined] to have the same contents. ? quantifier