Skip to content

V
V8
Commit 4418a7b9 authored by Tobias Tebbi's avatar Tobias Tebbi Committed by Commit Bot
Browse files
Options

Revert "[torque] introduce JSAny type for user-accessible JavaScript values" 

This reverts commit 79b00555.

Reason for revert: needs more discussion

Original change's description:
> [torque] introduce JSAny type for user-accessible JavaScript values
> 
> This CL introduces a JSAny type for user-exposed JavaScript values and
> a few new types to define it. Especially, it splits Symbol into
> PrivateSymbol (not exposed) and PublicSymbol (JavaScript exposed
> symbols).
> 
> The change is mostly mechanical, but a few things are interesting:
> - PropertyKey and JSPrimitive were designed to coincide with the spec
>   notions of IsPropertyKey() and primitive value, respectively.
> - Since Name is an open type, we define AnyName to be the known
>   subtypes of Name. This is not too elegant, but by using AnyName
>   instead of Name, typeswitch can properly conclude something if a
>   subtype of Name is excluded.
> 
> Small drive-by changes, which were necessary:
> - Allow subtyping on label parameters.
> - Fix the formatting of typeswitch, it was broken with union types
>   in case types.
> 
> Bug: v8:7793
> Change-Id: I14b10507f8cf316ad85e048fe8d53d1df5e0bb13
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1735322
> Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
> Reviewed-by: Jakob Gruber <jgruber@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#63114}

TBR=neis@chromium.org,jgruber@chromium.org,tebbi@chromium.org

Change-Id: Ifde7881d74afe407628f40047997339d54cb2424
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:7793
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1741652Reviewed-by: 's avatarTobias Tebbi <tebbi@chromium.org>
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63115}
parent 79b00555
Show whitespace changes
Inline Side-by-side
Showing with 843 additions and 1105 deletions
src/builtins/arguments.tq
View file @ 4418a7b9
...@@ -8,7 +8,7 @@ struct Arguments { ...@@ -8,7 +8,7 @@ struct Arguments {
const length: intptr; const length: intptr;
} }
extern operator '[]' macro GetArgumentValue(Arguments, intptr): JSAny; extern operator '[]' macro GetArgumentValue(Arguments, intptr): Object;
extern macro GetFrameArguments(FrameWithArguments, intptr): Arguments; extern macro GetFrameArguments(FrameWithArguments, intptr): Arguments;
......
src/builtins/array-copywithin.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace array_copywithin { ...@@ -9,7 +9,7 @@ namespace array_copywithin {
// https://tc39.github.io/ecma262/#sec-array.prototype.copyWithin // https://tc39.github.io/ecma262/#sec-array.prototype.copyWithin
transitioning javascript builtin ArrayPrototypeCopyWithin( transitioning javascript builtin ArrayPrototypeCopyWithin(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
// 1. Let O be ? ToObject(this value). // 1. Let O be ? ToObject(this value).
const object: JSReceiver = ToObject_Inline(context, receiver); const object: JSReceiver = ToObject_Inline(context, receiver);
...@@ -68,7 +68,7 @@ namespace array_copywithin { ...@@ -68,7 +68,7 @@ namespace array_copywithin {
// d. If fromPresent is true, then. // d. If fromPresent is true, then.
if (fromPresent == True) { if (fromPresent == True) {
// i. Let fromVal be ? Get(O, fromKey). // i. Let fromVal be ? Get(O, fromKey).
const fromVal: JSAny = GetProperty(object, from); const fromVal: Object = GetProperty(object, from);
// ii. Perform ? Set(O, toKey, fromVal, true). // ii. Perform ? Set(O, toKey, fromVal, true).
SetProperty(object, to, fromVal); SetProperty(object, to, fromVal);
......
src/builtins/array-every.tq
View file @ 4418a7b9
...@@ -5,14 +5,15 @@ ...@@ -5,14 +5,15 @@
namespace array { namespace array {
transitioning javascript builtin transitioning javascript builtin
ArrayEveryLoopEagerDeoptContinuation( ArrayEveryLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny): JSAny { callback: Object, thisArg: Object, initialK: Object,
length: Object): Object {
// All continuation points in the optimized every implementation are // All continuation points in the optimized every implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -26,9 +27,9 @@ namespace array { ...@@ -26,9 +27,9 @@ namespace array {
transitioning javascript builtin transitioning javascript builtin
ArrayEveryLoopLazyDeoptContinuation( ArrayEveryLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny, callback: Object, thisArg: Object, initialK: Object, length: Object,
result: JSAny): JSAny { result: Object): Object {
// All continuation points in the optimized every implementation are // All continuation points in the optimized every implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -52,9 +53,9 @@ namespace array { ...@@ -52,9 +53,9 @@ namespace array {
} }
transitioning builtin ArrayEveryLoopContinuation(implicit context: Context)( transitioning builtin ArrayEveryLoopContinuation(implicit context: Context)(
_receiver: JSReceiver, callbackfn: Callable, thisArg: JSAny, _receiver: JSReceiver, callbackfn: Callable, thisArg: Object,
_array: JSAny, o: JSReceiver, initialK: Number, length: Number, _array: Object, o: JSReceiver, initialK: Number, length: Number,
_initialTo: JSAny): JSAny { _initialTo: Object): Object {
// 5. Let k be 0. // 5. Let k be 0.
// 6. Repeat, while k < len // 6. Repeat, while k < len
for (let k: Number = initialK; k < length; k++) { for (let k: Number = initialK; k < length; k++) {
...@@ -68,10 +69,10 @@ namespace array { ...@@ -68,10 +69,10 @@ namespace array {
// 6c. If kPresent is true, then // 6c. If kPresent is true, then
if (kPresent == True) { if (kPresent == True) {
// 6c. i. Let kValue be ? Get(O, Pk). // 6c. i. Let kValue be ? Get(O, Pk).
const kValue: JSAny = GetProperty(o, k); const kValue: Object = GetProperty(o, k);
// 6c. ii. Perform ? Call(callbackfn, T, <kValue, k, O>). // 6c. ii. Perform ? Call(callbackfn, T, <kValue, k, O>).
const result: JSAny = Call(context, callbackfn, thisArg, kValue, k, o); const result: Object = Call(context, callbackfn, thisArg, kValue, k, o);
// iii. If selected is true, then... // iii. If selected is true, then...
if (!ToBoolean(result)) { if (!ToBoolean(result)) {
...@@ -85,7 +86,7 @@ namespace array { ...@@ -85,7 +86,7 @@ namespace array {
} }
transitioning macro FastArrayEvery(implicit context: Context)( transitioning macro FastArrayEvery(implicit context: Context)(
o: JSReceiver, len: Number, callbackfn: Callable, thisArg: JSAny): JSAny o: JSReceiver, len: Number, callbackfn: Callable, thisArg: Object): Object
labels Bailout(Smi) { labels Bailout(Smi) {
let k: Smi = 0; let k: Smi = 0;
const smiLen = Cast<Smi>(len) otherwise goto Bailout(k); const smiLen = Cast<Smi>(len) otherwise goto Bailout(k);
...@@ -98,8 +99,8 @@ namespace array { ...@@ -98,8 +99,8 @@ namespace array {
// Ensure that we haven't walked beyond a possibly updated length. // Ensure that we haven't walked beyond a possibly updated length.
if (k >= fastOW.Get().length) goto Bailout(k); if (k >= fastOW.Get().length) goto Bailout(k);
const value: JSAny = fastOW.LoadElementNoHole(k) otherwise continue; const value: Object = fastOW.LoadElementNoHole(k) otherwise continue;
const result: JSAny = const result: Object =
Call(context, callbackfn, thisArg, value, k, fastOW.Get()); Call(context, callbackfn, thisArg, value, k, fastOW.Get());
if (!ToBoolean(result)) { if (!ToBoolean(result)) {
return False; return False;
...@@ -110,8 +111,8 @@ namespace array { ...@@ -110,8 +111,8 @@ namespace array {
// https://tc39.github.io/ecma262/#sec-array.prototype.every // https://tc39.github.io/ecma262/#sec-array.prototype.every
transitioning javascript builtin transitioning javascript builtin
ArrayEvery(js-implicit context: Context, receiver: JSAny)(...arguments): ArrayEvery(js-implicit context: Context, receiver: Object)(...arguments):
JSAny { Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.every'); RequireObjectCoercible(receiver, 'Array.prototype.every');
...@@ -128,7 +129,7 @@ namespace array { ...@@ -128,7 +129,7 @@ namespace array {
const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError; const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError;
// 4. If thisArg is present, let T be thisArg; else let T be undefined. // 4. If thisArg is present, let T be thisArg; else let T be undefined.
const thisArg: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const thisArg: Object = arguments.length > 1 ? arguments[1] : Undefined;
// Special cases. // Special cases.
try { try {
......
src/builtins/array-filter.tq
View file @ 4418a7b9
...@@ -5,15 +5,15 @@ ...@@ -5,15 +5,15 @@
namespace array_filter { namespace array_filter {
transitioning javascript builtin transitioning javascript builtin
ArrayFilterLoopEagerDeoptContinuation( ArrayFilterLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, array: JSAny, initialK: JSAny, callback: Object, thisArg: Object, array: Object, initialK: Object,
length: JSAny, initialTo: JSAny): JSAny { length: Object, initialTo: Object): Object {
// All continuation points in the optimized filter implementation are // All continuation points in the optimized filter implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -29,9 +29,10 @@ namespace array_filter { ...@@ -29,9 +29,10 @@ namespace array_filter {
transitioning javascript builtin transitioning javascript builtin
ArrayFilterLoopLazyDeoptContinuation( ArrayFilterLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, array: JSAny, initialK: JSAny, callback: Object, thisArg: Object, array: Object, initialK: Object,
length: JSAny, valueK: JSAny, initialTo: JSAny, result: JSAny): JSAny { length: Object, valueK: Object, initialTo: Object,
result: Object): Object {
// All continuation points in the optimized filter implementation are // All continuation points in the optimized filter implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -59,9 +60,9 @@ namespace array_filter { ...@@ -59,9 +60,9 @@ namespace array_filter {
} }
transitioning builtin ArrayFilterLoopContinuation(implicit context: Context)( transitioning builtin ArrayFilterLoopContinuation(implicit context: Context)(
_receiver: JSReceiver, callbackfn: Callable, thisArg: JSAny, _receiver: JSReceiver, callbackfn: Callable, thisArg: Object,
array: JSReceiver, o: JSReceiver, initialK: Number, length: Number, array: JSReceiver, o: JSReceiver, initialK: Number, length: Number,
initialTo: Number): JSAny { initialTo: Number): Object {
let to: Number = initialTo; let to: Number = initialTo;
// 5. Let k be 0. // 5. Let k be 0.
// 6. Repeat, while k < len // 6. Repeat, while k < len
...@@ -76,10 +77,10 @@ namespace array_filter { ...@@ -76,10 +77,10 @@ namespace array_filter {
// 6c. If kPresent is true, then // 6c. If kPresent is true, then
if (kPresent == True) { if (kPresent == True) {
// 6c. i. Let kValue be ? Get(O, Pk). // 6c. i. Let kValue be ? Get(O, Pk).
const kValue: JSAny = GetProperty(o, k); const kValue: Object = GetProperty(o, k);
// 6c. ii. Perform ? Call(callbackfn, T, <kValue, k, O>). // 6c. ii. Perform ? Call(callbackfn, T, <kValue, k, O>).
const result: JSAny = Call(context, callbackfn, thisArg, kValue, k, o); const result: Object = Call(context, callbackfn, thisArg, kValue, k, o);
// iii. If selected is true, then... // iii. If selected is true, then...
if (ToBoolean(result)) { if (ToBoolean(result)) {
...@@ -96,7 +97,7 @@ namespace array_filter { ...@@ -96,7 +97,7 @@ namespace array_filter {
} }
transitioning macro FastArrayFilter(implicit context: Context)( transitioning macro FastArrayFilter(implicit context: Context)(
fastO: FastJSArray, len: Smi, callbackfn: Callable, thisArg: JSAny, fastO: FastJSArray, len: Smi, callbackfn: Callable, thisArg: Object,
output: FastJSArray) labels Bailout(Number, Number) { output: FastJSArray) labels Bailout(Number, Number) {
let k: Smi = 0; let k: Smi = 0;
let to: Smi = 0; let to: Smi = 0;
...@@ -111,8 +112,8 @@ namespace array_filter { ...@@ -111,8 +112,8 @@ namespace array_filter {
// Ensure that we haven't walked beyond a possibly updated length. // Ensure that we haven't walked beyond a possibly updated length.
if (k >= fastOW.Get().length) goto Bailout(k, to); if (k >= fastOW.Get().length) goto Bailout(k, to);
const value: JSAny = fastOW.LoadElementNoHole(k) otherwise continue; const value: Object = fastOW.LoadElementNoHole(k) otherwise continue;
const result: JSAny = const result: Object =
Call(context, callbackfn, thisArg, value, k, fastOW.Get()); Call(context, callbackfn, thisArg, value, k, fastOW.Get());
if (ToBoolean(result)) { if (ToBoolean(result)) {
try { try {
...@@ -146,8 +147,8 @@ namespace array_filter { ...@@ -146,8 +147,8 @@ namespace array_filter {
// https://tc39.github.io/ecma262/#sec-array.prototype.filter // https://tc39.github.io/ecma262/#sec-array.prototype.filter
transitioning javascript builtin transitioning javascript builtin
ArrayFilter(js-implicit context: Context, receiver: JSAny)(...arguments): ArrayFilter(js-implicit context: Context, receiver: Object)(...arguments):
JSAny { Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.filter'); RequireObjectCoercible(receiver, 'Array.prototype.filter');
...@@ -164,7 +165,7 @@ namespace array_filter { ...@@ -164,7 +165,7 @@ namespace array_filter {
const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError; const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError;
// 4. If thisArg is present, let T be thisArg; else let T be undefined. // 4. If thisArg is present, let T be thisArg; else let T be undefined.
const thisArg: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const thisArg: Object = arguments.length > 1 ? arguments[1] : Undefined;
let output: JSReceiver; let output: JSReceiver;
// Special cases. // Special cases.
......
src/builtins/array-find.tq
View file @ 4418a7b9
...@@ -5,14 +5,15 @@ ...@@ -5,14 +5,15 @@
namespace array_find { namespace array_find {
transitioning javascript builtin transitioning javascript builtin
ArrayFindLoopEagerDeoptContinuation( ArrayFindLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny): JSAny { callback: Object, thisArg: Object, initialK: Object,
length: Object): Object {
// All continuation points in the optimized find implementation are // All continuation points in the optimized find implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -25,9 +26,9 @@ namespace array_find { ...@@ -25,9 +26,9 @@ namespace array_find {
transitioning javascript builtin transitioning javascript builtin
ArrayFindLoopLazyDeoptContinuation( ArrayFindLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
_callback: JSAny, _thisArg: JSAny, _initialK: JSAny, _length: JSAny, _callback: Object, _thisArg: Object, _initialK: Object, _length: Object,
_result: JSAny): JSAny { _result: Object): Object {
// This deopt continuation point is never actually called, it just // This deopt continuation point is never actually called, it just
// exists to make stack traces correct from a ThrowTypeError if the // exists to make stack traces correct from a ThrowTypeError if the
// callback was found to be non-callable. // callback was found to be non-callable.
...@@ -39,9 +40,9 @@ namespace array_find { ...@@ -39,9 +40,9 @@ namespace array_find {
// before iteration continues. // before iteration continues.
transitioning javascript builtin transitioning javascript builtin
ArrayFindLoopAfterCallbackLazyDeoptContinuation( ArrayFindLoopAfterCallbackLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny, callback: Object, thisArg: Object, initialK: Object, length: Object,
foundValue: JSAny, isFound: JSAny): JSAny { foundValue: Object, isFound: Object): Object {
// All continuation points in the optimized find implementation are // All continuation points in the optimized find implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -64,8 +65,8 @@ namespace array_find { ...@@ -64,8 +65,8 @@ namespace array_find {
} }
transitioning builtin ArrayFindLoopContinuation(implicit context: Context)( transitioning builtin ArrayFindLoopContinuation(implicit context: Context)(
_receiver: JSReceiver, callbackfn: Callable, thisArg: JSAny, _receiver: JSReceiver, callbackfn: Callable, thisArg: Object,
o: JSReceiver, initialK: Number, length: Number): JSAny { o: JSReceiver, initialK: Number, length: Number): Object {
// 5. Let k be 0. // 5. Let k be 0.
// 6. Repeat, while k < len // 6. Repeat, while k < len
for (let k: Number = initialK; k < length; k++) { for (let k: Number = initialK; k < length; k++) {
...@@ -74,11 +75,12 @@ namespace array_find { ...@@ -74,11 +75,12 @@ namespace array_find {
// side-effect free and HasProperty/GetProperty do the conversion inline. // side-effect free and HasProperty/GetProperty do the conversion inline.
// 6b. i. Let kValue be ? Get(O, Pk). // 6b. i. Let kValue be ? Get(O, Pk).
const value: JSAny = GetProperty(o, k); const value: Object = GetProperty(o, k);
// 6c. Let testResult be ToBoolean(? Call(predicate, T, <<kValue, k, // 6c. Let testResult be ToBoolean(? Call(predicate, T, <<kValue, k,
// O>>)). // O>>)).
const testResult: JSAny = Call(context, callbackfn, thisArg, value, k, o); const testResult: Object =
Call(context, callbackfn, thisArg, value, k, o);
// 6d. If testResult is true, return kValue. // 6d. If testResult is true, return kValue.
if (ToBoolean(testResult)) { if (ToBoolean(testResult)) {
...@@ -91,7 +93,7 @@ namespace array_find { ...@@ -91,7 +93,7 @@ namespace array_find {
} }
transitioning macro FastArrayFind(implicit context: Context)( transitioning macro FastArrayFind(implicit context: Context)(
o: JSReceiver, len: Number, callbackfn: Callable, thisArg: JSAny): JSAny o: JSReceiver, len: Number, callbackfn: Callable, thisArg: Object): Object
labels Bailout(Smi) { labels Bailout(Smi) {
let k: Smi = 0; let k: Smi = 0;
const smiLen = Cast<Smi>(len) otherwise goto Bailout(k); const smiLen = Cast<Smi>(len) otherwise goto Bailout(k);
...@@ -105,8 +107,8 @@ namespace array_find { ...@@ -105,8 +107,8 @@ namespace array_find {
// Ensure that we haven't walked beyond a possibly updated length. // Ensure that we haven't walked beyond a possibly updated length.
if (k >= fastOW.Get().length) goto Bailout(k); if (k >= fastOW.Get().length) goto Bailout(k);
const value: JSAny = fastOW.LoadElementOrUndefined(k); const value: Object = fastOW.LoadElementOrUndefined(k);
const testResult: JSAny = const testResult: Object =
Call(context, callbackfn, thisArg, value, k, fastOW.Get()); Call(context, callbackfn, thisArg, value, k, fastOW.Get());
if (ToBoolean(testResult)) { if (ToBoolean(testResult)) {
return value; return value;
...@@ -117,8 +119,8 @@ namespace array_find { ...@@ -117,8 +119,8 @@ namespace array_find {
// https://tc39.github.io/ecma262/#sec-array.prototype.find // https://tc39.github.io/ecma262/#sec-array.prototype.find
transitioning javascript builtin transitioning javascript builtin
ArrayPrototypeFind(js-implicit context: Context, receiver: JSAny)( ArrayPrototypeFind(js-implicit context: Context, receiver: Object)(
...arguments): JSAny { ...arguments): Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.find'); RequireObjectCoercible(receiver, 'Array.prototype.find');
...@@ -136,7 +138,7 @@ namespace array_find { ...@@ -136,7 +138,7 @@ namespace array_find {
Cast<Callable>(arguments[0]) otherwise NotCallableError; Cast<Callable>(arguments[0]) otherwise NotCallableError;
// 4. If thisArg is present, let T be thisArg; else let T be undefined. // 4. If thisArg is present, let T be thisArg; else let T be undefined.
const thisArg: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const thisArg: Object = arguments.length > 1 ? arguments[1] : Undefined;
// Special cases. // Special cases.
try { try {
......
src/builtins/array-findindex.tq
View file @ 4418a7b9
...@@ -5,14 +5,15 @@ ...@@ -5,14 +5,15 @@
namespace array_findindex { namespace array_findindex {
transitioning javascript builtin transitioning javascript builtin
ArrayFindIndexLoopEagerDeoptContinuation( ArrayFindIndexLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny): JSAny { callback: Object, thisArg: Object, initialK: Object,
length: Object): Object {
// All continuation points in the optimized findIndex implementation are // All continuation points in the optimized findIndex implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -25,9 +26,9 @@ namespace array_findindex { ...@@ -25,9 +26,9 @@ namespace array_findindex {
transitioning javascript builtin transitioning javascript builtin
ArrayFindIndexLoopLazyDeoptContinuation( ArrayFindIndexLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
_callback: JSAny, _thisArg: JSAny, _initialK: JSAny, _length: JSAny, _callback: Object, _thisArg: Object, _initialK: Object, _length: Object,
_result: JSAny): JSAny { _result: Object): Object {
// This deopt continuation point is never actually called, it just // This deopt continuation point is never actually called, it just
// exists to make stack traces correct from a ThrowTypeError if the // exists to make stack traces correct from a ThrowTypeError if the
// callback was found to be non-callable. // callback was found to be non-callable.
...@@ -39,9 +40,9 @@ namespace array_findindex { ...@@ -39,9 +40,9 @@ namespace array_findindex {
// before iteration continues. // before iteration continues.
transitioning javascript builtin transitioning javascript builtin
ArrayFindIndexLoopAfterCallbackLazyDeoptContinuation( ArrayFindIndexLoopAfterCallbackLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny, callback: Object, thisArg: Object, initialK: Object, length: Object,
foundValue: JSAny, isFound: JSAny): JSAny { foundValue: Object, isFound: Object): Object {
// All continuation points in the optimized findIndex implementation are // All continuation points in the optimized findIndex implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -65,7 +66,7 @@ namespace array_findindex { ...@@ -65,7 +66,7 @@ namespace array_findindex {
transitioning builtin ArrayFindIndexLoopContinuation(implicit context: transitioning builtin ArrayFindIndexLoopContinuation(implicit context:
Context)( Context)(
_receiver: JSReceiver, callbackfn: Callable, thisArg: JSAny, _receiver: JSReceiver, callbackfn: Callable, thisArg: Object,
o: JSReceiver, initialK: Number, length: Number): Number { o: JSReceiver, initialK: Number, length: Number): Number {
// 5. Let k be 0. // 5. Let k be 0.
// 6. Repeat, while k < len // 6. Repeat, while k < len
...@@ -75,11 +76,12 @@ namespace array_findindex { ...@@ -75,11 +76,12 @@ namespace array_findindex {
// side-effect free and HasProperty/GetProperty do the conversion inline. // side-effect free and HasProperty/GetProperty do the conversion inline.
// 6b. i. Let kValue be ? Get(O, Pk). // 6b. i. Let kValue be ? Get(O, Pk).
const value: JSAny = GetProperty(o, k); const value: Object = GetProperty(o, k);
// 6c. Let testResult be ToBoolean(? Call(predicate, T, <<kValue, k, // 6c. Let testResult be ToBoolean(? Call(predicate, T, <<kValue, k,
// O>>)). // O>>)).
const testResult: JSAny = Call(context, callbackfn, thisArg, value, k, o); const testResult: Object =
Call(context, callbackfn, thisArg, value, k, o);
// 6d. If testResult is true, return k. // 6d. If testResult is true, return k.
if (ToBoolean(testResult)) { if (ToBoolean(testResult)) {
...@@ -92,7 +94,7 @@ namespace array_findindex { ...@@ -92,7 +94,7 @@ namespace array_findindex {
} }
transitioning macro FastArrayFindIndex(implicit context: Context)( transitioning macro FastArrayFindIndex(implicit context: Context)(
o: JSReceiver, len: Number, callbackfn: Callable, thisArg: JSAny): Number o: JSReceiver, len: Number, callbackfn: Callable, thisArg: Object): Number
labels Bailout(Smi) { labels Bailout(Smi) {
let k: Smi = 0; let k: Smi = 0;
const smiLen = Cast<Smi>(len) otherwise goto Bailout(k); const smiLen = Cast<Smi>(len) otherwise goto Bailout(k);
...@@ -106,8 +108,8 @@ namespace array_findindex { ...@@ -106,8 +108,8 @@ namespace array_findindex {
// Ensure that we haven't walked beyond a possibly updated length. // Ensure that we haven't walked beyond a possibly updated length.
if (k >= fastOW.Get().length) goto Bailout(k); if (k >= fastOW.Get().length) goto Bailout(k);
const value: JSAny = fastOW.LoadElementOrUndefined(k); const value: Object = fastOW.LoadElementOrUndefined(k);
const testResult: JSAny = const testResult: Object =
Call(context, callbackfn, thisArg, value, k, fastOW.Get()); Call(context, callbackfn, thisArg, value, k, fastOW.Get());
if (ToBoolean(testResult)) { if (ToBoolean(testResult)) {
return k; return k;
...@@ -118,8 +120,8 @@ namespace array_findindex { ...@@ -118,8 +120,8 @@ namespace array_findindex {
// https://tc39.github.io/ecma262/#sec-array.prototype.findIndex // https://tc39.github.io/ecma262/#sec-array.prototype.findIndex
transitioning javascript builtin transitioning javascript builtin
ArrayPrototypeFindIndex(js-implicit context: Context, receiver: JSAny)( ArrayPrototypeFindIndex(js-implicit context: Context, receiver: Object)(
...arguments): JSAny { ...arguments): Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.findIndex'); RequireObjectCoercible(receiver, 'Array.prototype.findIndex');
...@@ -137,7 +139,7 @@ namespace array_findindex { ...@@ -137,7 +139,7 @@ namespace array_findindex {
Cast<Callable>(arguments[0]) otherwise NotCallableError; Cast<Callable>(arguments[0]) otherwise NotCallableError;
// 4. If thisArg is present, let T be thisArg; else let T be undefined. // 4. If thisArg is present, let T be thisArg; else let T be undefined.
const thisArg: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const thisArg: Object = arguments.length > 1 ? arguments[1] : Undefined;
// Special cases. // Special cases.
try { try {
......
src/builtins/array-foreach.tq
View file @ 4418a7b9
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
namespace array_foreach { namespace array_foreach {
transitioning javascript builtin transitioning javascript builtin
ArrayForEachLoopEagerDeoptContinuation( ArrayForEachLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny): JSAny { callback: Object, thisArg: Object, initialK: Object,
length: Object): Object {
// All continuation points in the optimized forEach implemntation are // All continuation points in the optimized forEach implemntation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -22,9 +23,9 @@ namespace array_foreach { ...@@ -22,9 +23,9 @@ namespace array_foreach {
transitioning javascript builtin transitioning javascript builtin
ArrayForEachLoopLazyDeoptContinuation( ArrayForEachLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny, callback: Object, thisArg: Object, initialK: Object, length: Object,
_result: JSAny): JSAny { _result: Object): Object {
// All continuation points in the optimized forEach implemntation are // All continuation points in the optimized forEach implemntation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -39,9 +40,9 @@ namespace array_foreach { ...@@ -39,9 +40,9 @@ namespace array_foreach {
} }
transitioning builtin ArrayForEachLoopContinuation(implicit context: Context)( transitioning builtin ArrayForEachLoopContinuation(implicit context: Context)(
_receiver: JSReceiver, callbackfn: Callable, thisArg: JSAny, _receiver: JSReceiver, callbackfn: Callable, thisArg: Object,
_array: JSAny, o: JSReceiver, initialK: Number, len: Number, _array: Object, o: JSReceiver, initialK: Number, len: Number,
_to: JSAny): JSAny { _to: Object): Object {
// variables {array} and {to} are ignored. // variables {array} and {to} are ignored.
// 5. Let k be 0. // 5. Let k be 0.
...@@ -57,7 +58,7 @@ namespace array_foreach { ...@@ -57,7 +58,7 @@ namespace array_foreach {
// 6c. If kPresent is true, then // 6c. If kPresent is true, then
if (kPresent == True) { if (kPresent == True) {
// 6c. i. Let kValue be ? Get(O, Pk). // 6c. i. Let kValue be ? Get(O, Pk).
const kValue: JSAny = GetProperty(o, k); const kValue: Object = GetProperty(o, k);
// 6c. ii. Perform ? Call(callbackfn, T, <kValue, k, O>). // 6c. ii. Perform ? Call(callbackfn, T, <kValue, k, O>).
Call(context, callbackfn, thisArg, kValue, k, o); Call(context, callbackfn, thisArg, kValue, k, o);
...@@ -69,7 +70,7 @@ namespace array_foreach { ...@@ -69,7 +70,7 @@ namespace array_foreach {
} }
transitioning macro FastArrayForEach(implicit context: Context)( transitioning macro FastArrayForEach(implicit context: Context)(
o: JSReceiver, len: Number, callbackfn: Callable, thisArg: JSAny): JSAny o: JSReceiver, len: Number, callbackfn: Callable, thisArg: Object): Object
labels Bailout(Smi) { labels Bailout(Smi) {
let k: Smi = 0; let k: Smi = 0;
const smiLen = Cast<Smi>(len) otherwise goto Bailout(k); const smiLen = Cast<Smi>(len) otherwise goto Bailout(k);
...@@ -82,7 +83,7 @@ namespace array_foreach { ...@@ -82,7 +83,7 @@ namespace array_foreach {
// Ensure that we haven't walked beyond a possibly updated length. // Ensure that we haven't walked beyond a possibly updated length.
if (k >= fastOW.Get().length) goto Bailout(k); if (k >= fastOW.Get().length) goto Bailout(k);
const value: JSAny = fastOW.LoadElementNoHole(k) const value: Object = fastOW.LoadElementNoHole(k)
otherwise continue; otherwise continue;
Call(context, callbackfn, thisArg, value, k, fastOW.Get()); Call(context, callbackfn, thisArg, value, k, fastOW.Get());
} }
...@@ -91,8 +92,8 @@ namespace array_foreach { ...@@ -91,8 +92,8 @@ namespace array_foreach {
// https://tc39.github.io/ecma262/#sec-array.prototype.foreach // https://tc39.github.io/ecma262/#sec-array.prototype.foreach
transitioning javascript builtin transitioning javascript builtin
ArrayForEach(js-implicit context: Context, receiver: JSAny)(...arguments): ArrayForEach(js-implicit context: Context, receiver: Object)(...arguments):
JSAny { Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.forEach'); RequireObjectCoercible(receiver, 'Array.prototype.forEach');
...@@ -109,7 +110,7 @@ namespace array_foreach { ...@@ -109,7 +110,7 @@ namespace array_foreach {
const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError; const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError;
// 4. If thisArg is present, let T be thisArg; else let T be undefined. // 4. If thisArg is present, let T be thisArg; else let T be undefined.
const thisArg: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const thisArg: Object = arguments.length > 1 ? arguments[1] : Undefined;
// Special cases. // Special cases.
let k: Number = 0; let k: Number = 0;
......
src/builtins/array-join.tq
View file @ 4418a7b9
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
namespace array_join { namespace array_join {
type LoadJoinElementFn = builtin(Context, JSReceiver, Number) => JSAny; type LoadJoinElementFn = builtin(Context, JSReceiver, Number) => Object;
// Fast C call to write a fixed array (see Buffer.fixedArray) to a single // Fast C call to write a fixed array (see Buffer.fixedArray) to a single
// string. // string.
...@@ -12,12 +12,12 @@ namespace array_join { ...@@ -12,12 +12,12 @@ namespace array_join {
FixedArray, intptr, String, String): String; FixedArray, intptr, String, String): String;
transitioning builtin LoadJoinElement<T: type>( transitioning builtin LoadJoinElement<T: type>(
context: Context, receiver: JSReceiver, k: Number): JSAny { context: Context, receiver: JSReceiver, k: Number): Object {
return GetProperty(receiver, k); return GetProperty(receiver, k);
} }
transitioning LoadJoinElement<array::DictionaryElements>( transitioning LoadJoinElement<array::DictionaryElements>(
context: Context, receiver: JSReceiver, k: Number): JSAny { context: Context, receiver: JSReceiver, k: Number): Object {
const array: JSArray = UnsafeCast<JSArray>(receiver); const array: JSArray = UnsafeCast<JSArray>(receiver);
const dict: NumberDictionary = UnsafeCast<NumberDictionary>(array.elements); const dict: NumberDictionary = UnsafeCast<NumberDictionary>(array.elements);
try { try {
...@@ -33,15 +33,15 @@ namespace array_join { ...@@ -33,15 +33,15 @@ namespace array_join {
} }
LoadJoinElement<array::FastSmiOrObjectElements>( LoadJoinElement<array::FastSmiOrObjectElements>(
context: Context, receiver: JSReceiver, k: Number): JSAny { context: Context, receiver: JSReceiver, k: Number): Object {
const array: JSArray = UnsafeCast<JSArray>(receiver); const array: JSArray = UnsafeCast<JSArray>(receiver);
const fixedArray: FixedArray = UnsafeCast<FixedArray>(array.elements); const fixedArray: FixedArray = UnsafeCast<FixedArray>(array.elements);
const element: Object = fixedArray.objects[UnsafeCast<Smi>(k)]; const element: Object = fixedArray.objects[UnsafeCast<Smi>(k)];
return element == TheHole ? kEmptyString : UnsafeCast<JSAny>(element); return element == TheHole ? kEmptyString : element;
} }
LoadJoinElement<array::FastDoubleElements>( LoadJoinElement<array::FastDoubleElements>(
context: Context, receiver: JSReceiver, k: Number): JSAny { context: Context, receiver: JSReceiver, k: Number): Object {
const array: JSArray = UnsafeCast<JSArray>(receiver); const array: JSArray = UnsafeCast<JSArray>(receiver);
const fixedDoubleArray: FixedDoubleArray = const fixedDoubleArray: FixedDoubleArray =
UnsafeCast<FixedDoubleArray>(array.elements); UnsafeCast<FixedDoubleArray>(array.elements);
...@@ -51,7 +51,7 @@ namespace array_join { ...@@ -51,7 +51,7 @@ namespace array_join {
} }
builtin LoadJoinTypedElement<T: type>( builtin LoadJoinTypedElement<T: type>(
context: Context, receiver: JSReceiver, k: Number): JSAny { context: Context, receiver: JSReceiver, k: Number): Object {
const typedArray: JSTypedArray = UnsafeCast<JSTypedArray>(receiver); const typedArray: JSTypedArray = UnsafeCast<JSTypedArray>(receiver);
assert(!IsDetachedBuffer(typedArray.buffer)); assert(!IsDetachedBuffer(typedArray.buffer));
return typed_array::LoadFixedTypedArrayElementAsTagged( return typed_array::LoadFixedTypedArrayElementAsTagged(
...@@ -60,14 +60,14 @@ namespace array_join { ...@@ -60,14 +60,14 @@ namespace array_join {
} }
transitioning builtin ConvertToLocaleString( transitioning builtin ConvertToLocaleString(
context: Context, element: JSAny, locales: JSAny, context: Context, element: Object, locales: Object,
options: JSAny): String { options: Object): String {
if (IsNullOrUndefined(element)) return kEmptyString; if (IsNullOrUndefined(element)) return kEmptyString;
const prop: JSAny = GetProperty(element, 'toLocaleString'); const prop: Object = GetProperty(element, 'toLocaleString');
try { try {
const callable: Callable = Cast<Callable>(prop) otherwise TypeError; const callable: Callable = Cast<Callable>(prop) otherwise TypeError;
let result: JSAny; let result: Object;
if (IsNullOrUndefined(locales)) { if (IsNullOrUndefined(locales)) {
result = Call(context, callable, element); result = Call(context, callable, element);
} else if (IsNullOrUndefined(options)) { } else if (IsNullOrUndefined(options)) {
...@@ -257,7 +257,7 @@ namespace array_join { ...@@ -257,7 +257,7 @@ namespace array_join {
transitioning macro ArrayJoinImpl<T: type>(implicit context: Context)( transitioning macro ArrayJoinImpl<T: type>(implicit context: Context)(
receiver: JSReceiver, sep: String, lengthNumber: Number, receiver: JSReceiver, sep: String, lengthNumber: Number,
useToLocaleString: constexpr bool, locales: JSAny, options: JSAny, useToLocaleString: constexpr bool, locales: Object, options: Object,
initialLoadFn: LoadJoinElementFn): String { initialLoadFn: LoadJoinElementFn): String {
const initialMap: Map = receiver.map; const initialMap: Map = receiver.map;
const len: uintptr = Convert<uintptr>(lengthNumber); const len: uintptr = Convert<uintptr>(lengthNumber);
...@@ -283,7 +283,7 @@ namespace array_join { ...@@ -283,7 +283,7 @@ namespace array_join {
} }
// b. Let element be ? Get(O, ! ToString(k)). // b. Let element be ? Get(O, ! ToString(k)).
const element: JSAny = loadFn(context, receiver, Convert<Number>(k++)); const element: Object = loadFn(context, receiver, Convert<Number>(k++));
// c. If element is undefined or null, let next be the empty String; // c. If element is undefined or null, let next be the empty String;
// otherwise, let next be ? ToString(element). // otherwise, let next be ? ToString(element).
...@@ -300,7 +300,7 @@ namespace array_join { ...@@ -300,7 +300,7 @@ namespace array_join {
case (num: Number): { case (num: Number): {
next = NumberToString(num); next = NumberToString(num);
} }
case (obj: JSAny): { case (obj: HeapObject): {
if (IsNullOrUndefined(obj)) continue; if (IsNullOrUndefined(obj)) continue;
next = ToString(context, obj); next = ToString(context, obj);
} }
...@@ -321,11 +321,11 @@ namespace array_join { ...@@ -321,11 +321,11 @@ namespace array_join {
transitioning macro ArrayJoin<T: type>(implicit context: Context)( transitioning macro ArrayJoin<T: type>(implicit context: Context)(
useToLocaleString: constexpr bool, receiver: JSReceiver, sep: String, useToLocaleString: constexpr bool, receiver: JSReceiver, sep: String,
lenNumber: Number, locales: JSAny, options: JSAny): JSAny; lenNumber: Number, locales: Object, options: Object): Object;
transitioning ArrayJoin<JSArray>(implicit context: Context)( transitioning ArrayJoin<JSArray>(implicit context: Context)(
useToLocaleString: constexpr bool, receiver: JSReceiver, sep: String, useToLocaleString: constexpr bool, receiver: JSReceiver, sep: String,
lenNumber: Number, locales: JSAny, options: JSAny): JSAny { lenNumber: Number, locales: Object, options: Object): Object {
const map: Map = receiver.map; const map: Map = receiver.map;
const kind: ElementsKind = map.elements_kind; const kind: ElementsKind = map.elements_kind;
let loadFn: LoadJoinElementFn; let loadFn: LoadJoinElementFn;
...@@ -372,7 +372,7 @@ namespace array_join { ...@@ -372,7 +372,7 @@ namespace array_join {
transitioning ArrayJoin<JSTypedArray>(implicit context: Context)( transitioning ArrayJoin<JSTypedArray>(implicit context: Context)(
useToLocaleString: constexpr bool, receiver: JSReceiver, sep: String, useToLocaleString: constexpr bool, receiver: JSReceiver, sep: String,
lenNumber: Number, locales: JSAny, options: JSAny): JSAny { lenNumber: Number, locales: Object, options: Object): Object {
const map: Map = receiver.map; const map: Map = receiver.map;
const kind: ElementsKind = map.elements_kind; const kind: ElementsKind = map.elements_kind;
let loadFn: LoadJoinElementFn; let loadFn: LoadJoinElementFn;
...@@ -486,7 +486,7 @@ namespace array_join { ...@@ -486,7 +486,7 @@ namespace array_join {
// Removes a receiver from the stack. The FixedArray will automatically shrink // Removes a receiver from the stack. The FixedArray will automatically shrink
// to Heap::kMinJoinStackSize once the stack becomes empty. // to Heap::kMinJoinStackSize once the stack becomes empty.
builtin JoinStackPop(implicit context: Context)( builtin JoinStackPop(implicit context: Context)(
stack: FixedArray, receiver: JSReceiver): JSAny { stack: FixedArray, receiver: JSReceiver): Object {
const len: intptr = stack.length_intptr; const len: intptr = stack.length_intptr;
for (let i: intptr = 0; i < len; i++) { for (let i: intptr = 0; i < len; i++) {
if (stack.objects[i] == receiver) { if (stack.objects[i] == receiver) {
...@@ -526,7 +526,7 @@ namespace array_join { ...@@ -526,7 +526,7 @@ namespace array_join {
transitioning macro CycleProtectedArrayJoin<T: type>(implicit context: transitioning macro CycleProtectedArrayJoin<T: type>(implicit context:
Context)( Context)(
useToLocaleString: constexpr bool, o: JSReceiver, len: Number, useToLocaleString: constexpr bool, o: JSReceiver, len: Number,
sepObj: JSAny, locales: JSAny, options: JSAny): JSAny { sepObj: Object, locales: Object, options: Object): Object {
// 3. If separator is undefined, let sep be the single-element String ",". // 3. If separator is undefined, let sep be the single-element String ",".
// 4. Else, let sep be ? ToString(separator). // 4. Else, let sep be ? ToString(separator).
const sep: String = const sep: String =
...@@ -536,7 +536,7 @@ namespace array_join { ...@@ -536,7 +536,7 @@ namespace array_join {
// the normal join algorithm. // the normal join algorithm.
if (len > 0 && JoinStackPushInline(o)) { if (len > 0 && JoinStackPushInline(o)) {
try { try {
const result: JSAny = const result: Object =
ArrayJoin<T>(useToLocaleString, o, sep, len, locales, options); ArrayJoin<T>(useToLocaleString, o, sep, len, locales, options);
JoinStackPopInline(o); JoinStackPopInline(o);
return result; return result;
...@@ -551,9 +551,9 @@ namespace array_join { ...@@ -551,9 +551,9 @@ namespace array_join {
// https://tc39.github.io/ecma262/#sec-array.prototype.join // https://tc39.github.io/ecma262/#sec-array.prototype.join
transitioning javascript builtin transitioning javascript builtin
ArrayPrototypeJoin(js-implicit context: Context, receiver: JSAny)( ArrayPrototypeJoin(js-implicit context: Context, receiver: Object)(
...arguments): JSAny { ...arguments): Object {
const separator: JSAny = arguments[0]; const separator: Object = arguments[0];
// 1. Let O be ? ToObject(this value). // 1. Let O be ? ToObject(this value).
const o: JSReceiver = ToObject_Inline(context, receiver); const o: JSReceiver = ToObject_Inline(context, receiver);
...@@ -571,9 +571,9 @@ namespace array_join { ...@@ -571,9 +571,9 @@ namespace array_join {
// https://tc39.github.io/ecma262/#sec-array.prototype.tolocalestring // https://tc39.github.io/ecma262/#sec-array.prototype.tolocalestring
transitioning javascript builtin ArrayPrototypeToLocaleString( transitioning javascript builtin ArrayPrototypeToLocaleString(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const locales: JSAny = arguments[0]; const locales: Object = arguments[0];
const options: JSAny = arguments[1]; const options: Object = arguments[1];
// 1. Let O be ? ToObject(this value). // 1. Let O be ? ToObject(this value).
const o: JSReceiver = ToObject_Inline(context, receiver); const o: JSReceiver = ToObject_Inline(context, receiver);
...@@ -591,12 +591,12 @@ namespace array_join { ...@@ -591,12 +591,12 @@ namespace array_join {
// https://tc39.github.io/ecma262/#sec-array.prototype.tostring // https://tc39.github.io/ecma262/#sec-array.prototype.tostring
transitioning javascript builtin ArrayPrototypeToString( transitioning javascript builtin ArrayPrototypeToString(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
// 1. Let array be ? ToObject(this value). // 1. Let array be ? ToObject(this value).
const array: JSReceiver = ToObject_Inline(context, receiver); const array: JSReceiver = ToObject_Inline(context, receiver);
// 2. Let func be ? Get(array, "join"). // 2. Let func be ? Get(array, "join").
const prop: JSAny = GetProperty(array, 'join'); const prop: Object = GetProperty(array, 'join');
try { try {
// 3. If IsCallable(func) is false, let func be the intrinsic function // 3. If IsCallable(func) is false, let func be the intrinsic function
// %ObjProto_toString%. // %ObjProto_toString%.
...@@ -612,8 +612,8 @@ namespace array_join { ...@@ -612,8 +612,8 @@ namespace array_join {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.join // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.join
transitioning javascript builtin TypedArrayPrototypeJoin( transitioning javascript builtin TypedArrayPrototypeJoin(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const separator: JSAny = arguments[0]; const separator: Object = arguments[0];
// Spec: ValidateTypedArray is applied to the this value prior to evaluating // Spec: ValidateTypedArray is applied to the this value prior to evaluating
// the algorithm. // the algorithm.
...@@ -627,9 +627,9 @@ namespace array_join { ...@@ -627,9 +627,9 @@ namespace array_join {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.tolocalestring // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.tolocalestring
transitioning javascript builtin TypedArrayPrototypeToLocaleString( transitioning javascript builtin TypedArrayPrototypeToLocaleString(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const locales: JSAny = arguments[0]; const locales: Object = arguments[0];
const options: JSAny = arguments[1]; const options: Object = arguments[1];
// Spec: ValidateTypedArray is applied to the this value prior to evaluating // Spec: ValidateTypedArray is applied to the this value prior to evaluating
// the algorithm. // the algorithm.
......
src/builtins/array-lastindexof.tq
View file @ 4418a7b9
...@@ -4,20 +4,20 @@ ...@@ -4,20 +4,20 @@
namespace array_lastindexof { namespace array_lastindexof {
macro LoadWithHoleCheck<Elements: type>( macro LoadWithHoleCheck<Elements: type>(
elements: FixedArrayBase, index: Smi): JSAny elements: FixedArrayBase, index: Smi): Object
labels IfHole; labels IfHole;
LoadWithHoleCheck<FixedArray>(implicit context: Context)( LoadWithHoleCheck<FixedArray>(implicit context: Context)(
elements: FixedArrayBase, index: Smi): JSAny elements: FixedArrayBase, index: Smi): Object
labels IfHole { labels IfHole {
const elements: FixedArray = UnsafeCast<FixedArray>(elements); const elements: FixedArray = UnsafeCast<FixedArray>(elements);
const element: Object = elements.objects[index]; const element: Object = elements.objects[index];
if (element == TheHole) goto IfHole; if (element == TheHole) goto IfHole;
return UnsafeCast<JSAny>(element); return element;
} }
LoadWithHoleCheck<FixedDoubleArray>(implicit context: Context)( LoadWithHoleCheck<FixedDoubleArray>(implicit context: Context)(
elements: FixedArrayBase, index: Smi): JSAny elements: FixedArrayBase, index: Smi): Object
labels IfHole { labels IfHole {
const elements: FixedDoubleArray = UnsafeCast<FixedDoubleArray>(elements); const elements: FixedDoubleArray = UnsafeCast<FixedDoubleArray>(elements);
const element: float64 = LoadDoubleWithHoleCheck(elements, index) const element: float64 = LoadDoubleWithHoleCheck(elements, index)
...@@ -26,7 +26,7 @@ namespace array_lastindexof { ...@@ -26,7 +26,7 @@ namespace array_lastindexof {
} }
macro FastArrayLastIndexOf<Elements: type>( macro FastArrayLastIndexOf<Elements: type>(
context: Context, array: JSArray, from: Smi, searchElement: JSAny): Smi { context: Context, array: JSArray, from: Smi, searchElement: Object): Smi {
const elements: FixedArrayBase = array.elements; const elements: FixedArrayBase = array.elements;
let k: Smi = from; let k: Smi = from;
...@@ -40,7 +40,7 @@ namespace array_lastindexof { ...@@ -40,7 +40,7 @@ namespace array_lastindexof {
while (k >= 0) { while (k >= 0) {
try { try {
const element: JSAny = LoadWithHoleCheck<Elements>(elements, k) const element: Object = LoadWithHoleCheck<Elements>(elements, k)
otherwise Hole; otherwise Hole;
const same: Boolean = StrictEqual(searchElement, element); const same: Boolean = StrictEqual(searchElement, element);
...@@ -80,8 +80,8 @@ namespace array_lastindexof { ...@@ -80,8 +80,8 @@ namespace array_lastindexof {
} }
macro TryFastArrayLastIndexOf( macro TryFastArrayLastIndexOf(
context: Context, receiver: JSReceiver, searchElement: JSAny, context: Context, receiver: JSReceiver, searchElement: Object,
from: Number): JSAny from: Number): Object
labels Slow { labels Slow {
const array: FastJSArray = Cast<FastJSArray>(receiver) otherwise Slow; const array: FastJSArray = Cast<FastJSArray>(receiver) otherwise Slow;
const length: Smi = array.length; const length: Smi = array.length;
...@@ -99,8 +99,8 @@ namespace array_lastindexof { ...@@ -99,8 +99,8 @@ namespace array_lastindexof {
} }
transitioning macro GenericArrayLastIndexOf( transitioning macro GenericArrayLastIndexOf(
context: Context, object: JSReceiver, searchElement: JSAny, context: Context, object: JSReceiver, searchElement: Object,
from: Number): JSAny { from: Number): Object {
let k: Number = from; let k: Number = from;
// 7. Repeat, while k >= 0. // 7. Repeat, while k >= 0.
...@@ -111,7 +111,7 @@ namespace array_lastindexof { ...@@ -111,7 +111,7 @@ namespace array_lastindexof {
// b. If kPresent is true, then. // b. If kPresent is true, then.
if (kPresent == True) { if (kPresent == True) {
// i. Let elementK be ? Get(O, ! ToString(k)). // i. Let elementK be ? Get(O, ! ToString(k)).
const element: JSAny = GetProperty(object, k); const element: Object = GetProperty(object, k);
// ii. Let same be the result of performing Strict Equality Comparison // ii. Let same be the result of performing Strict Equality Comparison
// searchElement === elementK. // searchElement === elementK.
...@@ -131,7 +131,7 @@ namespace array_lastindexof { ...@@ -131,7 +131,7 @@ namespace array_lastindexof {
// https://tc39.github.io/ecma262/#sec-array.prototype.lastIndexOf // https://tc39.github.io/ecma262/#sec-array.prototype.lastIndexOf
transitioning javascript builtin ArrayPrototypeLastIndexOf( transitioning javascript builtin ArrayPrototypeLastIndexOf(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
// 1. Let O be ? ToObject(this value). // 1. Let O be ? ToObject(this value).
const object: JSReceiver = ToObject_Inline(context, receiver); const object: JSReceiver = ToObject_Inline(context, receiver);
...@@ -144,7 +144,7 @@ namespace array_lastindexof { ...@@ -144,7 +144,7 @@ namespace array_lastindexof {
// Step 4 - 6. // Step 4 - 6.
const from: Number = GetFromIndex(context, length, arguments); const from: Number = GetFromIndex(context, length, arguments);
const searchElement: JSAny = arguments[0]; const searchElement: Object = arguments[0];
try { try {
return TryFastArrayLastIndexOf(context, object, searchElement, from) return TryFastArrayLastIndexOf(context, object, searchElement, from)
......
src/builtins/array-map.tq
View file @ 4418a7b9
...@@ -5,15 +5,15 @@ ...@@ -5,15 +5,15 @@
namespace array_map { namespace array_map {
transitioning javascript builtin transitioning javascript builtin
ArrayMapLoopEagerDeoptContinuation( ArrayMapLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, array: JSAny, initialK: JSAny, callback: Object, thisArg: Object, array: Object, initialK: Object,
length: JSAny): JSAny { length: Object): Object {
// All continuation points in the optimized filter implementation are // All continuation points in the optimized filter implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -28,9 +28,9 @@ namespace array_map { ...@@ -28,9 +28,9 @@ namespace array_map {
transitioning javascript builtin transitioning javascript builtin
ArrayMapLoopLazyDeoptContinuation( ArrayMapLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, array: JSAny, initialK: JSAny, callback: Object, thisArg: Object, array: Object, initialK: Object,
length: JSAny, result: JSAny): JSAny { length: Object, result: Object): Object {
// All continuation points in the optimized filter implementation are // All continuation points in the optimized filter implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -57,9 +57,9 @@ namespace array_map { ...@@ -57,9 +57,9 @@ namespace array_map {
} }
transitioning builtin ArrayMapLoopContinuation(implicit context: Context)( transitioning builtin ArrayMapLoopContinuation(implicit context: Context)(
_receiver: JSReceiver, callbackfn: Callable, thisArg: JSAny, _receiver: JSReceiver, callbackfn: Callable, thisArg: Object,
array: JSReceiver, o: JSReceiver, initialK: Number, array: JSReceiver, o: JSReceiver, initialK: Number,
length: Number): JSAny { length: Number): Object {
// 6. Let k be 0. // 6. Let k be 0.
// 7. Repeat, while k < len // 7. Repeat, while k < len
for (let k: Number = initialK; k < length; k++) { for (let k: Number = initialK; k < length; k++) {
...@@ -73,10 +73,10 @@ namespace array_map { ...@@ -73,10 +73,10 @@ namespace array_map {
// 7c. If kPresent is true, then: // 7c. If kPresent is true, then:
if (kPresent == True) { if (kPresent == True) {
// i. Let kValue be ? Get(O, Pk). // i. Let kValue be ? Get(O, Pk).
const kValue: JSAny = GetProperty(o, k); const kValue: Object = GetProperty(o, k);
// ii. Let mapped_value be ? Call(callbackfn, T, kValue, k, O). // ii. Let mapped_value be ? Call(callbackfn, T, kValue, k, O).
const mappedValue: JSAny = const mappedValue: Object =
Call(context, callbackfn, thisArg, kValue, k, o); Call(context, callbackfn, thisArg, kValue, k, o);
// iii. Perform ? CreateDataPropertyOrThrow(A, Pk, mapped_value). // iii. Perform ? CreateDataPropertyOrThrow(A, Pk, mapped_value).
...@@ -127,12 +127,12 @@ namespace array_map { ...@@ -127,12 +127,12 @@ namespace array_map {
SmiUntag(length), kAllowLargeObjectAllocation); SmiUntag(length), kAllowLargeObjectAllocation);
a = NewJSArray(map, this.fixedArray); a = NewJSArray(map, this.fixedArray);
for (let i: Smi = 0; i < validLength; i++) { for (let i: Smi = 0; i < validLength; i++) {
typeswitch ( typeswitch (this.fixedArray.objects[i]) {
UnsafeCast<(Number | TheHole)>(this.fixedArray.objects[i])) {
case (n: Number): { case (n: Number): {
elements.floats[i] = Convert<float64>(n); elements.floats[i] = Convert<float64>(n);
} }
case (TheHole): { case (h: HeapObject): {
assert(h == TheHole);
} }
} }
} }
...@@ -147,7 +147,7 @@ namespace array_map { ...@@ -147,7 +147,7 @@ namespace array_map {
return a; return a;
} }
StoreResult(implicit context: Context)(index: Smi, result: JSAny) { StoreResult(implicit context: Context)(index: Smi, result: Object) {
typeswitch (result) { typeswitch (result) {
case (s: Smi): { case (s: Smi): {
this.fixedArray.objects[index] = s; this.fixedArray.objects[index] = s;
...@@ -156,7 +156,7 @@ namespace array_map { ...@@ -156,7 +156,7 @@ namespace array_map {
this.onlySmis = false; this.onlySmis = false;
this.fixedArray.objects[index] = s; this.fixedArray.objects[index] = s;
} }
case (s: JSAnyNotNumber): { case (s: HeapObject): {
this.onlySmis = false; this.onlySmis = false;
this.onlyNumbers = false; this.onlyNumbers = false;
this.fixedArray.objects[index] = s; this.fixedArray.objects[index] = s;
...@@ -185,7 +185,7 @@ namespace array_map { ...@@ -185,7 +185,7 @@ namespace array_map {
transitioning macro FastArrayMap(implicit context: Context)( transitioning macro FastArrayMap(implicit context: Context)(
fastO: FastJSArrayForRead, len: Smi, callbackfn: Callable, fastO: FastJSArrayForRead, len: Smi, callbackfn: Callable,
thisArg: JSAny): JSArray thisArg: Object): JSArray
labels Bailout(JSArray, Smi) { labels Bailout(JSArray, Smi) {
let k: Smi = 0; let k: Smi = 0;
let fastOW = NewFastJSArrayForReadWitness(fastO); let fastOW = NewFastJSArrayForReadWitness(fastO);
...@@ -201,9 +201,9 @@ namespace array_map { ...@@ -201,9 +201,9 @@ namespace array_map {
if (k >= fastOW.Get().length) goto PrepareBailout(k); if (k >= fastOW.Get().length) goto PrepareBailout(k);
try { try {
const value: JSAny = fastOW.LoadElementNoHole(k) const value: Object = fastOW.LoadElementNoHole(k)
otherwise FoundHole; otherwise FoundHole;
const result: JSAny = const result: Object =
Call(context, callbackfn, thisArg, value, k, fastOW.Get()); Call(context, callbackfn, thisArg, value, k, fastOW.Get());
vector.StoreResult(k, result); vector.StoreResult(k, result);
} }
...@@ -224,7 +224,8 @@ namespace array_map { ...@@ -224,7 +224,8 @@ namespace array_map {
// https://tc39.github.io/ecma262/#sec-array.prototype.map // https://tc39.github.io/ecma262/#sec-array.prototype.map
transitioning javascript builtin transitioning javascript builtin
ArrayMap(js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { ArrayMap(js-implicit context: Context, receiver: Object)(...arguments):
Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.map'); RequireObjectCoercible(receiver, 'Array.prototype.map');
...@@ -240,7 +241,7 @@ namespace array_map { ...@@ -240,7 +241,7 @@ namespace array_map {
const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError; const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError;
// 4. If thisArg is present, let T be thisArg; else let T be undefined. // 4. If thisArg is present, let T be thisArg; else let T be undefined.
const thisArg: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const thisArg: Object = arguments.length > 1 ? arguments[1] : Undefined;
let array: JSReceiver; let array: JSReceiver;
let k: Number = 0; let k: Number = 0;
......
src/builtins/array-of.tq
View file @ 4418a7b9
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
namespace array_of { namespace array_of {
// https://tc39.github.io/ecma262/#sec-array.of // https://tc39.github.io/ecma262/#sec-array.of
transitioning javascript builtin transitioning javascript builtin
ArrayOf(js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { ArrayOf(js-implicit context: Context, receiver: Object)(...arguments):
Object {
// 1. Let len be the actual number of arguments passed to this function. // 1. Let len be the actual number of arguments passed to this function.
const len: Smi = Convert<Smi>(arguments.length); const len: Smi = Convert<Smi>(arguments.length);
...@@ -13,7 +14,7 @@ namespace array_of { ...@@ -13,7 +14,7 @@ namespace array_of {
const items: Arguments = arguments; const items: Arguments = arguments;
// 3. Let C be the this value. // 3. Let C be the this value.
const c: JSAny = receiver; const c: Object = receiver;
let a: JSReceiver; let a: JSReceiver;
...@@ -23,7 +24,7 @@ namespace array_of { ...@@ -23,7 +24,7 @@ namespace array_of {
// a. Let A be ? Construct(C, « len »). // a. Let A be ? Construct(C, « len »).
a = Construct(c, len); a = Construct(c, len);
} }
case (JSAny): { case (Object): {
// a. Let A be ? ArrayCreate(len). // a. Let A be ? ArrayCreate(len).
a = ArrayCreate(len); a = ArrayCreate(len);
} }
...@@ -35,7 +36,7 @@ namespace array_of { ...@@ -35,7 +36,7 @@ namespace array_of {
// 7. Repeat, while k < len // 7. Repeat, while k < len
while (k < len) { while (k < len) {
// a. Let kValue be items[k]. // a. Let kValue be items[k].
const kValue: JSAny = items[Convert<intptr>(k)]; const kValue: Object = items[Convert<intptr>(k)];
// b. Let Pk be ! ToString(k). // b. Let Pk be ! ToString(k).
// c. Perform ? CreateDataPropertyOrThrow(A, Pk, kValue). // c. Perform ? CreateDataPropertyOrThrow(A, Pk, kValue).
......
src/builtins/array-reduce-right.tq
View file @ 4418a7b9
...@@ -6,13 +6,13 @@ namespace array { ...@@ -6,13 +6,13 @@ namespace array {
transitioning javascript builtin transitioning javascript builtin
ArrayReduceRightPreLoopEagerDeoptContinuation( ArrayReduceRightPreLoopEagerDeoptContinuation(
js-implicit context: Context, js-implicit context: Context,
receiver: JSAny)(callback: JSAny, length: JSAny): JSAny { receiver: Object)(callback: Object, length: Object): Object {
// All continuation points in the optimized every implementation are // All continuation points in the optimized every implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -27,15 +27,15 @@ namespace array { ...@@ -27,15 +27,15 @@ namespace array {
transitioning javascript builtin transitioning javascript builtin
ArrayReduceRightLoopEagerDeoptContinuation( ArrayReduceRightLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, initialK: JSAny, length: JSAny, callback: Object, initialK: Object, length: Object,
accumulator: JSAny): JSAny { accumulator: Object): Object {
// All continuation points in the optimized every implementation are // All continuation points in the optimized every implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -48,8 +48,9 @@ namespace array { ...@@ -48,8 +48,9 @@ namespace array {
transitioning javascript builtin transitioning javascript builtin
ArrayReduceRightLoopLazyDeoptContinuation( ArrayReduceRightLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, initialK: JSAny, length: JSAny, result: JSAny): JSAny { callback: Object, initialK: Object, length: Object,
result: Object): Object {
// All continuation points in the optimized every implementation are // All continuation points in the optimized every implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -66,9 +67,8 @@ namespace array { ...@@ -66,9 +67,8 @@ namespace array {
transitioning builtin ArrayReduceRightLoopContinuation(implicit context: transitioning builtin ArrayReduceRightLoopContinuation(implicit context:
Context)( Context)(
_receiver: JSReceiver, callbackfn: Callable, _receiver: JSReceiver, callbackfn: Callable, initialAccumulator: Object,
initialAccumulator: JSAny | TheHole, o: JSReceiver, initialK: Number, o: JSReceiver, initialK: Number, _length: Number): Object {
_length: Number): JSAny {
let accumulator = initialAccumulator; let accumulator = initialAccumulator;
// 8b and 9. Repeat, while k >= 0 // 8b and 9. Repeat, while k >= 0
...@@ -83,20 +83,16 @@ namespace array { ...@@ -83,20 +83,16 @@ namespace array {
// 8b iii and 9c. If kPresent is true, then // 8b iii and 9c. If kPresent is true, then
if (present == True) { if (present == True) {
// 8b iii and 9c i. Let kValue be ? Get(O, Pk). // 8b iii and 9c i. Let kValue be ? Get(O, Pk).
const value: JSAny = GetProperty(o, k); const value: Object = GetProperty(o, k);
typeswitch (accumulator) { if (accumulator == TheHole) {
case (TheHole): {
// 8b iii 1. // 8b iii 1.
accumulator = value; accumulator = value;
} } else {
case (accumulatorNotHole: JSAny): {
// 9c. ii. Set accumulator to ? Call(callbackfn, undefined, // 9c. ii. Set accumulator to ? Call(callbackfn, undefined,
// <accumulator, kValue, k, O>). // <accumulator, kValue, k, O>).
accumulator = Call( accumulator =
context, callbackfn, Undefined, accumulatorNotHole, value, k, Call(context, callbackfn, Undefined, accumulator, value, k, o);
o);
}
} }
} }
...@@ -106,20 +102,16 @@ namespace array { ...@@ -106,20 +102,16 @@ namespace array {
// 8c. if kPresent is false, throw a TypeError exception. // 8c. if kPresent is false, throw a TypeError exception.
// If the accumulator is discovered with the sentinel hole value, // If the accumulator is discovered with the sentinel hole value,
// this means kPresent is false. // this means kPresent is false.
typeswitch (accumulator) { if (accumulator == TheHole) {
case (TheHole): {
ThrowTypeError(kReduceNoInitial, 'Array.prototype.reduceRight'); ThrowTypeError(kReduceNoInitial, 'Array.prototype.reduceRight');
} }
case (accumulator: JSAny): {
return accumulator; return accumulator;
} }
}
}
transitioning macro FastArrayReduceRight(implicit context: Context)( transitioning macro FastArrayReduceRight(implicit context: Context)(
o: JSReceiver, len: Number, callbackfn: Callable, o: JSReceiver, len: Number, callbackfn: Callable,
initialAccumulator: JSAny | TheHole): JSAny initialAccumulator: Object): Object
labels Bailout(Number, JSAny | TheHole) { labels Bailout(Number, Object) {
let accumulator = initialAccumulator; let accumulator = initialAccumulator;
const smiLen = Cast<Smi>(len) otherwise goto Bailout(len - 1, accumulator); const smiLen = Cast<Smi>(len) otherwise goto Bailout(len - 1, accumulator);
const fastO = Cast<FastJSArrayForRead>(o) const fastO = Cast<FastJSArrayForRead>(o)
...@@ -133,32 +125,25 @@ namespace array { ...@@ -133,32 +125,25 @@ namespace array {
// Ensure that we haven't walked beyond a possibly updated length. // Ensure that we haven't walked beyond a possibly updated length.
if (k >= fastOW.Get().length) goto Bailout(k, accumulator); if (k >= fastOW.Get().length) goto Bailout(k, accumulator);
const value: JSAny = fastOW.LoadElementNoHole(k) otherwise continue; const value: Object = fastOW.LoadElementNoHole(k) otherwise continue;
typeswitch (accumulator) { if (accumulator == TheHole) {
case (TheHole): {
accumulator = value; accumulator = value;
} } else {
case (accumulatorNotHole: JSAny): {
accumulator = Call( accumulator = Call(
context, callbackfn, Undefined, accumulatorNotHole, value, k, context, callbackfn, Undefined, accumulator, value, k,
fastOW.Get()); fastOW.Get());
} }
} }
} if (accumulator == TheHole) {
typeswitch (accumulator) {
case (TheHole): {
ThrowTypeError(kReduceNoInitial, 'Array.prototype.reduceRight'); ThrowTypeError(kReduceNoInitial, 'Array.prototype.reduceRight');
} }
case (accumulator: JSAny): {
return accumulator; return accumulator;
} }
}
}
// https://tc39.github.io/ecma262/#sec-array.prototype.reduceRight // https://tc39.github.io/ecma262/#sec-array.prototype.reduceRight
transitioning javascript builtin transitioning javascript builtin
ArrayReduceRight(js-implicit context: Context, receiver: JSAny)(...arguments): ArrayReduceRight(js-implicit context: Context, receiver: Object)(
JSAny { ...arguments): Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.reduceRight'); RequireObjectCoercible(receiver, 'Array.prototype.reduceRight');
...@@ -178,14 +163,14 @@ namespace array { ...@@ -178,14 +163,14 @@ namespace array {
// exception. (This case is handled at the end of // exception. (This case is handled at the end of
// ArrayReduceRightLoopContinuation). // ArrayReduceRightLoopContinuation).
const initialValue: JSAny | TheHole = const initialValue: Object =
arguments.length > 1 ? arguments[1] : TheHole; arguments.length > 1 ? arguments[1] : TheHole;
try { try {
return FastArrayReduceRight(o, len, callbackfn, initialValue) return FastArrayReduceRight(o, len, callbackfn, initialValue)
otherwise Bailout; otherwise Bailout;
} }
label Bailout(value: Number, accumulator: JSAny | TheHole) { label Bailout(value: Number, accumulator: Object) {
return ArrayReduceRightLoopContinuation( return ArrayReduceRightLoopContinuation(
o, callbackfn, accumulator, o, value, len); o, callbackfn, accumulator, o, value, len);
} }
......
src/builtins/array-reduce.tq
View file @ 4418a7b9
...@@ -6,13 +6,13 @@ namespace array { ...@@ -6,13 +6,13 @@ namespace array {
transitioning javascript builtin transitioning javascript builtin
ArrayReducePreLoopEagerDeoptContinuation( ArrayReducePreLoopEagerDeoptContinuation(
js-implicit context: Context, js-implicit context: Context,
receiver: JSAny)(callback: JSAny, length: JSAny): JSAny { receiver: Object)(callback: Object, length: Object): Object {
// All continuation points in the optimized every implementation are // All continuation points in the optimized every implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -27,15 +27,15 @@ namespace array { ...@@ -27,15 +27,15 @@ namespace array {
transitioning javascript builtin transitioning javascript builtin
ArrayReduceLoopEagerDeoptContinuation( ArrayReduceLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, initialK: JSAny, length: JSAny, callback: Object, initialK: Object, length: Object,
accumulator: JSAny): JSAny { accumulator: Object): Object {
// All continuation points in the optimized every implementation are // All continuation points in the optimized every implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -48,8 +48,9 @@ namespace array { ...@@ -48,8 +48,9 @@ namespace array {
transitioning javascript builtin transitioning javascript builtin
ArrayReduceLoopLazyDeoptContinuation( ArrayReduceLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, initialK: JSAny, length: JSAny, result: JSAny): JSAny { callback: Object, initialK: Object, length: Object,
result: Object): Object {
// All continuation points in the optimized every implementation are // All continuation points in the optimized every implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -65,9 +66,8 @@ namespace array { ...@@ -65,9 +66,8 @@ namespace array {
} }
transitioning builtin ArrayReduceLoopContinuation(implicit context: Context)( transitioning builtin ArrayReduceLoopContinuation(implicit context: Context)(
_receiver: JSReceiver, callbackfn: Callable, _receiver: JSReceiver, callbackfn: Callable, initialAccumulator: Object,
initialAccumulator: JSAny | TheHole, o: JSReceiver, initialK: Number, o: JSReceiver, initialK: Number, length: Number): Object {
length: Number): JSAny {
let accumulator = initialAccumulator; let accumulator = initialAccumulator;
// 8b and 9. Repeat, while k < len // 8b and 9. Repeat, while k < len
...@@ -82,20 +82,16 @@ namespace array { ...@@ -82,20 +82,16 @@ namespace array {
// 6c. If kPresent is true, then // 6c. If kPresent is true, then
if (present == True) { if (present == True) {
// 6c. i. Let kValue be ? Get(O, Pk). // 6c. i. Let kValue be ? Get(O, Pk).
const value: JSAny = GetProperty(o, k); const value: Object = GetProperty(o, k);
typeswitch (accumulator) { if (accumulator == TheHole) {
case (TheHole): {
// 8b. // 8b.
accumulator = value; accumulator = value;
} } else {
case (accumulatorNotHole: JSAny): {
// 9c. ii. Set accumulator to ? Call(callbackfn, undefined, // 9c. ii. Set accumulator to ? Call(callbackfn, undefined,
// <accumulator, kValue, k, O>). // <accumulator, kValue, k, O>).
accumulator = Call( accumulator =
context, callbackfn, Undefined, accumulatorNotHole, value, k, Call(context, callbackfn, Undefined, accumulator, value, k, o);
o);
}
} }
} }
...@@ -105,20 +101,16 @@ namespace array { ...@@ -105,20 +101,16 @@ namespace array {
// 8c. if kPresent is false, throw a TypeError exception. // 8c. if kPresent is false, throw a TypeError exception.
// If the accumulator is discovered with the sentinel hole value, // If the accumulator is discovered with the sentinel hole value,
// this means kPresent is false. // this means kPresent is false.
typeswitch (accumulator) { if (accumulator == TheHole) {
case (TheHole): {
ThrowTypeError(kReduceNoInitial, 'Array.prototype.reduce'); ThrowTypeError(kReduceNoInitial, 'Array.prototype.reduce');
} }
case (accumulator: JSAny): {
return accumulator; return accumulator;
} }
}
}
transitioning macro FastArrayReduce(implicit context: Context)( transitioning macro FastArrayReduce(implicit context: Context)(
o: JSReceiver, len: Number, callbackfn: Callable, o: JSReceiver, len: Number, callbackfn: Callable,
initialAccumulator: JSAny | TheHole): JSAny initialAccumulator: Object): Object
labels Bailout(Number, JSAny | TheHole) { labels Bailout(Number, Object) {
const k = 0; const k = 0;
let accumulator = initialAccumulator; let accumulator = initialAccumulator;
Cast<Smi>(len) otherwise goto Bailout(k, accumulator); Cast<Smi>(len) otherwise goto Bailout(k, accumulator);
...@@ -133,32 +125,25 @@ namespace array { ...@@ -133,32 +125,25 @@ namespace array {
// Ensure that we haven't walked beyond a possibly updated length. // Ensure that we haven't walked beyond a possibly updated length.
if (k >= fastOW.Get().length) goto Bailout(k, accumulator); if (k >= fastOW.Get().length) goto Bailout(k, accumulator);
const value: JSAny = fastOW.LoadElementNoHole(k) otherwise continue; const value: Object = fastOW.LoadElementNoHole(k) otherwise continue;
typeswitch (accumulator) { if (accumulator == TheHole) {
case (TheHole): {
accumulator = value; accumulator = value;
} } else {
case (accumulatorNotHole: JSAny): {
accumulator = Call( accumulator = Call(
context, callbackfn, Undefined, accumulatorNotHole, value, k, context, callbackfn, Undefined, accumulator, value, k,
fastOW.Get()); fastOW.Get());
} }
} }
} if (accumulator == TheHole) {
typeswitch (accumulator) {
case (TheHole): {
ThrowTypeError(kReduceNoInitial, 'Array.prototype.reduce'); ThrowTypeError(kReduceNoInitial, 'Array.prototype.reduce');
} }
case (accumulator: JSAny): {
return accumulator; return accumulator;
} }
}
}
// https://tc39.github.io/ecma262/#sec-array.prototype.reduce // https://tc39.github.io/ecma262/#sec-array.prototype.reduce
transitioning javascript builtin transitioning javascript builtin
ArrayReduce(js-implicit context: Context, receiver: JSAny)(...arguments): ArrayReduce(js-implicit context: Context, receiver: Object)(...arguments):
JSAny { Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.reduce'); RequireObjectCoercible(receiver, 'Array.prototype.reduce');
...@@ -178,14 +163,14 @@ namespace array { ...@@ -178,14 +163,14 @@ namespace array {
// exception. (This case is handled at the end of // exception. (This case is handled at the end of
// ArrayReduceLoopContinuation). // ArrayReduceLoopContinuation).
const initialValue: JSAny | TheHole = const initialValue: Object =
arguments.length > 1 ? arguments[1] : TheHole; arguments.length > 1 ? arguments[1] : TheHole;
try { try {
return FastArrayReduce(o, len, callbackfn, initialValue) return FastArrayReduce(o, len, callbackfn, initialValue)
otherwise Bailout; otherwise Bailout;
} }
label Bailout(value: Number, accumulator: JSAny | TheHole) { label Bailout(value: Number, accumulator: Object) {
return ArrayReduceLoopContinuation( return ArrayReduceLoopContinuation(
o, callbackfn, accumulator, o, value, len); o, callbackfn, accumulator, o, value, len);
} }
......
src/builtins/array-reverse.tq
View file @ 4418a7b9
...@@ -12,10 +12,10 @@ namespace array_reverse { ...@@ -12,10 +12,10 @@ namespace array_reverse {
return UnsafeCast<Smi>(elements.objects[index]); return UnsafeCast<Smi>(elements.objects[index]);
} }
LoadElement<array::FastPackedObjectElements, JSAny>( LoadElement<array::FastPackedObjectElements, Object>(
implicit context: Context)(elements: FixedArrayBase, index: Smi): JSAny { implicit context: Context)(elements: FixedArrayBase, index: Smi): Object {
const elements: FixedArray = UnsafeCast<FixedArray>(elements); const elements: FixedArray = UnsafeCast<FixedArray>(elements);
return UnsafeCast<JSAny>(elements.objects[index]); return elements.objects[index];
} }
LoadElement<array::FastPackedDoubleElements, float64>( LoadElement<array::FastPackedDoubleElements, float64>(
...@@ -38,9 +38,9 @@ namespace array_reverse { ...@@ -38,9 +38,9 @@ namespace array_reverse {
StoreFixedArrayElement(elems, index, value, SKIP_WRITE_BARRIER); StoreFixedArrayElement(elems, index, value, SKIP_WRITE_BARRIER);
} }
StoreElement<array::FastPackedObjectElements, JSAny>( StoreElement<array::FastPackedObjectElements, Object>(
implicit context: implicit context:
Context)(elements: FixedArrayBase, index: Smi, value: JSAny) { Context)(elements: FixedArrayBase, index: Smi, value: Object) {
const elements: FixedArray = UnsafeCast<FixedArray>(elements); const elements: FixedArray = UnsafeCast<FixedArray>(elements);
elements.objects[index] = value; elements.objects[index] = value;
} }
...@@ -70,8 +70,8 @@ namespace array_reverse { ...@@ -70,8 +70,8 @@ namespace array_reverse {
} }
} }
transitioning macro GenericArrayReverse(context: Context, receiver: JSAny): transitioning macro GenericArrayReverse(context: Context, receiver: Object):
JSAny { Object {
// 1. Let O be ? ToObject(this value). // 1. Let O be ? ToObject(this value).
const object: JSReceiver = ToObject_Inline(context, receiver); const object: JSReceiver = ToObject_Inline(context, receiver);
...@@ -89,8 +89,8 @@ namespace array_reverse { ...@@ -89,8 +89,8 @@ namespace array_reverse {
let upper: Number = length - 1; let upper: Number = length - 1;
while (lower < upper) { while (lower < upper) {
let lowerValue: JSAny = Undefined; let lowerValue: Object = Undefined;
let upperValue: JSAny = Undefined; let upperValue: Object = Undefined;
// b. Let upperP be ! ToString(upper). // b. Let upperP be ! ToString(upper).
// c. Let lowerP be ! ToString(lower). // c. Let lowerP be ! ToString(lower).
...@@ -142,7 +142,7 @@ namespace array_reverse { ...@@ -142,7 +142,7 @@ namespace array_reverse {
return object; return object;
} }
macro TryFastPackedArrayReverse(implicit context: Context)(receiver: JSAny) macro TryFastPackedArrayReverse(implicit context: Context)(receiver: Object)
labels Slow { labels Slow {
const array: FastJSArray = Cast<FastJSArray>(receiver) otherwise Slow; const array: FastJSArray = Cast<FastJSArray>(receiver) otherwise Slow;
...@@ -153,7 +153,7 @@ namespace array_reverse { ...@@ -153,7 +153,7 @@ namespace array_reverse {
array.elements, array.length); array.elements, array.length);
} else if (kind == PACKED_ELEMENTS) { } else if (kind == PACKED_ELEMENTS) {
array::EnsureWriteableFastElements(array); array::EnsureWriteableFastElements(array);
FastPackedArrayReverse<array::FastPackedObjectElements, JSAny>( FastPackedArrayReverse<array::FastPackedObjectElements, Object>(
array.elements, array.length); array.elements, array.length);
} else if (kind == PACKED_DOUBLE_ELEMENTS) { } else if (kind == PACKED_DOUBLE_ELEMENTS) {
FastPackedArrayReverse<array::FastPackedDoubleElements, float64>( FastPackedArrayReverse<array::FastPackedDoubleElements, float64>(
...@@ -165,7 +165,7 @@ namespace array_reverse { ...@@ -165,7 +165,7 @@ namespace array_reverse {
// https://tc39.github.io/ecma262/#sec-array.prototype.reverse // https://tc39.github.io/ecma262/#sec-array.prototype.reverse
transitioning javascript builtin ArrayPrototypeReverse( transitioning javascript builtin ArrayPrototypeReverse(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
try { try {
TryFastPackedArrayReverse(receiver) otherwise Baseline; TryFastPackedArrayReverse(receiver) otherwise Baseline;
return receiver; return receiver;
......
src/builtins/array-shift.tq
View file @ 4418a7b9
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
// found in the LICENSE file. // found in the LICENSE file.
namespace array_shift { namespace array_shift {
extern builtin ArrayShift(Context, JSFunction, JSAny, int32): JSAny; extern builtin ArrayShift(Context, JSFunction, Object, int32): Object;
macro TryFastArrayShift(implicit context: Context)(receiver: JSAny): JSAny macro TryFastArrayShift(implicit context: Context)(receiver: Object): Object
labels Slow, Runtime { labels Slow, Runtime {
const array: FastJSArray = Cast<FastJSArray>(receiver) otherwise Slow; const array: FastJSArray = Cast<FastJSArray>(receiver) otherwise Slow;
let witness = NewFastJSArrayWitness(array); let witness = NewFastJSArrayWitness(array);
...@@ -37,7 +37,7 @@ namespace array_shift { ...@@ -37,7 +37,7 @@ namespace array_shift {
} }
transitioning macro GenericArrayShift(implicit context: transitioning macro GenericArrayShift(implicit context:
Context)(receiver: JSAny): JSAny { Context)(receiver: Object): Object {
// 1. Let O be ? ToObject(this value). // 1. Let O be ? ToObject(this value).
const object: JSReceiver = ToObject_Inline(context, receiver); const object: JSReceiver = ToObject_Inline(context, receiver);
...@@ -70,7 +70,7 @@ namespace array_shift { ...@@ -70,7 +70,7 @@ namespace array_shift {
// d. If fromPresent is true, then // d. If fromPresent is true, then
if (fromPresent == True) { if (fromPresent == True) {
// i. Let fromVal be ? Get(O, from). // i. Let fromVal be ? Get(O, from).
const fromValue: JSAny = GetProperty(object, from); const fromValue: Object = GetProperty(object, from);
// ii. Perform ? Set(O, to, fromValue, true). // ii. Perform ? Set(O, to, fromValue, true).
SetProperty(object, to, fromValue); SetProperty(object, to, fromValue);
...@@ -95,7 +95,7 @@ namespace array_shift { ...@@ -95,7 +95,7 @@ namespace array_shift {
// https://tc39.github.io/ecma262/#sec-array.prototype.shift // https://tc39.github.io/ecma262/#sec-array.prototype.shift
transitioning javascript builtin ArrayPrototypeShift( transitioning javascript builtin ArrayPrototypeShift(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
try { try {
return TryFastArrayShift(receiver) otherwise Slow, Runtime; return TryFastArrayShift(receiver) otherwise Slow, Runtime;
} }
......
src/builtins/array-slice.tq
View file @ 4418a7b9
...@@ -63,9 +63,9 @@ namespace array_slice { ...@@ -63,9 +63,9 @@ namespace array_slice {
for (let current: Smi = start; current < to; ++current) { for (let current: Smi = start; current < to; ++current) {
const e: Object = const e: Object =
sloppyElements.objects[current + kSloppyArgumentsParameterMapStart]; sloppyElements.objects[current + kSloppyArgumentsParameterMapStart];
const newElement: JSAny = UnsafeCast<JSAny>( const newElement: Object = e != TheHole ?
e != TheHole ? argumentsContext[UnsafeCast<Smi>(e)] : argumentsContext[UnsafeCast<Smi>(e)] :
unmappedElements.objects[current]); unmappedElements.objects[current];
// It is safe to skip the write barrier here because resultElements was // It is safe to skip the write barrier here because resultElements was
// allocated together with result in a folded allocation. // allocated together with result in a folded allocation.
// TODO(tebbi): The verification of this fails at the moment due to // TODO(tebbi): The verification of this fails at the moment due to
...@@ -86,7 +86,7 @@ namespace array_slice { ...@@ -86,7 +86,7 @@ namespace array_slice {
} }
macro HandleFastSlice( macro HandleFastSlice(
context: Context, o: JSAny, startNumber: Number, context: Context, o: Object, startNumber: Number,
countNumber: Number): JSArray countNumber: Number): JSArray
labels Bailout { labels Bailout {
const start: Smi = Cast<Smi>(startNumber) otherwise Bailout; const start: Smi = Cast<Smi>(startNumber) otherwise Bailout;
...@@ -114,7 +114,7 @@ namespace array_slice { ...@@ -114,7 +114,7 @@ namespace array_slice {
otherwise Bailout; otherwise Bailout;
} }
} }
case (JSAny): { case (Object): {
} }
} }
goto Bailout; goto Bailout;
...@@ -122,15 +122,15 @@ namespace array_slice { ...@@ -122,15 +122,15 @@ namespace array_slice {
// https://tc39.github.io/ecma262/#sec-array.prototype.slice // https://tc39.github.io/ecma262/#sec-array.prototype.slice
transitioning javascript builtin transitioning javascript builtin
ArrayPrototypeSlice(js-implicit context: Context, receiver: JSAny)( ArrayPrototypeSlice(js-implicit context: Context, receiver: Object)(
...arguments): JSAny { ...arguments): Object {
// Handle array cloning case if the receiver is a fast array. // Handle array cloning case if the receiver is a fast array.
if (arguments.length == 0) { if (arguments.length == 0) {
typeswitch (receiver) { typeswitch (receiver) {
case (a: FastJSArrayForCopy): { case (a: FastJSArrayForCopy): {
return CloneFastJSArray(context, a); return CloneFastJSArray(context, a);
} }
case (JSAny): { case (Object): {
} }
} }
} }
...@@ -142,7 +142,7 @@ namespace array_slice { ...@@ -142,7 +142,7 @@ namespace array_slice {
const len: Number = GetLengthProperty(o); const len: Number = GetLengthProperty(o);
// 3. Let relativeStart be ? ToInteger(start). // 3. Let relativeStart be ? ToInteger(start).
const start: JSAny = arguments[0]; const start: Object = arguments[0];
const relativeStart: Number = ToInteger_Inline(context, start); const relativeStart: Number = ToInteger_Inline(context, start);
// 4. If relativeStart < 0, let k be max((len + relativeStart), 0); // 4. If relativeStart < 0, let k be max((len + relativeStart), 0);
...@@ -152,7 +152,7 @@ namespace array_slice { ...@@ -152,7 +152,7 @@ namespace array_slice {
// 5. If end is undefined, let relativeEnd be len; // 5. If end is undefined, let relativeEnd be len;
// else let relativeEnd be ? ToInteger(end). // else let relativeEnd be ? ToInteger(end).
const end: JSAny = arguments[1]; const end: Object = arguments[1];
const relativeEnd: Number = const relativeEnd: Number =
end == Undefined ? len : ToInteger_Inline(context, end); end == Undefined ? len : ToInteger_Inline(context, end);
...@@ -193,7 +193,7 @@ namespace array_slice { ...@@ -193,7 +193,7 @@ namespace array_slice {
// c. If kPresent is true, then // c. If kPresent is true, then
if (fromPresent == True) { if (fromPresent == True) {
// i. Let kValue be ? Get(O, Pk). // i. Let kValue be ? Get(O, Pk).
const kValue: JSAny = GetProperty(o, pK); const kValue: Object = GetProperty(o, pK);
// ii. Perform ? CreateDataPropertyOrThrow(A, ! ToString(n), kValue). // ii. Perform ? CreateDataPropertyOrThrow(A, ! ToString(n), kValue).
FastCreateDataProperty(a, n, kValue); FastCreateDataProperty(a, n, kValue);
......
src/builtins/array-some.tq
View file @ 4418a7b9
...@@ -5,14 +5,15 @@ ...@@ -5,14 +5,15 @@
namespace array { namespace array {
transitioning javascript builtin transitioning javascript builtin
ArraySomeLoopEagerDeoptContinuation( ArraySomeLoopEagerDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny): JSAny { callback: Object, thisArg: Object, initialK: Object,
length: Object): Object {
// All continuation points in the optimized some implementation are // All continuation points in the optimized some implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
// //
// Also, this great mass of casts is necessary because the signature // Also, this great mass of casts is necessary because the signature
// of Torque javascript builtins requires JSAny type for all parameters // of Torque javascript builtins requires Object type for all parameters
// other than {context}. // other than {context}.
const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable; const jsreceiver = Cast<JSReceiver>(receiver) otherwise unreachable;
const callbackfn = Cast<Callable>(callback) otherwise unreachable; const callbackfn = Cast<Callable>(callback) otherwise unreachable;
...@@ -26,9 +27,9 @@ namespace array { ...@@ -26,9 +27,9 @@ namespace array {
transitioning javascript builtin transitioning javascript builtin
ArraySomeLoopLazyDeoptContinuation( ArraySomeLoopLazyDeoptContinuation(
js-implicit context: Context, receiver: JSAny)( js-implicit context: Context, receiver: Object)(
callback: JSAny, thisArg: JSAny, initialK: JSAny, length: JSAny, callback: Object, thisArg: Object, initialK: Object, length: Object,
result: JSAny): JSAny { result: Object): Object {
// All continuation points in the optimized some implementation are // All continuation points in the optimized some implementation are
// after the ToObject(O) call that ensures we are dealing with a // after the ToObject(O) call that ensures we are dealing with a
// JSReceiver. // JSReceiver.
...@@ -52,9 +53,9 @@ namespace array { ...@@ -52,9 +53,9 @@ namespace array {
} }
transitioning builtin ArraySomeLoopContinuation(implicit context: Context)( transitioning builtin ArraySomeLoopContinuation(implicit context: Context)(
_receiver: JSReceiver, callbackfn: Callable, thisArg: JSAny, _receiver: JSReceiver, callbackfn: Callable, thisArg: Object,
_array: JSAny, o: JSReceiver, initialK: Number, length: Number, _array: Object, o: JSReceiver, initialK: Number, length: Number,
_initialTo: JSAny): JSAny { _initialTo: Object): Object {
// 5. Let k be 0. // 5. Let k be 0.
// 6. Repeat, while k < len // 6. Repeat, while k < len
for (let k: Number = initialK; k < length; k++) { for (let k: Number = initialK; k < length; k++) {
...@@ -68,10 +69,10 @@ namespace array { ...@@ -68,10 +69,10 @@ namespace array {
// 6c. If kPresent is true, then // 6c. If kPresent is true, then
if (kPresent == True) { if (kPresent == True) {
// 6c. i. Let kValue be ? Get(O, Pk). // 6c. i. Let kValue be ? Get(O, Pk).
const kValue: JSAny = GetProperty(o, k); const kValue: Object = GetProperty(o, k);
// 6c. ii. Perform ? Call(callbackfn, T, <kValue, k, O>). // 6c. ii. Perform ? Call(callbackfn, T, <kValue, k, O>).
const result: JSAny = Call(context, callbackfn, thisArg, kValue, k, o); const result: Object = Call(context, callbackfn, thisArg, kValue, k, o);
// iii. If selected is true, then... // iii. If selected is true, then...
if (ToBoolean(result)) { if (ToBoolean(result)) {
...@@ -85,7 +86,7 @@ namespace array { ...@@ -85,7 +86,7 @@ namespace array {
} }
transitioning macro FastArraySome(implicit context: Context)( transitioning macro FastArraySome(implicit context: Context)(
o: JSReceiver, len: Number, callbackfn: Callable, thisArg: JSAny): JSAny o: JSReceiver, len: Number, callbackfn: Callable, thisArg: Object): Object
labels Bailout(Smi) { labels Bailout(Smi) {
let k: Smi = 0; let k: Smi = 0;
const smiLen = Cast<Smi>(len) otherwise goto Bailout(k); const smiLen = Cast<Smi>(len) otherwise goto Bailout(k);
...@@ -98,8 +99,8 @@ namespace array { ...@@ -98,8 +99,8 @@ namespace array {
// Ensure that we haven't walked beyond a possibly updated length. // Ensure that we haven't walked beyond a possibly updated length.
if (k >= fastOW.Get().length) goto Bailout(k); if (k >= fastOW.Get().length) goto Bailout(k);
const value: JSAny = fastOW.LoadElementNoHole(k) otherwise continue; const value: Object = fastOW.LoadElementNoHole(k) otherwise continue;
const result: JSAny = const result: Object =
Call(context, callbackfn, thisArg, value, k, fastOW.Get()); Call(context, callbackfn, thisArg, value, k, fastOW.Get());
if (ToBoolean(result)) { if (ToBoolean(result)) {
return True; return True;
...@@ -110,8 +111,8 @@ namespace array { ...@@ -110,8 +111,8 @@ namespace array {
// https://tc39.github.io/ecma262/#sec-array.prototype.some // https://tc39.github.io/ecma262/#sec-array.prototype.some
transitioning javascript builtin transitioning javascript builtin
ArraySome(js-implicit context: Context, receiver: JSAny)(...arguments): ArraySome(js-implicit context: Context, receiver: Object)(...arguments):
JSAny { Object {
try { try {
RequireObjectCoercible(receiver, 'Array.prototype.some'); RequireObjectCoercible(receiver, 'Array.prototype.some');
...@@ -128,7 +129,7 @@ namespace array { ...@@ -128,7 +129,7 @@ namespace array {
const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError; const callbackfn = Cast<Callable>(arguments[0]) otherwise TypeError;
// 4. If thisArg is present, let T be thisArg; else let T be undefined. // 4. If thisArg is present, let T be thisArg; else let T be undefined.
const thisArg: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const thisArg: Object = arguments.length > 1 ? arguments[1] : Undefined;
// Special cases. // Special cases.
try { try {
......
src/builtins/array-splice.tq
View file @ 4418a7b9
...@@ -95,7 +95,7 @@ namespace array_splice { ...@@ -95,7 +95,7 @@ namespace array_splice {
const typedNewElements: FixedArrayType = const typedNewElements: FixedArrayType =
UnsafeCast<FixedArrayType>(a.elements); UnsafeCast<FixedArrayType>(a.elements);
for (let i: intptr = 2; i < args.length; ++i) { for (let i: intptr = 2; i < args.length; ++i) {
const e: JSAny = args[i]; const e: Object = args[i];
// The argument elements were already validated to be an appropriate // The argument elements were already validated to be an appropriate
// {ElementType} to store in {FixedArrayType}. // {ElementType} to store in {FixedArrayType}.
typedNewElements[k++] = UnsafeCast<ElementType>(e); typedNewElements[k++] = UnsafeCast<ElementType>(e);
...@@ -109,7 +109,7 @@ namespace array_splice { ...@@ -109,7 +109,7 @@ namespace array_splice {
transitioning macro FastArraySplice( transitioning macro FastArraySplice(
context: Context, args: Arguments, o: JSReceiver, context: Context, args: Arguments, o: JSReceiver,
originalLengthNumber: Number, actualStartNumber: Number, insertCount: Smi, originalLengthNumber: Number, actualStartNumber: Number, insertCount: Smi,
actualDeleteCountNumber: Number): JSAny actualDeleteCountNumber: Number): Object
labels Bailout { labels Bailout {
const originalLength: Smi = const originalLength: Smi =
Cast<Smi>(originalLengthNumber) otherwise Bailout; Cast<Smi>(originalLengthNumber) otherwise Bailout;
...@@ -132,7 +132,7 @@ namespace array_splice { ...@@ -132,7 +132,7 @@ namespace array_splice {
const oldElementsKind: ElementsKind = elementsKind; const oldElementsKind: ElementsKind = elementsKind;
for (let i: intptr = 2; i < args.length; ++i) { for (let i: intptr = 2; i < args.length; ++i) {
const e: JSAny = args[i]; const e: Object = args[i];
if (IsFastSmiElementsKind(elementsKind)) { if (IsFastSmiElementsKind(elementsKind)) {
if (TaggedIsNotSmi(e)) { if (TaggedIsNotSmi(e)) {
const heapObject: HeapObject = UnsafeCast<HeapObject>(e); const heapObject: HeapObject = UnsafeCast<HeapObject>(e);
...@@ -166,7 +166,7 @@ namespace array_splice { ...@@ -166,7 +166,7 @@ namespace array_splice {
} }
if (IsFastSmiOrTaggedElementsKind(elementsKind)) { if (IsFastSmiOrTaggedElementsKind(elementsKind)) {
FastSplice<FixedArray, JSAny>( FastSplice<FixedArray, Object>(
args, a, length, newLength, actualStart, insertCount, args, a, length, newLength, actualStart, insertCount,
actualDeleteCount); actualDeleteCount);
} else { } else {
...@@ -180,7 +180,7 @@ namespace array_splice { ...@@ -180,7 +180,7 @@ namespace array_splice {
transitioning macro FillDeletedElementsArray( transitioning macro FillDeletedElementsArray(
context: Context, o: JSReceiver, actualStart: Number, context: Context, o: JSReceiver, actualStart: Number,
actualDeleteCount: Number, a: JSReceiver): JSAny { actualDeleteCount: Number, a: JSReceiver): Object {
// 10. Let k be 0. // 10. Let k be 0.
let k: Number = 0; let k: Number = 0;
...@@ -195,7 +195,7 @@ namespace array_splice { ...@@ -195,7 +195,7 @@ namespace array_splice {
// c. If fromPresent is true, then // c. If fromPresent is true, then
if (fromPresent == True) { if (fromPresent == True) {
// i. Let fromValue be ? Get(O, from). // i. Let fromValue be ? Get(O, from).
const fromValue: JSAny = GetProperty(o, from); const fromValue: Object = GetProperty(o, from);
// ii. Perform ? CreateDataPropertyOrThrow(A, ! ToString(k), fromValue). // ii. Perform ? CreateDataPropertyOrThrow(A, ! ToString(k), fromValue).
FastCreateDataProperty(a, k, fromValue); FastCreateDataProperty(a, k, fromValue);
...@@ -231,7 +231,7 @@ namespace array_splice { ...@@ -231,7 +231,7 @@ namespace array_splice {
// iv. If fromPresent is true, then // iv. If fromPresent is true, then
if (fromPresent == True) { if (fromPresent == True) {
// 1. Let fromValue be ? Get(O, from). // 1. Let fromValue be ? Get(O, from).
const fromValue: JSAny = GetProperty(o, from); const fromValue: Object = GetProperty(o, from);
// 2. Perform ? Set(O, to, fromValue, true). // 2. Perform ? Set(O, to, fromValue, true).
SetProperty(o, to, fromValue); SetProperty(o, to, fromValue);
...@@ -280,7 +280,7 @@ namespace array_splice { ...@@ -280,7 +280,7 @@ namespace array_splice {
// iv. If fromPresent is true, then // iv. If fromPresent is true, then
if (fromPresent == True) { if (fromPresent == True) {
// 1. Let fromValue be ? Get(O, from). // 1. Let fromValue be ? Get(O, from).
const fromValue: JSAny = GetProperty(o, from); const fromValue: Object = GetProperty(o, from);
// 2. Perform ? Set(O, to, fromValue, true). // 2. Perform ? Set(O, to, fromValue, true).
SetProperty(o, to, fromValue); SetProperty(o, to, fromValue);
...@@ -298,7 +298,8 @@ namespace array_splice { ...@@ -298,7 +298,8 @@ namespace array_splice {
transitioning macro SlowSplice( transitioning macro SlowSplice(
context: Context, arguments: Arguments, o: JSReceiver, len: Number, context: Context, arguments: Arguments, o: JSReceiver, len: Number,
actualStart: Number, insertCount: Smi, actualDeleteCount: Number): JSAny { actualStart: Number, insertCount: Smi,
actualDeleteCount: Number): Object {
// 9. Let A be ? ArraySpeciesCreate(O, actualDeleteCount). // 9. Let A be ? ArraySpeciesCreate(O, actualDeleteCount).
const a: JSReceiver = ArraySpeciesCreate(context, o, actualDeleteCount); const a: JSReceiver = ArraySpeciesCreate(context, o, actualDeleteCount);
const itemCount: Number = insertCount; const itemCount: Number = insertCount;
...@@ -331,7 +332,7 @@ namespace array_splice { ...@@ -331,7 +332,7 @@ namespace array_splice {
// element. // element.
if (arguments.length > 2) { if (arguments.length > 2) {
for (let i: intptr = 2; i < arguments.length; ++i) { for (let i: intptr = 2; i < arguments.length; ++i) {
const e: JSAny = arguments[i]; const e: Object = arguments[i];
// b. Perform ? Set(O, ! ToString(k), E, true). // b. Perform ? Set(O, ! ToString(k), E, true).
SetProperty(o, k, e); SetProperty(o, k, e);
...@@ -349,8 +350,8 @@ namespace array_splice { ...@@ -349,8 +350,8 @@ namespace array_splice {
// https://tc39.github.io/ecma262/#sec-array.prototype.splice // https://tc39.github.io/ecma262/#sec-array.prototype.splice
transitioning javascript builtin transitioning javascript builtin
ArrayPrototypeSplice(js-implicit context: Context, receiver: JSAny)( ArrayPrototypeSplice(js-implicit context: Context, receiver: Object)(
...arguments): JSAny { ...arguments): Object {
// 1. Let O be ? ToObject(this value). // 1. Let O be ? ToObject(this value).
const o: JSReceiver = ToObject(context, receiver); const o: JSReceiver = ToObject(context, receiver);
...@@ -358,7 +359,7 @@ namespace array_splice { ...@@ -358,7 +359,7 @@ namespace array_splice {
const len: Number = GetLengthProperty(o); const len: Number = GetLengthProperty(o);
// 3. Let relativeStart be ? ToInteger(start). // 3. Let relativeStart be ? ToInteger(start).
const start: JSAny = arguments[0]; const start: Object = arguments[0];
const relativeStart: Number = ToInteger_Inline(context, start); const relativeStart: Number = ToInteger_Inline(context, start);
// 4. If relativeStart < 0, let actualStart be max((len + relativeStart), // 4. If relativeStart < 0, let actualStart be max((len + relativeStart),
...@@ -387,7 +388,7 @@ namespace array_splice { ...@@ -387,7 +388,7 @@ namespace array_splice {
// a. Let insertCount be the Number of actual arguments minus 2. // a. Let insertCount be the Number of actual arguments minus 2.
insertCount = Convert<Smi>(arguments.length) - 2; insertCount = Convert<Smi>(arguments.length) - 2;
// b. Let dc be ? ToInteger(deleteCount). // b. Let dc be ? ToInteger(deleteCount).
const deleteCount: JSAny = arguments[1]; const deleteCount: Object = arguments[1];
const dc: Number = ToInteger_Inline(context, deleteCount); const dc: Number = ToInteger_Inline(context, deleteCount);
// c. Let actualDeleteCount be min(max(dc, 0), len - actualStart). // c. Let actualDeleteCount be min(max(dc, 0), len - actualStart).
actualDeleteCount = Min(Max(dc, 0), len - actualStart); actualDeleteCount = Min(Max(dc, 0), len - actualStart);
......
src/builtins/array-unshift.tq
View file @ 4418a7b9
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
// found in the LICENSE file. // found in the LICENSE file.
namespace array_unshift { namespace array_unshift {
extern builtin ArrayUnshift(Context, JSFunction, JSAny, int32): JSAny; extern builtin ArrayUnshift(Context, JSFunction, Object, int32): Object;
transitioning macro GenericArrayUnshift( transitioning macro GenericArrayUnshift(
context: Context, receiver: JSAny, arguments: Arguments): Number { context: Context, receiver: Object, arguments: Arguments): Number {
// 1. Let O be ? ToObject(this value). // 1. Let O be ? ToObject(this value).
const object: JSReceiver = ToObject_Inline(context, receiver); const object: JSReceiver = ToObject_Inline(context, receiver);
...@@ -40,7 +40,7 @@ namespace array_unshift { ...@@ -40,7 +40,7 @@ namespace array_unshift {
// iv. If fromPresent is true, then // iv. If fromPresent is true, then
if (fromPresent == True) { if (fromPresent == True) {
// 1. Let fromValue be ? Get(O, from). // 1. Let fromValue be ? Get(O, from).
const fromValue: JSAny = GetProperty(object, from); const fromValue: Object = GetProperty(object, from);
// 2. Perform ? Set(O, to, fromValue, true). // 2. Perform ? Set(O, to, fromValue, true).
SetProperty(object, to, fromValue); SetProperty(object, to, fromValue);
...@@ -78,7 +78,7 @@ namespace array_unshift { ...@@ -78,7 +78,7 @@ namespace array_unshift {
// https://tc39.github.io/ecma262/#sec-array.prototype.unshift // https://tc39.github.io/ecma262/#sec-array.prototype.unshift
transitioning javascript builtin ArrayPrototypeUnshift( transitioning javascript builtin ArrayPrototypeUnshift(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
try { try {
const array: FastJSArray = Cast<FastJSArray>(receiver) otherwise Slow; const array: FastJSArray = Cast<FastJSArray>(receiver) otherwise Slow;
array::EnsureWriteableFastElements(array); array::EnsureWriteableFastElements(array);
......
src/builtins/array.tq
View file @ 4418a7b9
...@@ -32,16 +32,31 @@ namespace array { ...@@ -32,16 +32,31 @@ namespace array {
assert(array.elements.map != kCOWMap); assert(array.elements.map != kCOWMap);
} }
macro LoadElementOrUndefined(implicit context: macro IsJSArray(implicit context: Context)(o: Object): bool {
Context)(a: FixedArray, i: Smi): JSAny { typeswitch (o) {
const e = UnsafeCast<(JSAny | TheHole)>(a.objects[i]); case (JSArray): {
return ReplaceTheHoleWithUndefined(e); return true;
}
case (Object): {
return false;
}
}
}
macro LoadElementOrUndefined(a: FixedArray, i: Smi): Object {
const e: Object = a.objects[i];
return e == TheHole ? Undefined : e;
} }
macro LoadElementOrUndefined(a: FixedDoubleArray, i: Smi): NumberOrUndefined { macro LoadElementOrUndefined(a: FixedDoubleArray, i: Smi): NumberOrUndefined {
const f: float64 = LoadDoubleWithHoleCheck(a, i) otherwise return Undefined; try {
const f: float64 = LoadDoubleWithHoleCheck(a, i) otherwise IfHole;
return AllocateHeapNumberWithValue(f); return AllocateHeapNumberWithValue(f);
} }
label IfHole {
return Undefined;
}
}
macro StoreArrayHole(elements: FixedDoubleArray, k: Smi): void { macro StoreArrayHole(elements: FixedDoubleArray, k: Smi): void {
StoreFixedDoubleArrayHoleSmi(elements, k); StoreFixedDoubleArrayHoleSmi(elements, k);
...@@ -51,5 +66,5 @@ namespace array { ...@@ -51,5 +66,5 @@ namespace array {
elements.objects[k] = TheHole; elements.objects[k] = TheHole;
} }
extern macro SetPropertyLength(implicit context: Context)(JSAny, Number); extern macro SetPropertyLength(implicit context: Context)(Object, Number);
} }
src/builtins/base.tq
View file @ 4418a7b9
...@@ -43,29 +43,6 @@ extern class HeapObject extends Tagged { ...@@ -43,29 +43,6 @@ extern class HeapObject extends Tagged {
type Object = Smi | HeapObject; type Object = Smi | HeapObject;
// Defined to coincide with https://tc39.es/ecma262/#sec-ispropertykey
// Doesn't include PrivateSymbol.
type PropertyKey = String | PublicSymbol;
// TODO(tebbi): PrivateSymbol is only exposed to JavaScript through the debugger
// API. We should reconsider this and try not to expose it at all. Then JSAny
// would not need to contain it.
// A JavaScript primitive value as defined in
// https://tc39.es/ecma262/#sec-primitive-value.
type JSPrimitive = Numeric | String | Symbol | Boolean |
Null | Undefined;
// A user-exposed JavaScript value, as opposed to V8-internal values like
// TheHole or FixedArray.
type JSAny = JSReceiver | JSPrimitive;
type JSAnyNotNumber = BigInt | String | Symbol | Boolean |
Null | Undefined | JSReceiver;
// This is the intersection of JSAny and HeapObject.
type JSAnyNotSmi = JSAnyNotNumber | HeapNumber;
type int32 generates 'TNode<Int32T>' constexpr 'int32_t'; type int32 generates 'TNode<Int32T>' constexpr 'int32_t';
type uint32 generates 'TNode<Uint32T>' constexpr 'uint32_t'; type uint32 generates 'TNode<Uint32T>' constexpr 'uint32_t';
type int31 extends int32 type int31 extends int32
...@@ -120,9 +97,6 @@ type Numeric = Number | BigInt; ...@@ -120,9 +97,6 @@ type Numeric = Number | BigInt;
extern class Name extends HeapObject { extern class Name extends HeapObject {
hash_field: uint32; hash_field: uint32;
} }
// This is the same as Name, but with the information that there are no other
// kinds of names.
type AnyName = PrivateSymbol | PublicSymbol | String;
@generateCppClass @generateCppClass
extern class Symbol extends Name { extern class Symbol extends Name {
...@@ -130,9 +104,6 @@ extern class Symbol extends Name { ...@@ -130,9 +104,6 @@ extern class Symbol extends Name {
name: Object; // The print name of a symbol, or undefined if none. name: Object; // The print name of a symbol, or undefined if none.
} }
type PublicSymbol extends Symbol;
type PrivateSymbol extends Symbol;
@abstract @abstract
@generateCppClass @generateCppClass
extern class String extends Name { extern class String extends Name {
...@@ -411,8 +382,8 @@ extern class JSProxy extends JSReceiver { ...@@ -411,8 +382,8 @@ extern class JSProxy extends JSReceiver {
// Just a starting shape for JSObject; properties can move after initialization. // Just a starting shape for JSObject; properties can move after initialization.
@noVerifier @noVerifier
extern class JSProxyRevocableResult extends JSObject { extern class JSProxyRevocableResult extends JSObject {
proxy: JSAny; proxy: Object;
revoke: JSAny; revoke: Object;
} }
macro NewJSProxyRevocableResult(implicit context: Context)( macro NewJSProxyRevocableResult(implicit context: Context)(
...@@ -435,7 +406,7 @@ extern class JSGlobalProxy extends JSObject { ...@@ -435,7 +406,7 @@ extern class JSGlobalProxy extends JSObject {
@generateCppClass @generateCppClass
extern class JSPrimitiveWrapper extends JSObject { extern class JSPrimitiveWrapper extends JSObject {
value: JSAny; value: Object;
} }
extern class JSArgumentsObject extends JSObject {} extern class JSArgumentsObject extends JSObject {}
...@@ -444,13 +415,13 @@ extern class JSArgumentsObject extends JSObject {} ...@@ -444,13 +415,13 @@ extern class JSArgumentsObject extends JSObject {}
@noVerifier @noVerifier
@hasSameInstanceTypeAsParent @hasSameInstanceTypeAsParent
extern class JSArgumentsObjectWithLength extends JSArgumentsObject { extern class JSArgumentsObjectWithLength extends JSArgumentsObject {
length: JSAny; length: Object;
} }
// Just a starting shape for JSObject; properties can move after initialization. // Just a starting shape for JSObject; properties can move after initialization.
@hasSameInstanceTypeAsParent @hasSameInstanceTypeAsParent
extern class JSSloppyArgumentsObject extends JSArgumentsObjectWithLength { extern class JSSloppyArgumentsObject extends JSArgumentsObjectWithLength {
callee: JSAny; callee: Object;
} }
// Just a starting shape for JSObject; properties can move after initialization. // Just a starting shape for JSObject; properties can move after initialization.
...@@ -656,7 +627,7 @@ extern class SharedFunctionInfo extends HeapObject { ...@@ -656,7 +627,7 @@ extern class SharedFunctionInfo extends HeapObject {
extern class JSBoundFunction extends JSObject { extern class JSBoundFunction extends JSObject {
bound_target_function: Callable; bound_target_function: Callable;
bound_this: JSAny; bound_this: Object;
bound_arguments: FixedArray; bound_arguments: FixedArray;
} }
...@@ -667,7 +638,7 @@ extern class JSBoundFunction extends JSObject { ...@@ -667,7 +638,7 @@ extern class JSBoundFunction extends JSObject {
type NonNullForeign extends Foreign; type NonNullForeign extends Foreign;
// A function built with InstantiateFunction for the public API. // A function built with InstantiateFunction for the public API.
type CallableApiObject extends JSObject; type CallableApiObject extends HeapObject;
// A JSProxy with the callable bit set. // A JSProxy with the callable bit set.
type CallableJSProxy extends JSProxy; type CallableJSProxy extends JSProxy;
...@@ -832,7 +803,7 @@ extern class PropertyArray extends HeapObject { length_and_hash: Smi; } ...@@ -832,7 +803,7 @@ extern class PropertyArray extends HeapObject { length_and_hash: Smi; }
type DependentCode extends WeakFixedArray; type DependentCode extends WeakFixedArray;
extern class PropertyCell extends HeapObject { extern class PropertyCell extends HeapObject {
name: AnyName; name: Name;
property_details_raw: Smi; property_details_raw: Smi;
value: Object; value: Object;
dependent_code: DependentCode; dependent_code: DependentCode;
...@@ -907,7 +878,7 @@ extern class DataHandler extends Struct { ...@@ -907,7 +878,7 @@ extern class DataHandler extends Struct {
extern class JSGeneratorObject extends JSObject { extern class JSGeneratorObject extends JSObject {
function: JSFunction; function: JSFunction;
context: Context; context: Context;
receiver: JSAny; receiver: Object;
input_or_debug_pos: Object; input_or_debug_pos: Object;
resume_mode: Smi; resume_mode: Smi;
continuation: Smi; continuation: Smi;
...@@ -1286,7 +1257,7 @@ extern class JSRegExp extends JSObject { ...@@ -1286,7 +1257,7 @@ extern class JSRegExp extends JSObject {
} }
extern transitioning macro AllocateJSIteratorResult(implicit context: Context)( extern transitioning macro AllocateJSIteratorResult(implicit context: Context)(
JSAny, Boolean): JSObject; Object, Boolean): JSObject;
// Note: Although a condition for a FastJSRegExp is having a positive smi // Note: Although a condition for a FastJSRegExp is having a positive smi
// lastIndex (see RegExpBuiltinsAssembler::BranchIfFastRegExp), it is possible // lastIndex (see RegExpBuiltinsAssembler::BranchIfFastRegExp), it is possible
...@@ -1305,13 +1276,13 @@ RegExpBuiltinsAssembler::FastStoreLastIndex(FastJSRegExp, Smi): void; ...@@ -1305,13 +1276,13 @@ RegExpBuiltinsAssembler::FastStoreLastIndex(FastJSRegExp, Smi): void;
@hasSameInstanceTypeAsParent @hasSameInstanceTypeAsParent
extern class JSRegExpResult extends JSArray { extern class JSRegExpResult extends JSArray {
index: JSAny; index: Object;
input: JSAny; input: Object;
groups: JSAny; groups: Object;
} }
extern class JSRegExpStringIterator extends JSObject { extern class JSRegExpStringIterator extends JSObject {
iterating_reg_exp: JSAny; iterating_reg_exp: Object;
iterated_string: String; iterated_string: String;
flags: Smi; flags: Smi;
} }
...@@ -1489,32 +1460,32 @@ extern macro Comment(constexpr string); ...@@ -1489,32 +1460,32 @@ extern macro Comment(constexpr string);
extern macro StaticAssert(bool); extern macro StaticAssert(bool);
extern macro Print(Object); extern macro Print(Object);
extern macro DebugBreak(); extern macro DebugBreak();
extern transitioning macro ToInteger_Inline(Context, JSAny): Number; extern transitioning macro ToInteger_Inline(Context, Object): Number;
extern transitioning macro ToInteger_Inline( extern transitioning macro ToInteger_Inline(
Context, JSAny, constexpr ToIntegerTruncationMode): Number; Context, Object, constexpr ToIntegerTruncationMode): Number;
extern transitioning macro ToLength_Inline(Context, JSAny): Number; extern transitioning macro ToLength_Inline(Context, Object): Number;
extern transitioning macro ToNumber_Inline(Context, JSAny): Number; extern transitioning macro ToNumber_Inline(Context, Object): Number;
extern transitioning macro ToSmiIndex(implicit context: Context)(JSAny): extern transitioning macro ToSmiIndex(implicit context: Context)(Object):
PositiveSmi labels IfRangeError; PositiveSmi labels IfRangeError;
extern transitioning macro ToSmiLength(implicit context: Context)(JSAny): extern transitioning macro ToSmiLength(implicit context: Context)(Object):
PositiveSmi labels IfRangeError; PositiveSmi labels IfRangeError;
extern transitioning macro ToString_Inline(Context, JSAny): String; extern transitioning macro ToString_Inline(Context, Object): String;
extern transitioning macro ToThisString(implicit context: Context)( extern transitioning macro ToThisString(implicit context: Context)(
JSAny, String): String; Object, String): String;
extern transitioning macro ToThisValue(implicit context: Context)( extern transitioning macro ToThisValue(implicit context: Context)(
JSAny, constexpr PrimitiveType, constexpr string): JSAny; Object, constexpr PrimitiveType, constexpr string): Object;
extern transitioning macro GetProperty(implicit context: Context)( extern transitioning macro GetProperty(implicit context: Context)(
JSAny, JSAny): JSAny; Object, Object): Object;
extern transitioning builtin SetProperty(implicit context: Context)( extern transitioning builtin SetProperty(implicit context: Context)(
JSAny, JSAny, JSAny); Object, Object, Object);
extern transitioning builtin SetPropertyInLiteral(implicit context: Context)( extern transitioning builtin SetPropertyInLiteral(implicit context: Context)(
JSAny, JSAny, JSAny); Object, Object, Object);
extern transitioning builtin DeleteProperty(implicit context: Context)( extern transitioning builtin DeleteProperty(implicit context: Context)(
JSAny, JSAny | PrivateSymbol, LanguageMode): Boolean; Object, Object, LanguageMode): Object;
extern transitioning builtin HasProperty(implicit context: Context)( extern transitioning builtin HasProperty(implicit context: Context)(
JSAny, JSAny): Boolean; Object, Object): Boolean;
extern transitioning macro HasProperty_Inline(implicit context: Context)( extern transitioning macro HasProperty_Inline(implicit context: Context)(
JSReceiver, JSAny): Boolean; JSReceiver, Object): Boolean;
extern macro ThrowRangeError(implicit context: Context)( extern macro ThrowRangeError(implicit context: Context)(
constexpr MessageTemplate): never; constexpr MessageTemplate): never;
...@@ -1533,43 +1504,43 @@ extern macro ThrowTypeError(implicit context: Context)( ...@@ -1533,43 +1504,43 @@ extern macro ThrowTypeError(implicit context: Context)(
extern transitioning runtime ThrowTypeErrorIfStrict(implicit context: Context)( extern transitioning runtime ThrowTypeErrorIfStrict(implicit context: Context)(
Smi, Object, Object): void; Smi, Object, Object): void;
extern macro ArraySpeciesCreate(Context, JSAny, Number): JSReceiver; extern macro ArraySpeciesCreate(Context, Object, Number): JSReceiver;
extern macro ArrayCreate(implicit context: Context)(Number): JSArray; extern macro ArrayCreate(implicit context: Context)(Number): JSArray;
extern macro BuildAppendJSArray( extern macro BuildAppendJSArray(
constexpr ElementsKind, FastJSArray, JSAny): void labels Bailout; constexpr ElementsKind, FastJSArray, Object): void labels Bailout;
extern macro EnsureArrayPushable(Map): ElementsKind extern macro EnsureArrayPushable(Map): ElementsKind
labels Bailout; labels Bailout;
extern macro EnsureArrayLengthWritable(Map) labels Bailout; extern macro EnsureArrayLengthWritable(Map) labels Bailout;
// TODO: Reduce duplication once varargs are supported in macros. // TODO: Reduce duplication once varargs are supported in macros.
extern macro Construct(implicit context: Context)( extern macro Construct(implicit context: Context)(
Constructor, JSAny): JSReceiver; Constructor, Object): JSReceiver;
extern macro Construct(implicit context: Context)( extern macro Construct(implicit context: Context)(
Constructor, JSAny, JSAny): JSReceiver; Constructor, Object, Object): JSReceiver;
extern macro Construct(implicit context: Context)( extern macro Construct(implicit context: Context)(
Constructor, JSAny, JSAny, JSAny): JSReceiver; Constructor, Object, Object, Object): JSReceiver;
extern macro ConstructWithTarget(implicit context: Context)( extern macro ConstructWithTarget(implicit context: Context)(
Constructor, JSReceiver): JSReceiver; Constructor, JSReceiver): JSReceiver;
extern macro ConstructWithTarget(implicit context: Context)( extern macro ConstructWithTarget(implicit context: Context)(
Constructor, JSReceiver, JSAny): JSReceiver; Constructor, JSReceiver, Object): JSReceiver;
extern macro SpeciesConstructor(implicit context: Context)( extern macro SpeciesConstructor(implicit context: Context)(
JSAny, JSReceiver): JSReceiver; Object, JSReceiver): JSReceiver;
extern macro ConstructorBuiltinsAssembler::IsDictionaryMap(Map): bool; extern macro ConstructorBuiltinsAssembler::IsDictionaryMap(Map): bool;
extern macro CodeStubAssembler::AllocateNameDictionary(constexpr int32): extern macro CodeStubAssembler::AllocateNameDictionary(constexpr int32):
NameDictionary; NameDictionary;
extern builtin ToObject(Context, JSAny): JSReceiver; extern builtin ToObject(Context, Object): JSReceiver;
extern macro ToObject_Inline(Context, JSAny): JSReceiver; extern macro ToObject_Inline(Context, Object): JSReceiver;
extern macro IsNullOrUndefined(Object): bool; extern macro IsNullOrUndefined(Object): bool;
extern macro IsTheHole(Object): bool; extern macro IsTheHole(Object): bool;
extern macro IsString(HeapObject): bool; extern macro IsString(HeapObject): bool;
transitioning builtin ToString(context: Context, o: JSAny): String { transitioning builtin ToString(context: Context, o: Object): String {
return ToStringImpl(context, o); return ToStringImpl(context, o);
} }
extern transitioning runtime ToStringRT(Context, JSAny): String; extern transitioning runtime ToStringRT(Context, Object): String;
extern transitioning builtin NonPrimitiveToPrimitive_String( extern transitioning builtin NonPrimitiveToPrimitive_String(
Context, JSAny): JSPrimitive; Context, Object): Object;
extern transitioning runtime NormalizeElements(Context, JSObject); extern transitioning runtime NormalizeElements(Context, JSObject);
extern transitioning runtime TransitionElementsKindWithKind( extern transitioning runtime TransitionElementsKindWithKind(
...@@ -1588,9 +1559,9 @@ extern macro StringCharCodeAt(String, intptr): int32; ...@@ -1588,9 +1559,9 @@ extern macro StringCharCodeAt(String, intptr): int32;
extern runtime StringCompareSequence(Context, String, String, Number): Boolean; extern runtime StringCompareSequence(Context, String, String, Number): Boolean;
extern macro StringFromSingleCharCode(int32): String; extern macro StringFromSingleCharCode(int32): String;
extern macro StrictEqual(JSAny, JSAny): Boolean; extern macro StrictEqual(Object, Object): Boolean;
extern macro SmiLexicographicCompare(Smi, Smi): Smi; extern macro SmiLexicographicCompare(Smi, Smi): Smi;
extern runtime ReThrow(Context, JSAny): never; extern runtime ReThrow(Context, Object): never;
extern runtime ThrowInvalidStringLength(Context): never; extern runtime ThrowInvalidStringLength(Context): never;
extern operator '==' macro WordEqual(RawPtr, RawPtr): bool; extern operator '==' macro WordEqual(RawPtr, RawPtr): bool;
...@@ -1883,150 +1854,6 @@ Cast<Number>(o: Object): Number ...@@ -1883,150 +1854,6 @@ Cast<Number>(o: Object): Number
return TaggedToNumber(o) otherwise CastError; return TaggedToNumber(o) otherwise CastError;
} }
Cast<Numeric>(o: Object): Numeric labels CastError {
typeswitch (o) {
case (o: Number): {
return o;
}
case (o: BigInt): {
return o;
}
case (HeapObject): {
goto CastError;
}
}
}
Cast<TheHole>(o: Object): TheHole labels CastError {
if (o == TheHole) return %RawDownCast<TheHole>(o);
goto CastError;
}
Cast<TheHole>(o: HeapObject): TheHole labels CastError {
const o: Object = o;
return Cast<TheHole>(o) otherwise CastError;
}
Cast<True>(o: Object): True labels CastError {
if (o == True) return %RawDownCast<True>(o);
goto CastError;
}
Cast<True>(o: HeapObject): True labels CastError {
const o: Object = o;
return Cast<True>(o) otherwise CastError;
}
Cast<False>(o: Object): False labels CastError {
if (o == False) return %RawDownCast<False>(o);
goto CastError;
}
Cast<False>(o: HeapObject): False labels CastError {
const o: Object = o;
return Cast<False>(o) otherwise CastError;
}
Cast<Boolean>(o: Object): Boolean labels CastError {
typeswitch (o) {
case (o: True): {
return o;
}
case (o: False): {
return o;
}
case (Object): {
goto CastError;
}
}
}
Cast<Boolean>(o: HeapObject): Boolean labels CastError {
const o: Object = o;
return Cast<Boolean>(o) otherwise CastError;
}
Cast<Undefined>(o: Object): Undefined labels CastError {
if (o == Undefined) return %RawDownCast<Undefined>(o);
goto CastError;
}
Cast<Undefined>(o: HeapObject): Undefined labels CastError {
const o: Object = o;
return Cast<Undefined>(o) otherwise CastError;
}
// TODO(tebbi): These trivial casts for union types should be generated
// automatically.
Cast<JSPrimitive>(o: Object): JSPrimitive labels CastError {
typeswitch (o) {
case (o: Numeric): {
return o;
}
case (o: String): {
return o;
}
case (o: Symbol): {
return o;
}
case (o: Boolean): {
return o;
}
case (o: Undefined): {
return o;
}
case (o: Null): {
return o;
}
case (Object): {
goto CastError;
}
}
}
Cast<JSAny>(o: Object): JSAny labels CastError {
typeswitch (o) {
case (o: JSPrimitive): {
return o;
}
case (o: JSReceiver): {
return o;
}
case (Object): {
goto CastError;
}
}
}
Cast<JSAny | TheHole>(o: Object): JSAny | TheHole labels CastError {
typeswitch (o) {
case (o: JSAny): {
return o;
}
case (o: TheHole): {
return o;
}
case (Object): {
goto CastError;
}
}
}
Cast<Number | TheHole>(o: Object): Number | TheHole labels CastError {
typeswitch (o) {
case (o: Number): {
return o;
}
case (o: TheHole): {
return o;
}
case (Object): {
goto CastError;
}
}
}
macro Cast<A: type>(o: HeapObject): A macro Cast<A: type>(o: HeapObject): A
labels CastError; labels CastError;
...@@ -2139,27 +1966,6 @@ Cast<Symbol>(o: HeapObject): Symbol ...@@ -2139,27 +1966,6 @@ Cast<Symbol>(o: HeapObject): Symbol
goto CastError; goto CastError;
} }
macro Cast<T: type>(o: Symbol): T labels CastError;
Cast<PublicSymbol>(o: Symbol): PublicSymbol labels CastError {
if (IsPrivateSymbol(o)) goto CastError;
return %RawDownCast<PublicSymbol>(o);
}
Cast<PrivateSymbol>(o: Symbol): PrivateSymbol labels CastError {
if (IsPrivateSymbol(o)) {
return %RawDownCast<PrivateSymbol>(o);
}
goto CastError;
}
Cast<PublicSymbol>(o: HeapObject): PublicSymbol labels CastError {
const o = Cast<Symbol>(o) otherwise CastError;
return Cast<PublicSymbol>(o) otherwise CastError;
}
Cast<PrivateSymbol>(o: HeapObject): PrivateSymbol labels CastError {
const o = Cast<Symbol>(o) otherwise CastError;
return Cast<PrivateSymbol>(o) otherwise CastError;
}
Cast<DirectString>(o: HeapObject): DirectString Cast<DirectString>(o: HeapObject): DirectString
labels CastError { labels CastError {
return TaggedToDirectString(o) otherwise CastError; return TaggedToDirectString(o) otherwise CastError;
...@@ -2285,7 +2091,7 @@ Cast<FastJSArrayForReadWithNoCustomIteration>(implicit context: Context)( ...@@ -2285,7 +2091,7 @@ Cast<FastJSArrayForReadWithNoCustomIteration>(implicit context: Context)(
return %RawDownCast<FastJSArrayForReadWithNoCustomIteration>(a); return %RawDownCast<FastJSArrayForReadWithNoCustomIteration>(a);
} }
Cast<JSReceiver>(o: HeapObject): JSReceiver Cast<JSReceiver>(implicit context: Context)(o: HeapObject): JSReceiver
labels CastError { labels CastError {
if (IsJSReceiver(o)) return %RawDownCast<JSReceiver>(o); if (IsJSReceiver(o)) return %RawDownCast<JSReceiver>(o);
goto CastError; goto CastError;
...@@ -2312,21 +2118,6 @@ Cast<CoverageInfo>(implicit context: Context)(o: HeapObject): CoverageInfo ...@@ -2312,21 +2118,6 @@ Cast<CoverageInfo>(implicit context: Context)(o: HeapObject): CoverageInfo
goto CastError; goto CastError;
} }
Cast<JSReceiver | Null>(o: HeapObject): JSReceiver | Null
labels CastError {
typeswitch (o) {
case (o: Null): {
return o;
}
case (o: JSReceiver): {
return o;
}
case (HeapObject): {
goto CastError;
}
}
}
extern macro AllocateHeapNumberWithValue(float64): HeapNumber; extern macro AllocateHeapNumberWithValue(float64): HeapNumber;
extern macro ChangeInt32ToTagged(int32): Number; extern macro ChangeInt32ToTagged(int32): Number;
extern macro ChangeUint32ToTagged(uint32): Number; extern macro ChangeUint32ToTagged(uint32): Number;
...@@ -2465,9 +2256,6 @@ FromConstexpr<ElementsKind, constexpr ElementsKind>(e: constexpr ElementsKind): ...@@ -2465,9 +2256,6 @@ FromConstexpr<ElementsKind, constexpr ElementsKind>(e: constexpr ElementsKind):
FromConstexpr<Object, constexpr string>(s: constexpr string): Object { FromConstexpr<Object, constexpr string>(s: constexpr string): Object {
return StringConstant(s); return StringConstant(s);
} }
FromConstexpr<JSAny, constexpr string>(s: constexpr string): JSAny {
return StringConstant(s);
}
FromConstexpr<NativeContextSlot, constexpr NativeContextSlot>( FromConstexpr<NativeContextSlot, constexpr NativeContextSlot>(
c: constexpr NativeContextSlot): NativeContextSlot { c: constexpr NativeContextSlot): NativeContextSlot {
return IntPtrConstant(c); return IntPtrConstant(c);
...@@ -2621,6 +2409,10 @@ macro UnsafeCast<A: type>(implicit context: Context)(o: Object): A { ...@@ -2621,6 +2409,10 @@ macro UnsafeCast<A: type>(implicit context: Context)(o: Object): A {
return %RawDownCast<A>(o); return %RawDownCast<A>(o);
} }
UnsafeCast<Object>(o: Object): Object {
return o;
}
const kFixedArrayMap: Map = const kFixedArrayMap: Map =
%RawDownCast<Map>(LoadRoot(kFixedArrayMapRootIndex)); %RawDownCast<Map>(LoadRoot(kFixedArrayMapRootIndex));
const kCOWMap: Map = %RawDownCast<Map>(LoadRoot(kFixedCOWArrayMapRootIndex)); const kCOWMap: Map = %RawDownCast<Map>(LoadRoot(kFixedCOWArrayMapRootIndex));
...@@ -2701,14 +2493,14 @@ operator '[]=' macro StoreFixedArrayDirect(a: FixedArray, i: Smi, v: Object) { ...@@ -2701,14 +2493,14 @@ operator '[]=' macro StoreFixedArrayDirect(a: FixedArray, i: Smi, v: Object) {
} }
extern macro GetNumberDictionaryNumberOfElements(NumberDictionary): Smi; extern macro GetNumberDictionaryNumberOfElements(NumberDictionary): Smi;
extern macro GetIteratorMethod(implicit context: Context)(HeapObject): JSAny extern macro GetIteratorMethod(implicit context: Context)(HeapObject): Object
labels IfIteratorUndefined; labels IfIteratorUndefined;
extern macro LoadConstructorOrBackPointer(Map): Object; extern macro LoadConstructorOrBackPointer(Map): Object;
extern macro BasicLoadNumberDictionaryElement(NumberDictionary, intptr): JSAny extern macro BasicLoadNumberDictionaryElement(NumberDictionary, intptr): Object
labels NotData, IfHole; labels NotData, IfHole;
extern macro BasicStoreNumberDictionaryElement(NumberDictionary, intptr, JSAny) extern macro BasicStoreNumberDictionaryElement(NumberDictionary, intptr, Object)
labels NotData, IfHole, ReadOnly; labels NotData, IfHole, ReadOnly;
extern macro IsFastElementsKind(ElementsKind): bool; extern macro IsFastElementsKind(ElementsKind): bool;
...@@ -2821,15 +2613,16 @@ macro GetRegExpLastMatchInfo(implicit context: Context)(): RegExpMatchInfo { ...@@ -2821,15 +2613,16 @@ macro GetRegExpLastMatchInfo(implicit context: Context)(): RegExpMatchInfo {
LoadNativeContext(context)[REGEXP_LAST_MATCH_INFO_INDEX]); LoadNativeContext(context)[REGEXP_LAST_MATCH_INFO_INDEX]);
} }
extern transitioning macro Call(Context, Callable, JSAny): JSAny; extern transitioning macro Call(Context, Callable, Object): Object;
extern transitioning macro Call(Context, Callable, JSAny, JSAny): JSAny; extern transitioning macro Call(Context, Callable, Object, Object): Object;
extern transitioning macro Call(Context, Callable, JSAny, JSAny, JSAny): JSAny; extern transitioning macro Call(
Context, Callable, Object, Object, Object): Object;
extern transitioning macro Call( extern transitioning macro Call(
Context, Callable, JSAny, JSAny, JSAny, JSAny): JSAny; Context, Callable, Object, Object, Object, Object): Object;
extern transitioning macro Call( extern transitioning macro Call(
Context, Callable, JSAny, JSAny, JSAny, JSAny, JSAny): JSAny; Context, Callable, Object, Object, Object, Object, Object): Object;
extern transitioning macro Call( extern transitioning macro Call(
Context, Callable, JSAny, JSAny, JSAny, JSAny, JSAny, JSAny): JSAny; Context, Callable, Object, Object, Object, Object, Object, Object): Object;
extern builtin CloneFastJSArray(Context, FastJSArrayForCopy): JSArray; extern builtin CloneFastJSArray(Context, FastJSArrayForCopy): JSArray;
extern macro ExtractFixedArray(FixedArrayBase, Smi, Smi, Smi): FixedArrayBase; extern macro ExtractFixedArray(FixedArrayBase, Smi, Smi, Smi): FixedArrayBase;
...@@ -2878,32 +2671,28 @@ macro TorqueCopyElements( ...@@ -2878,32 +2671,28 @@ macro TorqueCopyElements(
count); count);
} }
macro LoadElementNoHole<T: type>(a: JSArray, index: Smi): JSAny macro LoadElementNoHole<T: type>(a: JSArray, index: Smi): Object
labels IfHole; labels IfHole;
LoadElementNoHole<FixedArray>(implicit context: Context)( LoadElementNoHole<FixedArray>(implicit context: Context)(
a: JSArray, index: Smi): JSAny a: JSArray, index: Smi): Object
labels IfHole { labels IfHole {
try { try {
const elements: FixedArray = const elements: FixedArray =
Cast<FixedArray>(a.elements) otherwise Unexpected; Cast<FixedArray>(a.elements) otherwise Unexpected;
const e = UnsafeCast<(JSAny | TheHole)>(elements.objects[index]); const e: Object = elements.objects[index];
typeswitch (e) { if (e == TheHole) {
case (TheHole): {
goto IfHole; goto IfHole;
} }
case (e: JSAny): {
return e; return e;
} }
}
}
label Unexpected { label Unexpected {
unreachable; unreachable;
} }
} }
LoadElementNoHole<FixedDoubleArray>(implicit context: Context)( LoadElementNoHole<FixedDoubleArray>(implicit context: Context)(
a: JSArray, index: Smi): JSAny a: JSArray, index: Smi): Object
labels IfHole { labels IfHole {
try { try {
const elements: FixedDoubleArray = const elements: FixedDoubleArray =
...@@ -2934,7 +2723,7 @@ struct FastJSArrayWitness { ...@@ -2934,7 +2723,7 @@ struct FastJSArrayWitness {
this.unstable = %RawDownCast<FastJSArray>(this.stable); this.unstable = %RawDownCast<FastJSArray>(this.stable);
} }
LoadElementNoHole(implicit context: Context)(k: Smi): JSAny LoadElementNoHole(implicit context: Context)(k: Smi): Object
labels FoundHole { labels FoundHole {
if (this.hasDoubles) { if (this.hasDoubles) {
return LoadElementNoHole<FixedDoubleArray>(this.unstable, k) return LoadElementNoHole<FixedDoubleArray>(this.unstable, k)
...@@ -2957,7 +2746,7 @@ struct FastJSArrayWitness { ...@@ -2957,7 +2746,7 @@ struct FastJSArrayWitness {
} }
} }
LoadElementOrUndefined(implicit context: Context)(k: Smi): JSAny { LoadElementOrUndefined(implicit context: Context)(k: Smi): Object {
try { try {
return this.LoadElementNoHole(k) otherwise FoundHole; return this.LoadElementNoHole(k) otherwise FoundHole;
} }
...@@ -2977,7 +2766,7 @@ struct FastJSArrayWitness { ...@@ -2977,7 +2766,7 @@ struct FastJSArrayWitness {
this.unstable.length = newLength; this.unstable.length = newLength;
} }
Push(value: JSAny) labels Failed { Push(value: Object) labels Failed {
assert(this.arrayIsPushable); assert(this.arrayIsPushable);
if (this.hasDoubles) { if (this.hasDoubles) {
BuildAppendJSArray(HOLEY_DOUBLE_ELEMENTS, this.unstable, value) BuildAppendJSArray(HOLEY_DOUBLE_ELEMENTS, this.unstable, value)
...@@ -3049,7 +2838,7 @@ struct FastJSArrayForReadWitness { ...@@ -3049,7 +2838,7 @@ struct FastJSArrayForReadWitness {
this.unstable = %RawDownCast<FastJSArrayForRead>(this.stable); this.unstable = %RawDownCast<FastJSArrayForRead>(this.stable);
} }
LoadElementNoHole(implicit context: Context)(k: Smi): JSAny LoadElementNoHole(implicit context: Context)(k: Smi): Object
labels FoundHole { labels FoundHole {
if (this.hasDoubles) { if (this.hasDoubles) {
return LoadElementNoHole<FixedDoubleArray>(this.unstable, k) return LoadElementNoHole<FixedDoubleArray>(this.unstable, k)
...@@ -3109,7 +2898,7 @@ extern macro IsJSArrayMap(Map): bool; ...@@ -3109,7 +2898,7 @@ extern macro IsJSArrayMap(Map): bool;
extern macro IsExtensibleMap(Map): bool; extern macro IsExtensibleMap(Map): bool;
extern macro IsJSPrimitiveWrapper(HeapObject): bool; extern macro IsJSPrimitiveWrapper(HeapObject): bool;
extern macro IsCustomElementsReceiverInstanceType(int32): bool; extern macro IsCustomElementsReceiverInstanceType(int32): bool;
extern macro Typeof(JSAny): String; extern macro Typeof(Object): Object;
// Return true iff number is NaN. // Return true iff number is NaN.
macro NumberIsNaN(number: Number): bool { macro NumberIsNaN(number: Number): bool {
...@@ -3130,30 +2919,30 @@ macro IsForceSlowPath(): bool { ...@@ -3130,30 +2919,30 @@ macro IsForceSlowPath(): bool {
return false; return false;
} }
extern macro BranchIfToBooleanIsTrue(JSAny): never extern macro BranchIfToBooleanIsTrue(Object): never
labels Taken, NotTaken; labels Taken, NotTaken;
extern macro BranchIfToBooleanIsFalse(JSAny): never extern macro BranchIfToBooleanIsFalse(Object): never
labels Taken, NotTaken; labels Taken, NotTaken;
macro ToBoolean(obj: JSAny): bool { macro ToBoolean(obj: Object): bool {
BranchIfToBooleanIsTrue(obj) otherwise return true, return false; BranchIfToBooleanIsTrue(obj) otherwise return true, return false;
} }
@export @export
macro RequireObjectCoercible(implicit context: Context)( macro RequireObjectCoercible(implicit context: Context)(
value: JSAny, name: constexpr string): JSAny { value: Object, name: constexpr string): Object {
if (IsNullOrUndefined(value)) { if (IsNullOrUndefined(value)) {
ThrowTypeError(kCalledOnNullOrUndefined, name); ThrowTypeError(kCalledOnNullOrUndefined, name);
} }
return value; return value;
} }
extern macro BranchIfSameValue(JSAny, JSAny): never labels Taken, NotTaken; extern macro BranchIfSameValue(Object, Object): never labels Taken, NotTaken;
macro SameValue(a: JSAny, b: JSAny): bool { macro SameValue(a: Object, b: Object): bool {
BranchIfSameValue(a, b) otherwise return true, return false; BranchIfSameValue(a, b) otherwise return true, return false;
} }
transitioning macro ToIndex(input: JSAny, context: Context): Number transitioning macro ToIndex(input: Object, context: Context): Number
labels RangeError { labels RangeError {
if (input == Undefined) { if (input == Undefined) {
return 0; return 0;
...@@ -3167,7 +2956,7 @@ transitioning macro ToIndex(input: JSAny, context: Context): Number ...@@ -3167,7 +2956,7 @@ transitioning macro ToIndex(input: JSAny, context: Context): Number
return value; return value;
} }
transitioning macro GetLengthProperty(implicit context: Context)(o: JSAny): transitioning macro GetLengthProperty(implicit context: Context)(o: Object):
Number { Number {
try { try {
typeswitch (o) { typeswitch (o) {
...@@ -3177,18 +2966,18 @@ transitioning macro GetLengthProperty(implicit context: Context)(o: JSAny): ...@@ -3177,18 +2966,18 @@ transitioning macro GetLengthProperty(implicit context: Context)(o: JSAny):
case (a: JSArgumentsObjectWithLength): { case (a: JSArgumentsObjectWithLength): {
goto ToLength(a.length); goto ToLength(a.length);
} }
case (JSAny): deferred { case (Object): deferred {
goto ToLength(GetProperty(o, kLengthString)); goto ToLength(GetProperty(o, kLengthString));
} }
} }
} }
label ToLength(length: JSAny) deferred { label ToLength(length: Object) deferred {
return ToLength_Inline(context, length); return ToLength_Inline(context, length);
} }
} }
transitioning macro GetMethod(implicit context: Context)( transitioning macro GetMethod(implicit context: Context)(
o: JSAny, name: constexpr string): Callable labels IfNullOrUndefined { o: Object, name: constexpr string): Callable labels IfNullOrUndefined {
const value = GetProperty(o, name); const value = GetProperty(o, name);
if (value == Undefined || value == Null) goto IfNullOrUndefined; if (value == Undefined || value == Null) goto IfNullOrUndefined;
return Cast<Callable>(value) return Cast<Callable>(value)
...@@ -3202,14 +2991,14 @@ extern macro AllocateSeqOneByteString(implicit context: Context)(uint32): ...@@ -3202,14 +2991,14 @@ extern macro AllocateSeqOneByteString(implicit context: Context)(uint32):
extern macro AllocateSeqTwoByteString(implicit context: Context)(uint32): extern macro AllocateSeqTwoByteString(implicit context: Context)(uint32):
String; String;
extern macro ConvertToRelativeIndex(implicit context: Context)( extern macro ConvertToRelativeIndex(implicit context: Context)(
JSAny, intptr): intptr; Object, intptr): intptr;
extern builtin ObjectToString(Context, JSAny): JSAny; extern builtin ObjectToString(Context, Object): Object;
extern builtin StringRepeat(Context, String, Number): String; extern builtin StringRepeat(Context, String, Number): String;
struct KeyValuePair { struct KeyValuePair {
key: JSAny; key: Object;
value: JSAny; value: Object;
} }
// Macro definitions for compatibility that expose functionality to the CSA // Macro definitions for compatibility that expose functionality to the CSA
...@@ -3257,7 +3046,7 @@ macro IsFastJSArrayForReadWithNoCustomIteration(context: Context, o: Object): ...@@ -3257,7 +3046,7 @@ macro IsFastJSArrayForReadWithNoCustomIteration(context: Context, o: Object):
} }
extern transitioning runtime extern transitioning runtime
CreateDataProperty(implicit context: Context)(JSReceiver, JSAny, JSAny); CreateDataProperty(implicit context: Context)(JSReceiver, Object, Object);
namespace runtime { namespace runtime {
extern runtime extern runtime
...@@ -3265,7 +3054,7 @@ namespace runtime { ...@@ -3265,7 +3054,7 @@ namespace runtime {
} }
transitioning builtin FastCreateDataProperty(implicit context: Context)( transitioning builtin FastCreateDataProperty(implicit context: Context)(
receiver: JSReceiver, key: JSAny, value: JSAny): Object { receiver: JSReceiver, key: Object, value: Object): Object {
try { try {
const array = Cast<FastJSArray>(receiver) otherwise Slow; const array = Cast<FastJSArray>(receiver) otherwise Slow;
const index: Smi = Cast<Smi>(key) otherwise goto Slow; const index: Smi = Cast<Smi>(key) otherwise goto Slow;
...@@ -3310,8 +3099,8 @@ transitioning builtin FastCreateDataProperty(implicit context: Context)( ...@@ -3310,8 +3099,8 @@ transitioning builtin FastCreateDataProperty(implicit context: Context)(
} }
@export @export
transitioning macro ToStringImpl(context: Context, o: JSAny): String { transitioning macro ToStringImpl(context: Context, o: Object): String {
let result: JSAny = o; let result: Object = o;
while (true) { while (true) {
typeswitch (result) { typeswitch (result) {
case (num: Number): { case (num: Number): {
...@@ -3330,7 +3119,7 @@ transitioning macro ToStringImpl(context: Context, o: JSAny): String { ...@@ -3330,7 +3119,7 @@ transitioning macro ToStringImpl(context: Context, o: JSAny): String {
case (Symbol): { case (Symbol): {
ThrowTypeError(kSymbolToString); ThrowTypeError(kSymbolToString);
} }
case (JSAny): { case (Object): {
return ToStringRT(context, o); return ToStringRT(context, o);
} }
} }
...@@ -3380,14 +3169,3 @@ builtin CheckNumberInRange(implicit context: Context)( ...@@ -3380,14 +3169,3 @@ builtin CheckNumberInRange(implicit context: Context)(
unreachable; unreachable;
} }
} }
macro ReplaceTheHoleWithUndefined(o: JSAny | TheHole): JSAny {
typeswitch (o) {
case (TheHole): {
return Undefined;
}
case (a: JSAny): {
return a;
}
}
}
src/builtins/boolean.tq
View file @ 4418a7b9
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
namespace boolean { namespace boolean {
javascript builtin javascript builtin
BooleanConstructor( BooleanConstructor(
js-implicit context: Context, receiver: JSAny, newTarget: JSAny, js-implicit context: Context, receiver: Object, newTarget: Object,
target: JSFunction)(...arguments): JSAny { target: JSFunction)(...arguments): Object {
const value = SelectBooleanConstant(ToBoolean(arguments[0])); const value = SelectBooleanConstant(ToBoolean(arguments[0]));
if (newTarget == Undefined) { if (newTarget == Undefined) {
......
src/builtins/collections.tq
View file @ 4418a7b9
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
namespace collections { namespace collections {
@export @export
macro LoadKeyValuePairNoSideEffects(implicit context: Context)(o: JSAny): macro LoadKeyValuePairNoSideEffects(implicit context: Context)(o: Object):
KeyValuePair labels MayHaveSideEffects { KeyValuePair labels MayHaveSideEffects {
typeswitch (o) { typeswitch (o) {
case (a: FastJSArray): { case (a: FastJSArray): {
...@@ -28,7 +28,7 @@ namespace collections { ...@@ -28,7 +28,7 @@ namespace collections {
Undefined Undefined
}; };
} }
case (FixedArrayBase): deferred { case (Object): deferred {
unreachable; unreachable;
} }
} }
...@@ -36,14 +36,14 @@ namespace collections { ...@@ -36,14 +36,14 @@ namespace collections {
case (JSReceiver): { case (JSReceiver): {
goto MayHaveSideEffects; goto MayHaveSideEffects;
} }
case (o: JSAny): deferred { case (o: Object): deferred {
ThrowTypeError(kIteratorValueNotAnObject, o); ThrowTypeError(kIteratorValueNotAnObject, o);
} }
} }
} }
@export @export
transitioning macro LoadKeyValuePair(implicit context: Context)(o: JSAny): transitioning macro LoadKeyValuePair(implicit context: Context)(o: Object):
KeyValuePair { KeyValuePair {
try { try {
return LoadKeyValuePairNoSideEffects(o) otherwise Generic; return LoadKeyValuePairNoSideEffects(o) otherwise Generic;
......
src/builtins/data-view.tq
View file @ 4418a7b9
...@@ -62,7 +62,7 @@ namespace data_view { ...@@ -62,7 +62,7 @@ namespace data_view {
return IsDetachedBuffer(view.buffer); return IsDetachedBuffer(view.buffer);
} }
macro ValidateDataView(context: Context, o: JSAny, method: String): macro ValidateDataView(context: Context, o: Object, method: String):
JSDataView { JSDataView {
try { try {
return Cast<JSDataView>(o) otherwise CastError; return Cast<JSDataView>(o) otherwise CastError;
...@@ -75,7 +75,7 @@ namespace data_view { ...@@ -75,7 +75,7 @@ namespace data_view {
// ES6 section 24.2.4.1 get DataView.prototype.buffer // ES6 section 24.2.4.1 get DataView.prototype.buffer
javascript builtin DataViewPrototypeGetBuffer( javascript builtin DataViewPrototypeGetBuffer(
js-implicit context: Context, js-implicit context: Context,
receiver: JSAny)(...arguments): JSArrayBuffer { receiver: Object)(...arguments): JSArrayBuffer {
const dataView: JSDataView = const dataView: JSDataView =
ValidateDataView(context, receiver, 'get DataView.prototype.buffer'); ValidateDataView(context, receiver, 'get DataView.prototype.buffer');
return dataView.buffer; return dataView.buffer;
...@@ -83,7 +83,7 @@ namespace data_view { ...@@ -83,7 +83,7 @@ namespace data_view {
// ES6 section 24.2.4.2 get DataView.prototype.byteLength // ES6 section 24.2.4.2 get DataView.prototype.byteLength
javascript builtin DataViewPrototypeGetByteLength( javascript builtin DataViewPrototypeGetByteLength(
js-implicit context: Context, receiver: JSAny)(...arguments): Number { js-implicit context: Context, receiver: Object)(...arguments): Number {
const dataView: JSDataView = ValidateDataView( const dataView: JSDataView = ValidateDataView(
context, receiver, 'get DataView.prototype.byte_length'); context, receiver, 'get DataView.prototype.byte_length');
if (WasDetached(dataView)) { if (WasDetached(dataView)) {
...@@ -96,7 +96,7 @@ namespace data_view { ...@@ -96,7 +96,7 @@ namespace data_view {
// ES6 section 24.2.4.3 get DataView.prototype.byteOffset // ES6 section 24.2.4.3 get DataView.prototype.byteOffset
javascript builtin DataViewPrototypeGetByteOffset( javascript builtin DataViewPrototypeGetByteOffset(
js-implicit context: Context, receiver: JSAny)(...arguments): Number { js-implicit context: Context, receiver: Object)(...arguments): Number {
const dataView: JSDataView = ValidateDataView( const dataView: JSDataView = ValidateDataView(
context, receiver, 'get DataView.prototype.byte_offset'); context, receiver, 'get DataView.prototype.byte_offset');
if (WasDetached(dataView)) { if (WasDetached(dataView)) {
...@@ -351,14 +351,14 @@ namespace data_view { ...@@ -351,14 +351,14 @@ namespace data_view {
return MakeBigInt(lowWord, highWord, signed); return MakeBigInt(lowWord, highWord, signed);
} }
extern macro ToSmiIndex(JSAny, Context): Smi extern macro ToSmiIndex(Object, Context): Smi
labels RangeError; labels RangeError;
extern macro DataViewBuiltinsAssembler::DataViewElementSize( extern macro DataViewBuiltinsAssembler::DataViewElementSize(
constexpr ElementsKind): constexpr int31; constexpr ElementsKind): constexpr int31;
transitioning macro DataViewGet( transitioning macro DataViewGet(
context: Context, receiver: JSAny, offset: JSAny, context: Context, receiver: Object, offset: Object,
requestedLittleEndian: JSAny, kind: constexpr ElementsKind): Numeric { requestedLittleEndian: Object, kind: constexpr ElementsKind): Numeric {
const dataView: JSDataView = const dataView: JSDataView =
ValidateDataView(context, receiver, MakeDataViewGetterNameString(kind)); ValidateDataView(context, receiver, MakeDataViewGetterNameString(kind));
...@@ -416,91 +416,91 @@ namespace data_view { ...@@ -416,91 +416,91 @@ namespace data_view {
} }
transitioning javascript builtin DataViewPrototypeGetUint8( transitioning javascript builtin DataViewPrototypeGetUint8(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
return DataViewGet(context, receiver, offset, Undefined, UINT8_ELEMENTS); return DataViewGet(context, receiver, offset, Undefined, UINT8_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetInt8( transitioning javascript builtin DataViewPrototypeGetInt8(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
return DataViewGet(context, receiver, offset, Undefined, INT8_ELEMENTS); return DataViewGet(context, receiver, offset, Undefined, INT8_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetUint16( transitioning javascript builtin DataViewPrototypeGetUint16(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 1 ? arguments[1] : Undefined; arguments.length > 1 ? arguments[1] : Undefined;
return DataViewGet( return DataViewGet(
context, receiver, offset, isLittleEndian, UINT16_ELEMENTS); context, receiver, offset, isLittleEndian, UINT16_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetInt16( transitioning javascript builtin DataViewPrototypeGetInt16(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 1 ? arguments[1] : Undefined; arguments.length > 1 ? arguments[1] : Undefined;
return DataViewGet( return DataViewGet(
context, receiver, offset, isLittleEndian, INT16_ELEMENTS); context, receiver, offset, isLittleEndian, INT16_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetUint32( transitioning javascript builtin DataViewPrototypeGetUint32(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 1 ? arguments[1] : Undefined; arguments.length > 1 ? arguments[1] : Undefined;
return DataViewGet( return DataViewGet(
context, receiver, offset, isLittleEndian, UINT32_ELEMENTS); context, receiver, offset, isLittleEndian, UINT32_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetInt32( transitioning javascript builtin DataViewPrototypeGetInt32(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 1 ? arguments[1] : Undefined; arguments.length > 1 ? arguments[1] : Undefined;
return DataViewGet( return DataViewGet(
context, receiver, offset, isLittleEndian, INT32_ELEMENTS); context, receiver, offset, isLittleEndian, INT32_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetFloat32( transitioning javascript builtin DataViewPrototypeGetFloat32(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 1 ? arguments[1] : Undefined; arguments.length > 1 ? arguments[1] : Undefined;
return DataViewGet( return DataViewGet(
context, receiver, offset, isLittleEndian, FLOAT32_ELEMENTS); context, receiver, offset, isLittleEndian, FLOAT32_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetFloat64( transitioning javascript builtin DataViewPrototypeGetFloat64(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 1 ? arguments[1] : Undefined; arguments.length > 1 ? arguments[1] : Undefined;
return DataViewGet( return DataViewGet(
context, receiver, offset, isLittleEndian, FLOAT64_ELEMENTS); context, receiver, offset, isLittleEndian, FLOAT64_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetBigUint64( transitioning javascript builtin DataViewPrototypeGetBigUint64(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 1 ? arguments[1] : Undefined; arguments.length > 1 ? arguments[1] : Undefined;
return DataViewGet( return DataViewGet(
context, receiver, offset, isLittleEndian, BIGUINT64_ELEMENTS); context, receiver, offset, isLittleEndian, BIGUINT64_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeGetBigInt64( transitioning javascript builtin DataViewPrototypeGetBigInt64(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 1 ? arguments[1] : Undefined; arguments.length > 1 ? arguments[1] : Undefined;
return DataViewGet( return DataViewGet(
context, receiver, offset, isLittleEndian, BIGINT64_ELEMENTS); context, receiver, offset, isLittleEndian, BIGINT64_ELEMENTS);
} }
extern macro ToNumber(Context, JSAny): Number; extern macro ToNumber(Context, Object): Number;
extern macro ToBigInt(Context, JSAny): BigInt; extern macro ToBigInt(Context, Object): BigInt;
extern macro TruncateFloat64ToWord32(float64): uint32; extern macro TruncateFloat64ToWord32(float64): uint32;
extern macro DataViewBuiltinsAssembler::StoreWord8(RawPtr, uintptr, uint32): extern macro DataViewBuiltinsAssembler::StoreWord8(RawPtr, uintptr, uint32):
...@@ -632,8 +632,8 @@ namespace data_view { ...@@ -632,8 +632,8 @@ namespace data_view {
} }
transitioning macro DataViewSet( transitioning macro DataViewSet(
context: Context, receiver: JSAny, offset: JSAny, value: JSAny, context: Context, receiver: Object, offset: Object, value: Object,
requestedLittleEndian: JSAny, kind: constexpr ElementsKind): JSAny { requestedLittleEndian: Object, kind: constexpr ElementsKind): Object {
const dataView: JSDataView = const dataView: JSDataView =
ValidateDataView(context, receiver, MakeDataViewSetterNameString(kind)); ValidateDataView(context, receiver, MakeDataViewSetterNameString(kind));
...@@ -718,96 +718,96 @@ namespace data_view { ...@@ -718,96 +718,96 @@ namespace data_view {
} }
transitioning javascript builtin DataViewPrototypeSetUint8( transitioning javascript builtin DataViewPrototypeSetUint8(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, Undefined, UINT8_ELEMENTS); context, receiver, offset, value, Undefined, UINT8_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetInt8( transitioning javascript builtin DataViewPrototypeSetInt8(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, Undefined, INT8_ELEMENTS); context, receiver, offset, value, Undefined, INT8_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetUint16( transitioning javascript builtin DataViewPrototypeSetUint16(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 2 ? arguments[2] : Undefined; arguments.length > 2 ? arguments[2] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, isLittleEndian, UINT16_ELEMENTS); context, receiver, offset, value, isLittleEndian, UINT16_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetInt16( transitioning javascript builtin DataViewPrototypeSetInt16(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 2 ? arguments[2] : Undefined; arguments.length > 2 ? arguments[2] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, isLittleEndian, INT16_ELEMENTS); context, receiver, offset, value, isLittleEndian, INT16_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetUint32( transitioning javascript builtin DataViewPrototypeSetUint32(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 2 ? arguments[2] : Undefined; arguments.length > 2 ? arguments[2] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, isLittleEndian, UINT32_ELEMENTS); context, receiver, offset, value, isLittleEndian, UINT32_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetInt32( transitioning javascript builtin DataViewPrototypeSetInt32(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 2 ? arguments[2] : Undefined; arguments.length > 2 ? arguments[2] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, isLittleEndian, INT32_ELEMENTS); context, receiver, offset, value, isLittleEndian, INT32_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetFloat32( transitioning javascript builtin DataViewPrototypeSetFloat32(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 2 ? arguments[2] : Undefined; arguments.length > 2 ? arguments[2] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, isLittleEndian, FLOAT32_ELEMENTS); context, receiver, offset, value, isLittleEndian, FLOAT32_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetFloat64( transitioning javascript builtin DataViewPrototypeSetFloat64(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 2 ? arguments[2] : Undefined; arguments.length > 2 ? arguments[2] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, isLittleEndian, FLOAT64_ELEMENTS); context, receiver, offset, value, isLittleEndian, FLOAT64_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetBigUint64( transitioning javascript builtin DataViewPrototypeSetBigUint64(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 2 ? arguments[2] : Undefined; arguments.length > 2 ? arguments[2] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, isLittleEndian, BIGUINT64_ELEMENTS); context, receiver, offset, value, isLittleEndian, BIGUINT64_ELEMENTS);
} }
transitioning javascript builtin DataViewPrototypeSetBigInt64( transitioning javascript builtin DataViewPrototypeSetBigInt64(
js-implicit context: Context, receiver: JSAny)(...arguments): JSAny { js-implicit context: Context, receiver: Object)(...arguments): Object {
const offset: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const offset: Object = arguments.length > 0 ? arguments[0] : Undefined;
const value: JSAny = arguments.length > 1 ? arguments[1] : Undefined; const value: Object = arguments.length > 1 ? arguments[1] : Undefined;
const isLittleEndian: JSAny = const isLittleEndian: Object =
arguments.length > 2 ? arguments[2] : Undefined; arguments.length > 2 ? arguments[2] : Undefined;
return DataViewSet( return DataViewSet(
context, receiver, offset, value, isLittleEndian, BIGINT64_ELEMENTS); context, receiver, offset, value, isLittleEndian, BIGINT64_ELEMENTS);
......
src/builtins/extras-utils.tq
View file @ 4418a7b9
...@@ -3,22 +3,23 @@ ...@@ -3,22 +3,23 @@
// found in the LICENSE file. // found in the LICENSE file.
namespace extras_utils { namespace extras_utils {
extern runtime CreatePrivateSymbol(Context, JSAny): HeapObject; extern runtime CreatePrivateSymbol(Context, Object): HeapObject;
extern runtime PromiseMarkAsHandled(Context, JSAny): Undefined; extern runtime PromiseMarkAsHandled(Context, Object): Undefined;
extern runtime PromiseStatus(Context, JSAny): Smi; extern runtime PromiseStatus(Context, Object): Smi;
javascript builtin ExtrasUtilsCreatePrivateSymbol( javascript builtin ExtrasUtilsCreatePrivateSymbol(
js-implicit context: Context, receiver: JSAny)(...arguments): HeapObject { js-implicit context: Context,
receiver: Object)(...arguments): HeapObject {
return CreatePrivateSymbol(context, arguments[0]); return CreatePrivateSymbol(context, arguments[0]);
} }
javascript builtin ExtrasUtilsMarkPromiseAsHandled( javascript builtin ExtrasUtilsMarkPromiseAsHandled(
js-implicit context: Context, receiver: JSAny)(...arguments): Undefined { js-implicit context: Context, receiver: Object)(...arguments): Undefined {
return PromiseMarkAsHandled(context, arguments[0]); return PromiseMarkAsHandled(context, arguments[0]);
} }
javascript builtin ExtrasUtilsPromiseState( javascript builtin ExtrasUtilsPromiseState(
js-implicit context: Context, receiver: JSAny)(...arguments): Smi { js-implicit context: Context, receiver: Object)(...arguments): Smi {
return PromiseStatus(context, arguments[0]); return PromiseStatus(context, arguments[0]);
} }
} }
src/builtins/internal-coverage.tq
View file @ 4418a7b9
...@@ -51,7 +51,7 @@ namespace internal_coverage { ...@@ -51,7 +51,7 @@ namespace internal_coverage {
} }
builtin IncBlockCounter(implicit context: Context)( builtin IncBlockCounter(implicit context: Context)(
function: JSFunction, coverageArraySlotIndex: Smi): Undefined { function: JSFunction, coverageArraySlotIndex: Smi): Object {
// It's quite possible that a function contains IncBlockCounter bytecodes, // It's quite possible that a function contains IncBlockCounter bytecodes,
// but no coverage info exists. This happens e.g. by selecting the // but no coverage info exists. This happens e.g. by selecting the
// best-effort coverage collection mode, which triggers deletion of all // best-effort coverage collection mode, which triggers deletion of all
......
src/builtins/iterator.tq
View file @ 4418a7b9
...@@ -11,13 +11,13 @@ namespace iterator { ...@@ -11,13 +11,13 @@ namespace iterator {
object: JSReceiver; object: JSReceiver;
// iteratorRecord.[[NextMethod]] // iteratorRecord.[[NextMethod]]
next: JSAny; next: Object;
} }
extern macro IteratorBuiltinsAssembler::GetIteratorMethod( extern macro IteratorBuiltinsAssembler::GetIteratorMethod(
implicit context: Context)(JSAny): JSAny; implicit context: Context)(Object): Object;
extern macro IteratorBuiltinsAssembler::GetIterator( extern macro IteratorBuiltinsAssembler::GetIterator(
implicit context: Context)(JSAny): IteratorRecord; implicit context: Context)(Object): IteratorRecord;
extern macro IteratorBuiltinsAssembler::IteratorStep( extern macro IteratorBuiltinsAssembler::IteratorStep(
implicit context: Context)(IteratorRecord): JSReceiver implicit context: Context)(IteratorRecord): JSReceiver
...@@ -27,18 +27,18 @@ namespace iterator { ...@@ -27,18 +27,18 @@ namespace iterator {
labels Done; labels Done;
extern macro IteratorBuiltinsAssembler::IteratorValue( extern macro IteratorBuiltinsAssembler::IteratorValue(
implicit context: Context)(JSReceiver): JSAny; implicit context: Context)(JSReceiver): Object;
extern macro IteratorBuiltinsAssembler::IteratorValue( extern macro IteratorBuiltinsAssembler::IteratorValue(
implicit context: Context)(JSReceiver, Map): JSAny; implicit context: Context)(JSReceiver, Map): Object;
extern macro IteratorBuiltinsAssembler::IteratorCloseOnException( extern macro IteratorBuiltinsAssembler::IteratorCloseOnException(
implicit context: Context)(IteratorRecord, JSAny): never; implicit context: Context)(IteratorRecord, Object): never;
extern macro IteratorBuiltinsAssembler::IterableToList( extern macro IteratorBuiltinsAssembler::IterableToList(
implicit context: Context)(JSAny, JSAny): JSArray; implicit context: Context)(Object, Object): JSArray;
extern builtin IterableToListMayPreserveHoles(implicit context: extern builtin IterableToListMayPreserveHoles(implicit context:
Context)(JSAny, JSAny); Context)(Object, Object);
extern builtin IterableToListWithSymbolLookup(implicit context: extern builtin IterableToListWithSymbolLookup(implicit context:
Context)(JSAny); Context)(Object);
} }
src/builtins/math.tq
View file @ 4418a7b9
...@@ -7,7 +7,7 @@ namespace math { ...@@ -7,7 +7,7 @@ namespace math {
extern macro Float64Acos(float64): float64; extern macro Float64Acos(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathAcos(context: Context, _receiver: JSAny, x: JSAny): Number { MathAcos(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Acos(value)); return Convert<Number>(Float64Acos(value));
} }
...@@ -16,7 +16,7 @@ namespace math { ...@@ -16,7 +16,7 @@ namespace math {
extern macro Float64Acosh(float64): float64; extern macro Float64Acosh(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathAcosh(context: Context, _receiver: JSAny, x: JSAny): Number { MathAcosh(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Acosh(value)); return Convert<Number>(Float64Acosh(value));
} }
...@@ -25,7 +25,7 @@ namespace math { ...@@ -25,7 +25,7 @@ namespace math {
extern macro Float64Asin(float64): float64; extern macro Float64Asin(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathAsin(context: Context, _receiver: JSAny, x: JSAny): Number { MathAsin(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Asin(value)); return Convert<Number>(Float64Asin(value));
} }
...@@ -34,7 +34,7 @@ namespace math { ...@@ -34,7 +34,7 @@ namespace math {
extern macro Float64Asinh(float64): float64; extern macro Float64Asinh(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathAsinh(context: Context, _receiver: JSAny, x: JSAny): Number { MathAsinh(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Asinh(value)); return Convert<Number>(Float64Asinh(value));
} }
...@@ -43,7 +43,7 @@ namespace math { ...@@ -43,7 +43,7 @@ namespace math {
extern macro Float64Atan(float64): float64; extern macro Float64Atan(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathAtan(context: Context, _receiver: JSAny, x: JSAny): Number { MathAtan(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Atan(value)); return Convert<Number>(Float64Atan(value));
} }
...@@ -52,7 +52,7 @@ namespace math { ...@@ -52,7 +52,7 @@ namespace math {
extern macro Float64Atan2(float64, float64): float64; extern macro Float64Atan2(float64, float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathAtan2(context: Context, _receiver: JSAny, y: JSAny, x: JSAny): Number { MathAtan2(context: Context, _receiver: Object, y: Object, x: Object): Number {
const yValue = Convert<float64>(ToNumber_Inline(context, y)); const yValue = Convert<float64>(ToNumber_Inline(context, y));
const xValue = Convert<float64>(ToNumber_Inline(context, x)); const xValue = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Atan2(yValue, xValue)); return Convert<Number>(Float64Atan2(yValue, xValue));
...@@ -62,7 +62,7 @@ namespace math { ...@@ -62,7 +62,7 @@ namespace math {
extern macro Float64Atanh(float64): float64; extern macro Float64Atanh(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathAtanh(context: Context, _receiver: JSAny, x: JSAny): Number { MathAtanh(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Atanh(value)); return Convert<Number>(Float64Atanh(value));
} }
...@@ -71,7 +71,7 @@ namespace math { ...@@ -71,7 +71,7 @@ namespace math {
extern macro Float64Cbrt(float64): float64; extern macro Float64Cbrt(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathCbrt(context: Context, _receiver: JSAny, x: JSAny): Number { MathCbrt(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Cbrt(value)); return Convert<Number>(Float64Cbrt(value));
} }
...@@ -80,7 +80,7 @@ namespace math { ...@@ -80,7 +80,7 @@ namespace math {
extern macro Word32Clz(int32): int32; extern macro Word32Clz(int32): int32;
transitioning javascript builtin transitioning javascript builtin
MathClz32(context: Context, _receiver: JSAny, x: JSAny): Number { MathClz32(context: Context, _receiver: Object, x: Object): Number {
const num = ToNumber_Inline(context, x); const num = ToNumber_Inline(context, x);
let value: int32; let value: int32;
...@@ -100,7 +100,7 @@ namespace math { ...@@ -100,7 +100,7 @@ namespace math {
extern macro Float64Cos(float64): float64; extern macro Float64Cos(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathCos(context: Context, _receiver: JSAny, x: JSAny): Number { MathCos(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Cos(value)); return Convert<Number>(Float64Cos(value));
} }
...@@ -109,7 +109,7 @@ namespace math { ...@@ -109,7 +109,7 @@ namespace math {
extern macro Float64Cosh(float64): float64; extern macro Float64Cosh(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathCosh(context: Context, _receiver: JSAny, x: JSAny): Number { MathCosh(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Cosh(value)); return Convert<Number>(Float64Cosh(value));
} }
...@@ -118,7 +118,7 @@ namespace math { ...@@ -118,7 +118,7 @@ namespace math {
extern macro Float64Exp(float64): float64; extern macro Float64Exp(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathExp(context: Context, _receiver: JSAny, x: JSAny): Number { MathExp(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Exp(value)); return Convert<Number>(Float64Exp(value));
} }
...@@ -127,14 +127,14 @@ namespace math { ...@@ -127,14 +127,14 @@ namespace math {
extern macro Float64Expm1(float64): float64; extern macro Float64Expm1(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathExpm1(context: Context, _receiver: JSAny, x: JSAny): Number { MathExpm1(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Expm1(value)); return Convert<Number>(Float64Expm1(value));
} }
// ES6 #sec-math.fround // ES6 #sec-math.fround
transitioning javascript builtin transitioning javascript builtin
MathFround(context: Context, _receiver: JSAny, x: JSAny): Number { MathFround(context: Context, _receiver: Object, x: Object): Number {
const x32 = Convert<float32>(ToNumber_Inline(context, x)); const x32 = Convert<float32>(ToNumber_Inline(context, x));
const x64 = Convert<float64>(x32); const x64 = Convert<float64>(x32);
return Convert<Number>(x64); return Convert<Number>(x64);
...@@ -144,7 +144,7 @@ namespace math { ...@@ -144,7 +144,7 @@ namespace math {
extern macro Float64Log(float64): float64; extern macro Float64Log(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathLog(context: Context, _receiver: JSAny, x: JSAny): Number { MathLog(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Log(value)); return Convert<Number>(Float64Log(value));
} }
...@@ -153,7 +153,7 @@ namespace math { ...@@ -153,7 +153,7 @@ namespace math {
extern macro Float64Log1p(float64): float64; extern macro Float64Log1p(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathLog1p(context: Context, _receiver: JSAny, x: JSAny): Number { MathLog1p(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Log1p(value)); return Convert<Number>(Float64Log1p(value));
} }
...@@ -162,7 +162,7 @@ namespace math { ...@@ -162,7 +162,7 @@ namespace math {
extern macro Float64Log10(float64): float64; extern macro Float64Log10(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathLog10(context: Context, _receiver: JSAny, x: JSAny): Number { MathLog10(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Log10(value)); return Convert<Number>(Float64Log10(value));
} }
...@@ -171,7 +171,7 @@ namespace math { ...@@ -171,7 +171,7 @@ namespace math {
extern macro Float64Log2(float64): float64; extern macro Float64Log2(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathLog2(context: Context, _receiver: JSAny, x: JSAny): Number { MathLog2(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Log2(value)); return Convert<Number>(Float64Log2(value));
} }
...@@ -180,14 +180,14 @@ namespace math { ...@@ -180,14 +180,14 @@ namespace math {
extern macro Float64Sin(float64): float64; extern macro Float64Sin(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathSin(context: Context, _receiver: JSAny, x: JSAny): Number { MathSin(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Sin(value)); return Convert<Number>(Float64Sin(value));
} }
// ES6 #sec-math.sign // ES6 #sec-math.sign
transitioning javascript builtin transitioning javascript builtin
MathSign(context: Context, _receiver: JSAny, x: JSAny): Number { MathSign(context: Context, _receiver: Object, x: Object): Number {
const num = ToNumber_Inline(context, x); const num = ToNumber_Inline(context, x);
const value = Convert<float64>(num); const value = Convert<float64>(num);
...@@ -204,7 +204,7 @@ namespace math { ...@@ -204,7 +204,7 @@ namespace math {
extern macro Float64Sinh(float64): float64; extern macro Float64Sinh(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathSinh(context: Context, _receiver: JSAny, x: JSAny): Number { MathSinh(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Sinh(value)); return Convert<Number>(Float64Sinh(value));
} }
...@@ -213,7 +213,7 @@ namespace math { ...@@ -213,7 +213,7 @@ namespace math {
extern macro Float64Sqrt(float64): float64; extern macro Float64Sqrt(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathSqrt(context: Context, _receiver: JSAny, x: JSAny): Number { MathSqrt(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Sqrt(value)); return Convert<Number>(Float64Sqrt(value));
} }
...@@ -222,7 +222,7 @@ namespace math { ...@@ -222,7 +222,7 @@ namespace math {
extern macro Float64Tan(float64): float64; extern macro Float64Tan(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathTan(context: Context, _receiver: JSAny, x: JSAny): Number { MathTan(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Tan(value)); return Convert<Number>(Float64Tan(value));
} }
...@@ -231,7 +231,7 @@ namespace math { ...@@ -231,7 +231,7 @@ namespace math {
extern macro Float64Tanh(float64): float64; extern macro Float64Tanh(float64): float64;
transitioning javascript builtin transitioning javascript builtin
MathTanh(context: Context, _receiver: JSAny, x: JSAny): Number { MathTanh(context: Context, _receiver: Object, x: Object): Number {
const value = Convert<float64>(ToNumber_Inline(context, x)); const value = Convert<float64>(ToNumber_Inline(context, x));
return Convert<Number>(Float64Tanh(value)); return Convert<Number>(Float64Tanh(value));
} }
...@@ -240,7 +240,7 @@ namespace math { ...@@ -240,7 +240,7 @@ namespace math {
// ES6 #sec-math.hypot // ES6 #sec-math.hypot
transitioning javascript builtin transitioning javascript builtin
MathHypot(js-implicit context: Context, receiver: JSAny)(...arguments): MathHypot(js-implicit context: Context, receiver: Object)(...arguments):
Number { Number {
const length = arguments.length; const length = arguments.length;
if (length == 0) { if (length == 0) {
......
src/builtins/object-fromentries.tq
View file @ 4418a7b9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
namespace object { namespace object {
transitioning macro ObjectFromEntriesFastCase(implicit context: Context)( transitioning macro ObjectFromEntriesFastCase(implicit context: Context)(
iterable: JSAny): JSObject labels IfSlow { iterable: Object): JSObject labels IfSlow {
typeswitch (iterable) { typeswitch (iterable) {
case (array: FastJSArrayWithNoCustomIteration): { case (array: FastJSArrayWithNoCustomIteration): {
const elements: FixedArray = const elements: FixedArray =
...@@ -14,7 +14,7 @@ namespace object { ...@@ -14,7 +14,7 @@ namespace object {
const result: JSObject = NewJSObject(); const result: JSObject = NewJSObject();
for (let k: Smi = 0; k < length; ++k) { for (let k: Smi = 0; k < length; ++k) {
const value: JSAny = array::LoadElementOrUndefined(elements, k); const value: Object = array::LoadElementOrUndefined(elements, k);
const pair: KeyValuePair = const pair: KeyValuePair =
collections::LoadKeyValuePairNoSideEffects(value) collections::LoadKeyValuePairNoSideEffects(value)
otherwise IfSlow; otherwise IfSlow;
...@@ -26,16 +26,16 @@ namespace object { ...@@ -26,16 +26,16 @@ namespace object {
} }
return result; return result;
} }
case (JSAny): { case (Object): {
goto IfSlow; goto IfSlow;
} }
} }
} }
transitioning javascript builtin transitioning javascript builtin
ObjectFromEntries(js-implicit context: Context, receiver: JSAny)( ObjectFromEntries(js-implicit context: Context, receiver: Object)(
...arguments): JSAny { ...arguments): Object {
const iterable: JSAny = arguments[0]; const iterable: Object = arguments[0];
try { try {
if (IsNullOrUndefined(iterable)) goto Throw; if (IsNullOrUndefined(iterable)) goto Throw;
return ObjectFromEntriesFastCase(iterable) otherwise IfSlow; return ObjectFromEntriesFastCase(iterable) otherwise IfSlow;
...@@ -50,7 +50,7 @@ namespace object { ...@@ -50,7 +50,7 @@ namespace object {
const step: JSReceiver = const step: JSReceiver =
iterator::IteratorStep(i, fastIteratorResultMap) iterator::IteratorStep(i, fastIteratorResultMap)
otherwise return result; otherwise return result;
const iteratorValue: JSAny = const iteratorValue: Object =
iterator::IteratorValue(step, fastIteratorResultMap); iterator::IteratorValue(step, fastIteratorResultMap);
const pair: KeyValuePair = const pair: KeyValuePair =
collections::LoadKeyValuePair(iteratorValue); collections::LoadKeyValuePair(iteratorValue);
......
src/builtins/object.tq
View file @ 4418a7b9
...@@ -4,31 +4,31 @@ ...@@ -4,31 +4,31 @@
namespace runtime { namespace runtime {
extern transitioning runtime extern transitioning runtime
ObjectIsExtensible(implicit context: Context)(JSAny): JSAny; ObjectIsExtensible(implicit context: Context)(Object): Object;
extern transitioning runtime extern transitioning runtime
JSReceiverPreventExtensionsThrow(implicit context: Context)(JSReceiver): JSReceiverPreventExtensionsThrow(implicit context: Context)(JSReceiver):
JSAny; Object;
extern transitioning runtime extern transitioning runtime
JSReceiverPreventExtensionsDontThrow(implicit context: Context)(JSReceiver): JSReceiverPreventExtensionsDontThrow(implicit context: Context)(JSReceiver):
JSAny; Object;
extern transitioning runtime extern transitioning runtime
JSReceiverGetPrototypeOf(implicit context: Context)(JSReceiver): JSAny; JSReceiverGetPrototypeOf(implicit context: Context)(JSReceiver): Object;
extern transitioning runtime extern transitioning runtime
JSReceiverSetPrototypeOfThrow(implicit context: Context)(JSReceiver, JSAny): JSReceiverSetPrototypeOfThrow(implicit context: Context)(JSReceiver, Object):
JSAny; Object;
extern transitioning runtime extern transitioning runtime
JSReceiverSetPrototypeOfDontThrow(implicit context: JSReceiverSetPrototypeOfDontThrow(implicit context:
Context)(JSReceiver, JSAny): JSAny; Context)(JSReceiver, Object): Object;
} // namespace runtime } // namespace runtime
namespace object { namespace object {
transitioning macro transitioning macro
ObjectIsExtensible(implicit context: Context)(object: JSAny): JSAny { ObjectIsExtensible(implicit context: Context)(object: Object): Object {
const objectJSReceiver = Cast<JSReceiver>(object) otherwise return False; const objectJSReceiver = Cast<JSReceiver>(object) otherwise return False;
const objectJSProxy = Cast<JSProxy>(objectJSReceiver) const objectJSProxy = Cast<JSProxy>(objectJSReceiver)
otherwise return runtime::ObjectIsExtensible(objectJSReceiver); otherwise return runtime::ObjectIsExtensible(objectJSReceiver);
...@@ -36,8 +36,8 @@ namespace object { ...@@ -36,8 +36,8 @@ namespace object {
} }
transitioning macro transitioning macro
ObjectPreventExtensionsThrow(implicit context: Context)(object: JSAny): ObjectPreventExtensionsThrow(implicit context: Context)(object: Object):
JSAny { Object {
const objectJSReceiver = Cast<JSReceiver>(object) otherwise return object; const objectJSReceiver = Cast<JSReceiver>(object) otherwise return object;
const objectJSProxy = Cast<JSProxy>(objectJSReceiver) const objectJSProxy = Cast<JSProxy>(objectJSReceiver)
otherwise return runtime::JSReceiverPreventExtensionsThrow( otherwise return runtime::JSReceiverPreventExtensionsThrow(
...@@ -47,8 +47,8 @@ namespace object { ...@@ -47,8 +47,8 @@ namespace object {
} }
transitioning macro transitioning macro
ObjectPreventExtensionsDontThrow(implicit context: Context)(object: JSAny): ObjectPreventExtensionsDontThrow(implicit context: Context)(object: Object):
JSAny { Object {
const objectJSReceiver = Cast<JSReceiver>(object) otherwise return False; const objectJSReceiver = Cast<JSReceiver>(object) otherwise return False;
const objectJSProxy = Cast<JSProxy>(objectJSReceiver) const objectJSProxy = Cast<JSProxy>(objectJSReceiver)
otherwise return runtime::JSReceiverPreventExtensionsDontThrow( otherwise return runtime::JSReceiverPreventExtensionsDontThrow(
...@@ -57,14 +57,14 @@ namespace object { ...@@ -57,14 +57,14 @@ namespace object {
} }
transitioning macro transitioning macro
ObjectGetPrototypeOf(implicit context: Context)(object: JSAny): JSAny { ObjectGetPrototypeOf(implicit context: Context)(object: Object): Object {
const objectJSReceiver: JSReceiver = ToObject_Inline(context, object); const objectJSReceiver: JSReceiver = ToObject_Inline(context, object);
return object::JSReceiverGetPrototypeOf(objectJSReceiver); return object::JSReceiverGetPrototypeOf(objectJSReceiver);
} }
transitioning macro transitioning macro
JSReceiverGetPrototypeOf(implicit context: Context)(object: JSReceiver): JSReceiverGetPrototypeOf(implicit context: Context)(object: JSReceiver):
JSAny { Object {
const objectJSProxy = Cast<JSProxy>(object) const objectJSProxy = Cast<JSProxy>(object)
otherwise return runtime::JSReceiverGetPrototypeOf(object); otherwise return runtime::JSReceiverGetPrototypeOf(object);
return proxy::ProxyGetPrototypeOf(objectJSProxy); return proxy::ProxyGetPrototypeOf(objectJSProxy);
...@@ -72,7 +72,7 @@ namespace object { ...@@ -72,7 +72,7 @@ namespace object {
transitioning macro transitioning macro
ObjectSetPrototypeOfThrow(implicit context: Context)( ObjectSetPrototypeOfThrow(implicit context: Context)(
object: JSAny, proto: JSReceiver | Null): JSAny { object: Object, proto: Object): Object {
const objectJSReceiver = Cast<JSReceiver>(object) otherwise return object; const objectJSReceiver = Cast<JSReceiver>(object) otherwise return object;
const objectJSProxy = Cast<JSProxy>(objectJSReceiver) const objectJSProxy = Cast<JSProxy>(objectJSReceiver)
otherwise return runtime::JSReceiverSetPrototypeOfThrow( otherwise return runtime::JSReceiverSetPrototypeOfThrow(
...@@ -83,7 +83,7 @@ namespace object { ...@@ -83,7 +83,7 @@ namespace object {
transitioning macro transitioning macro
ObjectSetPrototypeOfDontThrow(implicit context: Context)( ObjectSetPrototypeOfDontThrow(implicit context: Context)(
object: JSAny, proto: JSReceiver | Null): JSAny { object: Object, proto: Object): Object {
const objectJSReceiver = Cast<JSReceiver>(object) otherwise return False; const objectJSReceiver = Cast<JSReceiver>(object) otherwise return False;
const objectJSProxy = Cast<JSProxy>(objectJSReceiver) const objectJSProxy = Cast<JSProxy>(objectJSReceiver)
otherwise return runtime::JSReceiverSetPrototypeOfDontThrow( otherwise return runtime::JSReceiverSetPrototypeOfDontThrow(
...@@ -95,7 +95,7 @@ namespace object { ...@@ -95,7 +95,7 @@ namespace object {
namespace object_isextensible { namespace object_isextensible {
// ES6 section 19.1.2.11 Object.isExtensible ( O ) // ES6 section 19.1.2.11 Object.isExtensible ( O )
transitioning javascript builtin ObjectIsExtensible( transitioning javascript builtin ObjectIsExtensible(
js-implicit context: Context)(_receiver: JSAny, object: JSAny): JSAny { js-implicit context: Context)(_receiver: Object, object: Object): Object {
return object::ObjectIsExtensible(object); return object::ObjectIsExtensible(object);
} }
} // namespace object_isextensible } // namespace object_isextensible
...@@ -103,7 +103,7 @@ namespace object_isextensible { ...@@ -103,7 +103,7 @@ namespace object_isextensible {
namespace object_preventextensions { namespace object_preventextensions {
// ES6 section 19.1.2.11 Object.isExtensible ( O ) // ES6 section 19.1.2.11 Object.isExtensible ( O )
transitioning javascript builtin ObjectPreventExtensions( transitioning javascript builtin ObjectPreventExtensions(
js-implicit context: Context)(_receiver: JSAny, object: JSAny): JSAny { js-implicit context: Context)(_receiver: Object, object: Object): Object {
return object::ObjectPreventExtensionsThrow(object); return object::ObjectPreventExtensionsThrow(object);
} }
} // namespace object_preventextensions } // namespace object_preventextensions
...@@ -111,7 +111,7 @@ namespace object_preventextensions { ...@@ -111,7 +111,7 @@ namespace object_preventextensions {
namespace object_getprototypeof { namespace object_getprototypeof {
// ES6 section 19.1.2.9 Object.getPrototypeOf ( O ) // ES6 section 19.1.2.9 Object.getPrototypeOf ( O )
transitioning javascript builtin ObjectGetPrototypeOf( transitioning javascript builtin ObjectGetPrototypeOf(
js-implicit context: Context)(_receiver: JSAny, object: JSAny): JSAny { js-implicit context: Context)(_receiver: Object, object: Object): Object {
return object::ObjectGetPrototypeOf(object); return object::ObjectGetPrototypeOf(object);
} }
} // namespace object_getprototypeof } // namespace object_getprototypeof
...@@ -120,7 +120,7 @@ namespace object_setprototypeof { ...@@ -120,7 +120,7 @@ namespace object_setprototypeof {
// ES6 section 19.1.2.21 Object.setPrototypeOf ( O, proto ) // ES6 section 19.1.2.21 Object.setPrototypeOf ( O, proto )
transitioning javascript builtin ObjectSetPrototypeOf( transitioning javascript builtin ObjectSetPrototypeOf(
js-implicit context: js-implicit context:
Context)(_receiver: JSAny, object: JSAny, proto: JSAny): JSAny { Context)(_receiver: Object, object: Object, proto: Object): Object {
// 1. Set O to ? RequireObjectCoercible(O). // 1. Set O to ? RequireObjectCoercible(O).
RequireObjectCoercible(object, 'Object.setPrototypeOf'); RequireObjectCoercible(object, 'Object.setPrototypeOf');
...@@ -130,13 +130,9 @@ namespace object_setprototypeof { ...@@ -130,13 +130,9 @@ namespace object_setprototypeof {
// 4. Let status be ? O.[[SetPrototypeOf]](proto). // 4. Let status be ? O.[[SetPrototypeOf]](proto).
// 5. If status is false, throw a TypeError exception. // 5. If status is false, throw a TypeError exception.
// 6. Return O. // 6. Return O.
typeswitch (proto) { if (proto == Null || Is<JSReceiver>(proto)) {
case (proto: JSReceiver | Null): {
return object::ObjectSetPrototypeOfThrow(object, proto); return object::ObjectSetPrototypeOfThrow(object, proto);
} }
case (JSAny): {
ThrowTypeError(kProtoObjectOrNull, proto); ThrowTypeError(kProtoObjectOrNull, proto);
} }
}
}
} // namespace object_setprototypeof } // namespace object_setprototypeof
src/builtins/proxy-constructor.tq
View file @ 4418a7b9
...@@ -10,8 +10,8 @@ namespace proxy { ...@@ -10,8 +10,8 @@ namespace proxy {
// https://tc39.github.io/ecma262/#sec-proxy-constructor // https://tc39.github.io/ecma262/#sec-proxy-constructor
transitioning javascript builtin transitioning javascript builtin
ProxyConstructor( ProxyConstructor(
js-implicit context: Context, receiver: JSAny, js-implicit context: Context, receiver: Object,
newTarget: JSAny)(target: JSAny, handler: JSAny): JSProxy { newTarget: Object)(target: Object, handler: Object): JSProxy {
try { try {
// 1. If NewTarget is undefined, throw a TypeError exception. // 1. If NewTarget is undefined, throw a TypeError exception.
if (newTarget == Undefined) { if (newTarget == Undefined) {
......
src/builtins/proxy-delete-property.tq
View file @ 4418a7b9
...@@ -10,7 +10,7 @@ namespace proxy { ...@@ -10,7 +10,7 @@ namespace proxy {
// https://tc39.es/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-delete-p // https://tc39.es/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-delete-p
transitioning builtin transitioning builtin
ProxyDeleteProperty(implicit context: Context)( ProxyDeleteProperty(implicit context: Context)(
proxy: JSProxy, name: PropertyKey, languageMode: LanguageMode): JSAny { proxy: JSProxy, name: Name, languageMode: LanguageMode): Object {
const kTrapName: constexpr string = 'deleteProperty'; const kTrapName: constexpr string = 'deleteProperty';
// Handle deeply nested proxy. // Handle deeply nested proxy.
PerformStackCheck(); PerformStackCheck();
...@@ -58,7 +58,7 @@ namespace proxy { ...@@ -58,7 +58,7 @@ namespace proxy {
// 15. Return true. // 15. Return true.
return True; return True;
} }
label TrapUndefined(target: JSAny) { label TrapUndefined(target: Object) {
// 7.a. Return ? target.[[Delete]](P). // 7.a. Return ? target.[[Delete]](P).
return DeleteProperty(target, name, languageMode); return DeleteProperty(target, name, languageMode);
} }
......
src/builtins/proxy-get-property.tq
View file @ 4418a7b9
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
namespace proxy { namespace proxy {
extern transitioning builtin GetPropertyWithReceiver( extern transitioning builtin GetPropertyWithReceiver(
implicit context: Context)(JSAny, Name, JSAny, Smi): JSAny; implicit context: Context)(Object, Name, Object, Smi): Object;
// ES #sec-proxy-object-internal-methods-and-internal-slots-get-p-receiver // ES #sec-proxy-object-internal-methods-and-internal-slots-get-p-receiver
// https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-get-p-receiver // https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-get-p-receiver
transitioning builtin transitioning builtin
ProxyGetProperty(implicit context: Context)( ProxyGetProperty(implicit context: Context)(
proxy: JSProxy, name: PropertyKey, receiverValue: JSAny, proxy: JSProxy, name: Name, receiverValue: Object,
onNonExistent: Smi): JSAny { onNonExistent: Smi): Object {
PerformStackCheck(); PerformStackCheck();
// 1. Assert: IsPropertyKey(P) is true. // 1. Assert: IsPropertyKey(P) is true.
assert(TaggedIsNotSmi(name)); assert(TaggedIsNotSmi(name));
......
src/builtins/proxy-get-prototype-of.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace proxy { ...@@ -9,7 +9,7 @@ namespace proxy {
// ES #sec-proxy-object-internal-methods-and-internal-slots-isextensible // ES #sec-proxy-object-internal-methods-and-internal-slots-isextensible
// https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-isextensible // https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-isextensible
transitioning builtin transitioning builtin
ProxyGetPrototypeOf(implicit context: Context)(proxy: JSProxy): JSAny { ProxyGetPrototypeOf(implicit context: Context)(proxy: JSProxy): Object {
PerformStackCheck(); PerformStackCheck();
const kTrapName: constexpr string = 'getPrototypeOf'; const kTrapName: constexpr string = 'getPrototypeOf';
try { try {
...@@ -39,7 +39,7 @@ namespace proxy { ...@@ -39,7 +39,7 @@ namespace proxy {
// 9. Let extensibleTarget be ? IsExtensible(target). // 9. Let extensibleTarget be ? IsExtensible(target).
// 10. If extensibleTarget is true, return handlerProto. // 10. If extensibleTarget is true, return handlerProto.
const extensibleTarget: JSAny = object::ObjectIsExtensible(target); const extensibleTarget: Object = object::ObjectIsExtensible(target);
assert(extensibleTarget == True || extensibleTarget == False); assert(extensibleTarget == True || extensibleTarget == False);
if (extensibleTarget == True) { if (extensibleTarget == True) {
return handlerProto; return handlerProto;
...@@ -56,7 +56,7 @@ namespace proxy { ...@@ -56,7 +56,7 @@ namespace proxy {
} }
ThrowTypeError(kProxyGetPrototypeOfNonExtensible); ThrowTypeError(kProxyGetPrototypeOfNonExtensible);
} }
label TrapUndefined(target: JSAny) { label TrapUndefined(target: Object) {
// 6.a. Return ? target.[[GetPrototypeOf]](). // 6.a. Return ? target.[[GetPrototypeOf]]().
return object::ObjectGetPrototypeOf(target); return object::ObjectGetPrototypeOf(target);
} }
......
src/builtins/proxy-has-property.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace proxy { ...@@ -9,7 +9,7 @@ namespace proxy {
// ES #sec-proxy-object-internal-methods-and-internal-slots-hasproperty-p // ES #sec-proxy-object-internal-methods-and-internal-slots-hasproperty-p
// https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-hasproperty-p // https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-hasproperty-p
transitioning builtin ProxyHasProperty(implicit context: Context)( transitioning builtin ProxyHasProperty(implicit context: Context)(
proxy: JSProxy, name: PropertyKey): JSAny { proxy: JSProxy, name: Name): Object {
assert(IsJSProxy(proxy)); assert(IsJSProxy(proxy));
PerformStackCheck(); PerformStackCheck();
...@@ -46,7 +46,7 @@ namespace proxy { ...@@ -46,7 +46,7 @@ namespace proxy {
CheckHasTrapResult(target, proxy, name); CheckHasTrapResult(target, proxy, name);
return False; return False;
} }
label TrapUndefined(target: JSAny) { label TrapUndefined(target: Object) {
// 7.a. Return ? target.[[HasProperty]](P). // 7.a. Return ? target.[[HasProperty]](P).
tail HasProperty(target, name); tail HasProperty(target, name);
} }
......
src/builtins/proxy-is-extensible.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace proxy { ...@@ -9,7 +9,7 @@ namespace proxy {
// ES #sec-proxy-object-internal-methods-and-internal-slots-isextensible // ES #sec-proxy-object-internal-methods-and-internal-slots-isextensible
// https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-isextensible // https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-isextensible
transitioning builtin ProxyIsExtensible(implicit context: transitioning builtin ProxyIsExtensible(implicit context:
Context)(proxy: JSProxy): JSAny { Context)(proxy: JSProxy): Object {
PerformStackCheck(); PerformStackCheck();
const kTrapName: constexpr string = 'isExtensible'; const kTrapName: constexpr string = 'isExtensible';
try { try {
...@@ -45,7 +45,7 @@ namespace proxy { ...@@ -45,7 +45,7 @@ namespace proxy {
// 10. Return booleanTrapResult. // 10. Return booleanTrapResult.
return SelectBooleanConstant(trapResult); return SelectBooleanConstant(trapResult);
} }
label TrapUndefined(target: JSAny) { label TrapUndefined(target: Object) {
// 6.a. Return ? IsExtensible(target). // 6.a. Return ? IsExtensible(target).
return object::ObjectIsExtensible(target); return object::ObjectIsExtensible(target);
} }
......
src/builtins/proxy-prevent-extensions.tq
View file @ 4418a7b9
...@@ -9,8 +9,8 @@ namespace proxy { ...@@ -9,8 +9,8 @@ namespace proxy {
// ES #sec-proxy-object-internal-methods-and-internal-slots-preventextensions // ES #sec-proxy-object-internal-methods-and-internal-slots-preventextensions
// https://tc39.es/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-preventextensions // https://tc39.es/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-preventextensions
transitioning builtin transitioning builtin
ProxyPreventExtensions(implicit context: ProxyPreventExtensions(implicit context: Context)(
Context)(proxy: JSProxy, doThrow: Boolean): JSAny { proxy: JSProxy, doThrow: Boolean): Object {
PerformStackCheck(); PerformStackCheck();
const kTrapName: constexpr string = 'preventExtensions'; const kTrapName: constexpr string = 'preventExtensions';
try { try {
...@@ -37,7 +37,7 @@ namespace proxy { ...@@ -37,7 +37,7 @@ namespace proxy {
// 8.a. Let extensibleTarget be ? IsExtensible(target). // 8.a. Let extensibleTarget be ? IsExtensible(target).
// 8.b If extensibleTarget is true, throw a TypeError exception. // 8.b If extensibleTarget is true, throw a TypeError exception.
if (ToBoolean(trapResult)) { if (ToBoolean(trapResult)) {
const extensibleTarget: JSAny = object::ObjectIsExtensible(target); const extensibleTarget: Object = object::ObjectIsExtensible(target);
assert(extensibleTarget == True || extensibleTarget == False); assert(extensibleTarget == True || extensibleTarget == False);
if (extensibleTarget == True) { if (extensibleTarget == True) {
ThrowTypeError(kProxyPreventExtensionsExtensible); ThrowTypeError(kProxyPreventExtensionsExtensible);
...@@ -52,7 +52,7 @@ namespace proxy { ...@@ -52,7 +52,7 @@ namespace proxy {
// 9. Return booleanTrapResult. // 9. Return booleanTrapResult.
return True; return True;
} }
label TrapUndefined(target: JSAny) { label TrapUndefined(target: Object) {
// 6.a. Return ? target.[[PreventExtensions]](). // 6.a. Return ? target.[[PreventExtensions]]().
if (doThrow == True) { if (doThrow == True) {
return object::ObjectPreventExtensionsThrow(target); return object::ObjectPreventExtensionsThrow(target);
......
src/builtins/proxy-revocable.tq
View file @ 4418a7b9
...@@ -12,8 +12,9 @@ namespace proxy { ...@@ -12,8 +12,9 @@ namespace proxy {
// Proxy.revocable(target, handler) // Proxy.revocable(target, handler)
// https://tc39.github.io/ecma262/#sec-proxy.revocable // https://tc39.github.io/ecma262/#sec-proxy.revocable
transitioning javascript builtin transitioning javascript builtin
ProxyRevocable(js-implicit context: Context)( ProxyRevocable(
_receiver: JSAny, target: JSAny, handler: JSAny): JSProxyRevocableResult { context: Context, _receiver: Object, target: Object,
handler: Object): JSProxyRevocableResult {
try { try {
const targetJSReceiver = const targetJSReceiver =
Cast<JSReceiver>(target) otherwise ThrowProxyNonObject; Cast<JSReceiver>(target) otherwise ThrowProxyNonObject;
......
src/builtins/proxy-set-property.tq
View file @ 4418a7b9
...@@ -19,22 +19,16 @@ namespace proxy { ...@@ -19,22 +19,16 @@ namespace proxy {
// https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-set-p-v-receiver // https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-set-p-v-receiver
transitioning builtin transitioning builtin
ProxySetProperty(implicit context: Context)( ProxySetProperty(implicit context: Context)(
proxy: JSProxy, name: PropertyKey | PrivateSymbol, value: JSAny, proxy: JSProxy, name: Name, value: Object,
receiverValue: JSAny): JSAny { receiverValue: Object): Object {
// 1. Assert: IsPropertyKey(P) is true. // 1. Assert: IsPropertyKey(P) is true.
assert(TaggedIsNotSmi(name)); assert(TaggedIsNotSmi(name));
assert(IsName(name)); assert(IsName(name));
let key: PropertyKey; if (IsPrivateSymbol(name)) {
typeswitch (name) {
case (PrivateSymbol): {
CallThrowTypeErrorIfStrict(kProxyPrivate); CallThrowTypeErrorIfStrict(kProxyPrivate);
return Undefined; return Undefined;
} }
case (name: PropertyKey): {
key = name;
}
}
try { try {
// 2. Let handler be O.[[ProxyHandler]]. // 2. Let handler be O.[[ProxyHandler]].
...@@ -67,7 +61,7 @@ namespace proxy { ...@@ -67,7 +61,7 @@ namespace proxy {
// exception. // exception.
// 12. Return true. // 12. Return true.
const trapResult = const trapResult =
Call(context, trap, handler, target, key, value, receiverValue); Call(context, trap, handler, target, name, value, receiverValue);
if (ToBoolean(trapResult)) { if (ToBoolean(trapResult)) {
CheckGetSetTrapResult(target, proxy, name, value, kProxySet); CheckGetSetTrapResult(target, proxy, name, value, kProxySet);
return value; return value;
......
src/builtins/proxy-set-prototype-of.tq
View file @ 4418a7b9
...@@ -10,7 +10,7 @@ namespace proxy { ...@@ -10,7 +10,7 @@ namespace proxy {
// https://tc39.es/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-setprototypeof-v // https://tc39.es/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-setprototypeof-v
transitioning builtin transitioning builtin
ProxySetPrototypeOf(implicit context: Context)( ProxySetPrototypeOf(implicit context: Context)(
proxy: JSProxy, proto: Null | JSReceiver, doThrow: Boolean): JSAny { proxy: JSProxy, proto: Object, doThrow: Boolean): Object {
PerformStackCheck(); PerformStackCheck();
const kTrapName: constexpr string = 'setPrototypeOf'; const kTrapName: constexpr string = 'setPrototypeOf';
try { try {
...@@ -63,7 +63,7 @@ namespace proxy { ...@@ -63,7 +63,7 @@ namespace proxy {
} }
ThrowTypeError(kProxySetPrototypeOfNonExtensible); ThrowTypeError(kProxySetPrototypeOfNonExtensible);
} }
label TrapUndefined(target: JSAny, proto: JSReceiver | Null) { label TrapUndefined(target: Object, proto: Object) {
// 7.a. Return ? target.[[SetPrototypeOf]](). // 7.a. Return ? target.[[SetPrototypeOf]]().
if (doThrow == True) { if (doThrow == True) {
return object::ObjectSetPrototypeOfThrow(target, proto); return object::ObjectSetPrototypeOfThrow(target, proto);
......
src/builtins/reflect.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace reflect { ...@@ -9,7 +9,7 @@ namespace reflect {
// ES6 section 26.1.10 Reflect.isExtensible // ES6 section 26.1.10 Reflect.isExtensible
transitioning javascript builtin ReflectIsExtensible( transitioning javascript builtin ReflectIsExtensible(
js-implicit context: Context)(_receiver: JSAny, object: Object): Object { js-implicit context: Context)(_receiver: Object, object: Object): Object {
const objectJSReceiver = Cast<JSReceiver>(object) const objectJSReceiver = Cast<JSReceiver>(object)
otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.isExtensible'); otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.isExtensible');
return object::ObjectIsExtensible(objectJSReceiver); return object::ObjectIsExtensible(objectJSReceiver);
...@@ -17,7 +17,7 @@ namespace reflect { ...@@ -17,7 +17,7 @@ namespace reflect {
// ES6 section 26.1.12 Reflect.preventExtensions // ES6 section 26.1.12 Reflect.preventExtensions
transitioning javascript builtin ReflectPreventExtensions( transitioning javascript builtin ReflectPreventExtensions(
js-implicit context: Context)(_receiver: JSAny, object: Object): Object { js-implicit context: Context)(_receiver: Object, object: Object): Object {
const objectJSReceiver = Cast<JSReceiver>(object) const objectJSReceiver = Cast<JSReceiver>(object)
otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.preventExtensions'); otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.preventExtensions');
return object::ObjectPreventExtensionsDontThrow(objectJSReceiver); return object::ObjectPreventExtensionsDontThrow(objectJSReceiver);
...@@ -25,7 +25,7 @@ namespace reflect { ...@@ -25,7 +25,7 @@ namespace reflect {
// ES6 section 26.1.8 Reflect.getPrototypeOf // ES6 section 26.1.8 Reflect.getPrototypeOf
transitioning javascript builtin ReflectGetPrototypeOf( transitioning javascript builtin ReflectGetPrototypeOf(
js-implicit context: Context)(_receiver: JSAny, object: Object): Object { js-implicit context: Context)(_receiver: Object, object: Object): Object {
const objectJSReceiver = Cast<JSReceiver>(object) const objectJSReceiver = Cast<JSReceiver>(object)
otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.getPrototypeOf'); otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.getPrototypeOf');
return object::JSReceiverGetPrototypeOf(objectJSReceiver); return object::JSReceiverGetPrototypeOf(objectJSReceiver);
...@@ -34,21 +34,16 @@ namespace reflect { ...@@ -34,21 +34,16 @@ namespace reflect {
// ES6 section 26.1.14 Reflect.setPrototypeOf // ES6 section 26.1.14 Reflect.setPrototypeOf
transitioning javascript builtin ReflectSetPrototypeOf( transitioning javascript builtin ReflectSetPrototypeOf(
js-implicit context: js-implicit context:
Context)(_receiver: JSAny, object: JSAny, proto: JSAny): JSAny { Context)(_receiver: Object, object: Object, proto: Object): Object {
const objectJSReceiver = Cast<JSReceiver>(object) const objectJSReceiver = Cast<JSReceiver>(object)
otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.setPrototypeOf'); otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.setPrototypeOf');
typeswitch (proto) { if (proto == Null || Is<JSReceiver>(proto)) {
case (proto: JSReceiver | Null): {
return object::ObjectSetPrototypeOfDontThrow(objectJSReceiver, proto); return object::ObjectSetPrototypeOfDontThrow(objectJSReceiver, proto);
} }
case (JSAny): {
ThrowTypeError(kProtoObjectOrNull, proto); ThrowTypeError(kProtoObjectOrNull, proto);
} }
}
}
extern transitioning builtin ToName(implicit context: Context)(Object): extern transitioning builtin ToName(implicit context: Context)(Object): Name;
AnyName;
type OnNonExistent constexpr 'OnNonExistent'; type OnNonExistent constexpr 'OnNonExistent';
const kReturnUndefined: constexpr OnNonExistent const kReturnUndefined: constexpr OnNonExistent
generates 'OnNonExistent::kReturnUndefined'; generates 'OnNonExistent::kReturnUndefined';
...@@ -64,8 +59,8 @@ namespace reflect { ...@@ -64,8 +59,8 @@ namespace reflect {
const objectJSReceiver = Cast<JSReceiver>(object) const objectJSReceiver = Cast<JSReceiver>(object)
otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.get'); otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.get');
const propertyKey: Object = length > 1 ? arguments[1] : Undefined; const propertyKey: Object = length > 1 ? arguments[1] : Undefined;
const name: AnyName = ToName(propertyKey); const name: Name = ToName(propertyKey);
const receiver: JSAny = length > 2 ? arguments[2] : objectJSReceiver; const receiver: Object = length > 2 ? arguments[2] : objectJSReceiver;
return GetPropertyWithReceiver( return GetPropertyWithReceiver(
objectJSReceiver, name, receiver, SmiConstant(kReturnUndefined)); objectJSReceiver, name, receiver, SmiConstant(kReturnUndefined));
} }
...@@ -73,7 +68,7 @@ namespace reflect { ...@@ -73,7 +68,7 @@ namespace reflect {
// ES6 section 26.1.4 Reflect.deleteProperty // ES6 section 26.1.4 Reflect.deleteProperty
transitioning javascript builtin ReflectDeleteProperty( transitioning javascript builtin ReflectDeleteProperty(
js-implicit context: js-implicit context:
Context)(_receiver: JSAny, object: JSAny, key: JSAny): JSAny { Context)(_receiver: Object, object: Object, key: Object): Object {
const objectJSReceiver = Cast<JSReceiver>(object) const objectJSReceiver = Cast<JSReceiver>(object)
otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.deleteProperty'); otherwise ThrowTypeError(kCalledOnNonObject, 'Reflect.deleteProperty');
return DeleteProperty(objectJSReceiver, key, kSloppy); return DeleteProperty(objectJSReceiver, key, kSloppy);
......
src/builtins/regexp-replace.tq
View file @ 4418a7b9
...@@ -57,7 +57,7 @@ namespace regexp_replace { ...@@ -57,7 +57,7 @@ namespace regexp_replace {
// Element represents the matched substring, which is then passed to the // Element represents the matched substring, which is then passed to the
// replace function. // replace function.
case (elString: String): { case (elString: String): {
const replacementObj: JSAny = const replacementObj: Object =
Call(context, replaceFn, Undefined, elString, matchStart, string); Call(context, replaceFn, Undefined, elString, matchStart, string);
const replacement: String = ToString_Inline(context, replacementObj); const replacement: String = ToString_Inline(context, replacementObj);
matchesElements.objects[i] = replacement; matchesElements.objects[i] = replacement;
...@@ -79,7 +79,7 @@ namespace regexp_replace { ...@@ -79,7 +79,7 @@ namespace regexp_replace {
// The JSArray is expanded into the function args by Reflect.apply(). // The JSArray is expanded into the function args by Reflect.apply().
// TODO(jgruber): Remove indirection through Call->ReflectApply. // TODO(jgruber): Remove indirection through Call->ReflectApply.
const replacementObj: JSAny = Call( const replacementObj: Object = Call(
context, GetReflectApply(), Undefined, replaceFn, Undefined, elArray); context, GetReflectApply(), Undefined, replaceFn, Undefined, elArray);
// Overwrite the i'th element in the results with the string // Overwrite the i'th element in the results with the string
...@@ -172,7 +172,7 @@ namespace regexp_replace { ...@@ -172,7 +172,7 @@ namespace regexp_replace {
} }
transitioning builtin RegExpReplace(implicit context: Context)( transitioning builtin RegExpReplace(implicit context: Context)(
regexp: FastJSRegExp, string: String, replaceValue: JSAny): String { regexp: FastJSRegExp, string: String, replaceValue: Object): String {
// TODO(pwong): Remove assert when all callers (StringPrototypeReplace) are // TODO(pwong): Remove assert when all callers (StringPrototypeReplace) are
// from Torque. // from Torque.
assert(Is<FastJSRegExp>(regexp)); assert(Is<FastJSRegExp>(regexp));
...@@ -184,7 +184,7 @@ namespace regexp_replace { ...@@ -184,7 +184,7 @@ namespace regexp_replace {
RegExpReplaceFastGlobalCallable(regexp, string, replaceFn) : RegExpReplaceFastGlobalCallable(regexp, string, replaceFn) :
StringReplaceNonGlobalRegExpWithFunction(string, regexp, replaceFn); StringReplaceNonGlobalRegExpWithFunction(string, regexp, replaceFn);
} }
case (JSAny): { case (Object): {
const stableRegexp: JSRegExp = regexp; const stableRegexp: JSRegExp = regexp;
const replaceString: String = ToString_Inline(context, replaceValue); const replaceString: String = ToString_Inline(context, replaceValue);
...@@ -208,7 +208,7 @@ namespace regexp_replace { ...@@ -208,7 +208,7 @@ namespace regexp_replace {
} }
transitioning javascript builtin RegExpPrototypeReplace( transitioning javascript builtin RegExpPrototypeReplace(
js-implicit context: Context, receiver: JSAny)(...arguments): Object { js-implicit context: Context, receiver: Object)(...arguments): Object {
const methodName: constexpr string = 'RegExp.prototype.@@replace'; const methodName: constexpr string = 'RegExp.prototype.@@replace';
// RegExpPrototypeReplace is a bit of a beast - a summary of dispatch logic: // RegExpPrototypeReplace is a bit of a beast - a summary of dispatch logic:
...@@ -229,8 +229,8 @@ namespace regexp_replace { ...@@ -229,8 +229,8 @@ namespace regexp_replace {
// } // }
// } // }
const string: JSAny = arguments[0]; const string: Object = arguments[0];
const replaceValue: JSAny = arguments[1]; const replaceValue: Object = arguments[1];
// Let rx be the this value. // Let rx be the this value.
// If Type(rx) is not Object, throw a TypeError exception. // If Type(rx) is not Object, throw a TypeError exception.
......
src/builtins/string-endswith.tq
View file @ 4418a7b9
...@@ -28,13 +28,13 @@ namespace string { ...@@ -28,13 +28,13 @@ namespace string {
// https://tc39.github.io/ecma262/#sec-string.prototype.endswith // https://tc39.github.io/ecma262/#sec-string.prototype.endswith
transitioning javascript builtin StringPrototypeEndsWith( transitioning javascript builtin StringPrototypeEndsWith(
js-implicit context: Context, receiver: JSAny)(...arguments): Boolean { js-implicit context: Context, receiver: Object)(...arguments): Boolean {
const searchString: JSAny = arguments[0]; const searchString: Object = arguments[0];
const endPosition: JSAny = arguments[1]; const endPosition: Object = arguments[1];
const kBuiltinName: constexpr string = 'String.prototype.endsWith'; const kBuiltinName: constexpr string = 'String.prototype.endsWith';
// 1. Let O be ? RequireObjectCoercible(this value). // 1. Let O be ? RequireObjectCoercible(this value).
const object: JSAny = RequireObjectCoercible(receiver, kBuiltinName); const object: Object = RequireObjectCoercible(receiver, kBuiltinName);
// 2. Let S be ? ToString(O). // 2. Let S be ? ToString(O).
const string: String = ToString_Inline(context, object); const string: String = ToString_Inline(context, object);
......
src/builtins/string-html.tq
View file @ 4418a7b9
...@@ -7,8 +7,8 @@ namespace string_html { ...@@ -7,8 +7,8 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-createhtml // https://tc39.github.io/ecma262/#sec-createhtml
transitioning builtin CreateHTML(implicit context: Context)( transitioning builtin CreateHTML(implicit context: Context)(
receiver: JSAny, methodName: String, tagName: String, attr: String, receiver: Object, methodName: String, tagName: String, attr: String,
attrValue: JSAny): String { attrValue: Object): String {
const tagContents: String = ToThisString(receiver, methodName); const tagContents: String = ToThisString(receiver, methodName);
let result = '<' + tagName; let result = '<' + tagName;
if (attr != kEmptyString) { if (attr != kEmptyString) {
...@@ -22,14 +22,14 @@ namespace string_html { ...@@ -22,14 +22,14 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.anchor // https://tc39.github.io/ecma262/#sec-string.prototype.anchor
transitioning javascript builtin StringPrototypeAnchor( transitioning javascript builtin StringPrototypeAnchor(
js-implicit context: Context, receiver: JSAny)(...arguments): String { js-implicit context: Context, receiver: Object)(...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.anchor', 'a', 'name', arguments[0]); receiver, 'String.prototype.anchor', 'a', 'name', arguments[0]);
} }
// https://tc39.github.io/ecma262/#sec-string.prototype.big // https://tc39.github.io/ecma262/#sec-string.prototype.big
transitioning javascript builtin transitioning javascript builtin
StringPrototypeBig(js-implicit context: Context, receiver: JSAny)( StringPrototypeBig(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.big', 'big', kEmptyString, kEmptyString); receiver, 'String.prototype.big', 'big', kEmptyString, kEmptyString);
...@@ -37,7 +37,7 @@ namespace string_html { ...@@ -37,7 +37,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.blink // https://tc39.github.io/ecma262/#sec-string.prototype.blink
transitioning javascript builtin transitioning javascript builtin
StringPrototypeBlink(js-implicit context: Context, receiver: JSAny)( StringPrototypeBlink(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.blink', 'blink', kEmptyString, receiver, 'String.prototype.blink', 'blink', kEmptyString,
...@@ -46,7 +46,7 @@ namespace string_html { ...@@ -46,7 +46,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.bold // https://tc39.github.io/ecma262/#sec-string.prototype.bold
transitioning javascript builtin transitioning javascript builtin
StringPrototypeBold(js-implicit context: Context, receiver: JSAny)( StringPrototypeBold(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.bold', 'b', kEmptyString, kEmptyString); receiver, 'String.prototype.bold', 'b', kEmptyString, kEmptyString);
...@@ -54,7 +54,7 @@ namespace string_html { ...@@ -54,7 +54,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.fontcolor // https://tc39.github.io/ecma262/#sec-string.prototype.fontcolor
transitioning javascript builtin transitioning javascript builtin
StringPrototypeFontcolor(js-implicit context: Context, receiver: JSAny)( StringPrototypeFontcolor(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.fontcolor', 'font', 'color', arguments[0]); receiver, 'String.prototype.fontcolor', 'font', 'color', arguments[0]);
...@@ -62,7 +62,7 @@ namespace string_html { ...@@ -62,7 +62,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.fontsize // https://tc39.github.io/ecma262/#sec-string.prototype.fontsize
transitioning javascript builtin transitioning javascript builtin
StringPrototypeFontsize(js-implicit context: Context, receiver: JSAny)( StringPrototypeFontsize(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.fontsize', 'font', 'size', arguments[0]); receiver, 'String.prototype.fontsize', 'font', 'size', arguments[0]);
...@@ -70,7 +70,7 @@ namespace string_html { ...@@ -70,7 +70,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.fixed // https://tc39.github.io/ecma262/#sec-string.prototype.fixed
transitioning javascript builtin transitioning javascript builtin
StringPrototypeFixed(js-implicit context: Context, receiver: JSAny)( StringPrototypeFixed(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.fixed', 'tt', kEmptyString, kEmptyString); receiver, 'String.prototype.fixed', 'tt', kEmptyString, kEmptyString);
...@@ -78,7 +78,7 @@ namespace string_html { ...@@ -78,7 +78,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.italics // https://tc39.github.io/ecma262/#sec-string.prototype.italics
transitioning javascript builtin transitioning javascript builtin
StringPrototypeItalics(js-implicit context: Context, receiver: JSAny)( StringPrototypeItalics(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.italics', 'i', kEmptyString, kEmptyString); receiver, 'String.prototype.italics', 'i', kEmptyString, kEmptyString);
...@@ -86,7 +86,7 @@ namespace string_html { ...@@ -86,7 +86,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.link // https://tc39.github.io/ecma262/#sec-string.prototype.link
transitioning javascript builtin transitioning javascript builtin
StringPrototypeLink(js-implicit context: Context, receiver: JSAny)( StringPrototypeLink(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.link', 'a', 'href', arguments[0]); receiver, 'String.prototype.link', 'a', 'href', arguments[0]);
...@@ -94,7 +94,7 @@ namespace string_html { ...@@ -94,7 +94,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.small // https://tc39.github.io/ecma262/#sec-string.prototype.small
transitioning javascript builtin transitioning javascript builtin
StringPrototypeSmall(js-implicit context: Context, receiver: JSAny)( StringPrototypeSmall(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.small', 'small', kEmptyString, receiver, 'String.prototype.small', 'small', kEmptyString,
...@@ -103,7 +103,7 @@ namespace string_html { ...@@ -103,7 +103,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.strike // https://tc39.github.io/ecma262/#sec-string.prototype.strike
transitioning javascript builtin transitioning javascript builtin
StringPrototypeStrike(js-implicit context: Context, receiver: JSAny)( StringPrototypeStrike(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.strike', 'strike', kEmptyString, receiver, 'String.prototype.strike', 'strike', kEmptyString,
...@@ -112,7 +112,7 @@ namespace string_html { ...@@ -112,7 +112,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.sub // https://tc39.github.io/ecma262/#sec-string.prototype.sub
transitioning javascript builtin transitioning javascript builtin
StringPrototypeSub(js-implicit context: Context, receiver: JSAny)( StringPrototypeSub(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.sub', 'sub', kEmptyString, kEmptyString); receiver, 'String.prototype.sub', 'sub', kEmptyString, kEmptyString);
...@@ -120,7 +120,7 @@ namespace string_html { ...@@ -120,7 +120,7 @@ namespace string_html {
// https://tc39.github.io/ecma262/#sec-string.prototype.sup // https://tc39.github.io/ecma262/#sec-string.prototype.sup
transitioning javascript builtin transitioning javascript builtin
StringPrototypeSup(js-implicit context: Context, receiver: JSAny)( StringPrototypeSup(js-implicit context: Context, receiver: Object)(
...arguments): String { ...arguments): String {
return CreateHTML( return CreateHTML(
receiver, 'String.prototype.sup', 'sup', kEmptyString, kEmptyString); receiver, 'String.prototype.sup', 'sup', kEmptyString, kEmptyString);
......
src/builtins/string-iterator.tq
View file @ 4418a7b9
...@@ -17,7 +17,7 @@ namespace string_iterator { ...@@ -17,7 +17,7 @@ namespace string_iterator {
// ES6 #sec-string.prototype-@@iterator // ES6 #sec-string.prototype-@@iterator
transitioning javascript builtin StringPrototypeIterator( transitioning javascript builtin StringPrototypeIterator(
js-implicit context: Context)(receiver: JSAny): JSStringIterator { js-implicit context: Context)(receiver: Object): JSStringIterator {
const name: String = const name: String =
ToThisString(receiver, 'String.prototype[Symbol.iterator]'); ToThisString(receiver, 'String.prototype[Symbol.iterator]');
const index: Smi = 0; const index: Smi = 0;
...@@ -26,7 +26,7 @@ namespace string_iterator { ...@@ -26,7 +26,7 @@ namespace string_iterator {
// ES6 #sec-%stringiteratorprototype%.next // ES6 #sec-%stringiteratorprototype%.next
transitioning javascript builtin StringIteratorPrototypeNext( transitioning javascript builtin StringIteratorPrototypeNext(
js-implicit context: Context)(receiver: JSAny): JSObject { js-implicit context: Context)(receiver: Object): JSObject {
const iterator = Cast<JSStringIterator>(receiver) otherwise ThrowTypeError( const iterator = Cast<JSStringIterator>(receiver) otherwise ThrowTypeError(
kIncompatibleMethodReceiver, 'String Iterator.prototype.next', kIncompatibleMethodReceiver, 'String Iterator.prototype.next',
receiver); receiver);
......
src/builtins/string-repeat.tq
View file @ 4418a7b9
...@@ -28,7 +28,7 @@ namespace string_repeat { ...@@ -28,7 +28,7 @@ namespace string_repeat {
// https://tc39.github.io/ecma262/#sec-string.prototype.repeat // https://tc39.github.io/ecma262/#sec-string.prototype.repeat
transitioning javascript builtin StringPrototypeRepeat( transitioning javascript builtin StringPrototypeRepeat(
js-implicit context: Context, receiver: JSAny)(count: JSAny): String { js-implicit context: Context, receiver: Object)(count: Object): String {
// 1. Let O be ? RequireObjectCoercible(this value). // 1. Let O be ? RequireObjectCoercible(this value).
// 2. Let S be ? ToString(O). // 2. Let S be ? ToString(O).
const s: String = ToThisString(receiver, kBuiltinName); const s: String = ToThisString(receiver, kBuiltinName);
......
src/builtins/string-slice.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace string_slice { ...@@ -9,7 +9,7 @@ namespace string_slice {
// ES6 #sec-string.prototype.slice ( start, end ) // ES6 #sec-string.prototype.slice ( start, end )
// https://tc39.github.io/ecma262/#sec-string.prototype.slice // https://tc39.github.io/ecma262/#sec-string.prototype.slice
transitioning javascript builtin StringPrototypeSlice( transitioning javascript builtin StringPrototypeSlice(
js-implicit context: Context, receiver: JSAny)(...arguments): String { js-implicit context: Context, receiver: Object)(...arguments): String {
// 1. Let O be ? RequireObjectCoercible(this value). // 1. Let O be ? RequireObjectCoercible(this value).
// 2. Let S be ? ToString(O). // 2. Let S be ? ToString(O).
const string: String = ToThisString(receiver, 'String.prototype.slice'); const string: String = ToThisString(receiver, 'String.prototype.slice');
......
src/builtins/string-startswith.tq
View file @ 4418a7b9
...@@ -10,13 +10,13 @@ namespace string { ...@@ -10,13 +10,13 @@ namespace string {
// https://tc39.github.io/ecma262/#sec-string.prototype.startswith // https://tc39.github.io/ecma262/#sec-string.prototype.startswith
transitioning javascript builtin StringPrototypeStartsWith( transitioning javascript builtin StringPrototypeStartsWith(
js-implicit context: Context, receiver: JSAny)(...arguments): Boolean { js-implicit context: Context, receiver: Object)(...arguments): Boolean {
const searchString: JSAny = arguments[0]; const searchString: Object = arguments[0];
const position: JSAny = arguments[1]; const position: Object = arguments[1];
const kBuiltinName: constexpr string = 'String.prototype.startsWith'; const kBuiltinName: constexpr string = 'String.prototype.startsWith';
// 1. Let O be ? RequireObjectCoercible(this value). // 1. Let O be ? RequireObjectCoercible(this value).
const object: JSAny = RequireObjectCoercible(receiver, kBuiltinName); const object: Object = RequireObjectCoercible(receiver, kBuiltinName);
// 2. Let S be ? ToString(O). // 2. Let S be ? ToString(O).
const string: String = ToString_Inline(context, object); const string: String = ToString_Inline(context, object);
......
src/builtins/string-substring.tq
View file @ 4418a7b9
...@@ -7,7 +7,7 @@ namespace string_substring { ...@@ -7,7 +7,7 @@ namespace string_substring {
extern macro SubString(String, intptr, intptr): String; extern macro SubString(String, intptr, intptr): String;
transitioning macro ToSmiBetweenZeroAnd(implicit context: Context)( transitioning macro ToSmiBetweenZeroAnd(implicit context: Context)(
value: JSAny, limit: Smi): Smi { value: Object, limit: Smi): Smi {
const valueInt: Number = const valueInt: Number =
ToInteger_Inline(context, value, kTruncateMinusZero); ToInteger_Inline(context, value, kTruncateMinusZero);
typeswitch (valueInt) { typeswitch (valueInt) {
...@@ -28,7 +28,7 @@ namespace string_substring { ...@@ -28,7 +28,7 @@ namespace string_substring {
// ES6 #sec-string.prototype.substring // ES6 #sec-string.prototype.substring
transitioning javascript builtin StringPrototypeSubstring( transitioning javascript builtin StringPrototypeSubstring(
js-implicit context: Context, receiver: JSAny)(...arguments): String { js-implicit context: Context, receiver: Object)(...arguments): String {
// Check that {receiver} is coercible to Object and convert it to a String. // Check that {receiver} is coercible to Object and convert it to a String.
const string: String = ToThisString(receiver, 'String.prototype.substring'); const string: String = ToThisString(receiver, 'String.prototype.substring');
const length = string.length_smi; const length = string.length_smi;
......
src/builtins/string.tq
View file @ 4418a7b9
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
namespace string { namespace string {
// ES6 #sec-string.prototype.tostring // ES6 #sec-string.prototype.tostring
transitioning javascript builtin transitioning javascript builtin
StringPrototypeToString(js-implicit context: Context)(receiver: JSAny): StringPrototypeToString(js-implicit context: Context)(receiver: Object):
Object { Object {
return ToThisValue(receiver, kString, 'String.prototype.toString'); return ToThisValue(receiver, kString, 'String.prototype.toString');
} }
// ES6 #sec-string.prototype.valueof // ES6 #sec-string.prototype.valueof
transitioning javascript builtin transitioning javascript builtin
StringPrototypeValueOf(js-implicit context: Context)(receiver: JSAny): StringPrototypeValueOf(js-implicit context: Context)(receiver: Object):
Object { Object {
return ToThisValue(receiver, kString, 'String.prototype.valueOf'); return ToThisValue(receiver, kString, 'String.prototype.valueOf');
} }
...@@ -53,7 +53,7 @@ namespace string { ...@@ -53,7 +53,7 @@ namespace string {
} }
transitioning macro GenerateStringAt(implicit context: Context)( transitioning macro GenerateStringAt(implicit context: Context)(
receiver: JSAny, position: JSAny, receiver: Object, position: Object,
methodName: constexpr string): never labels methodName: constexpr string): never labels
IfInBounds(String, intptr, intptr), IfOutOfBounds { IfInBounds(String, intptr, intptr), IfOutOfBounds {
// Check that {receiver} is coercible to Object and convert it to a String. // Check that {receiver} is coercible to Object and convert it to a String.
...@@ -71,7 +71,8 @@ namespace string { ...@@ -71,7 +71,8 @@ namespace string {
// ES6 #sec-string.prototype.charat // ES6 #sec-string.prototype.charat
transitioning javascript builtin StringPrototypeCharAt( transitioning javascript builtin StringPrototypeCharAt(
js-implicit context: Context, receiver: JSAny)(position: JSAny): Object { js-implicit context: Context,
receiver: Object)(position: Object): Object {
try { try {
GenerateStringAt(receiver, position, 'String.prototype.charAt') GenerateStringAt(receiver, position, 'String.prototype.charAt')
otherwise IfInBounds, IfOutOfBounds; otherwise IfInBounds, IfOutOfBounds;
...@@ -87,7 +88,8 @@ namespace string { ...@@ -87,7 +88,8 @@ namespace string {
// ES6 #sec-string.prototype.charcodeat // ES6 #sec-string.prototype.charcodeat
transitioning javascript builtin StringPrototypeCharCodeAt( transitioning javascript builtin StringPrototypeCharCodeAt(
js-implicit context: Context, receiver: JSAny)(position: JSAny): Object { js-implicit context: Context,
receiver: Object)(position: Object): Object {
try { try {
GenerateStringAt(receiver, position, 'String.prototype.charCodeAt') GenerateStringAt(receiver, position, 'String.prototype.charCodeAt')
otherwise IfInBounds, IfOutOfBounds; otherwise IfInBounds, IfOutOfBounds;
...@@ -103,7 +105,8 @@ namespace string { ...@@ -103,7 +105,8 @@ namespace string {
// ES6 #sec-string.prototype.codepointat // ES6 #sec-string.prototype.codepointat
transitioning javascript builtin StringPrototypeCodePointAt( transitioning javascript builtin StringPrototypeCodePointAt(
js-implicit context: Context, receiver: JSAny)(position: JSAny): Object { js-implicit context: Context,
receiver: Object)(position: Object): Object {
try { try {
GenerateStringAt(receiver, position, 'String.prototype.codePointAt') GenerateStringAt(receiver, position, 'String.prototype.codePointAt')
otherwise IfInBounds, IfOutOfBounds; otherwise IfInBounds, IfOutOfBounds;
...@@ -122,7 +125,7 @@ namespace string { ...@@ -122,7 +125,7 @@ namespace string {
// ES6 String.prototype.concat(...args) // ES6 String.prototype.concat(...args)
// ES6 #sec-string.prototype.concat // ES6 #sec-string.prototype.concat
transitioning javascript builtin StringPrototypeConcat( transitioning javascript builtin StringPrototypeConcat(
js-implicit context: Context, receiver: JSAny)(...arguments): Object { js-implicit context: Context, receiver: Object)(...arguments): Object {
// Check that {receiver} is coercible to Object and convert it to a String. // Check that {receiver} is coercible to Object and convert it to a String.
let string: String = ToThisString(receiver, 'String.prototype.concat'); let string: String = ToThisString(receiver, 'String.prototype.concat');
......
src/builtins/typed-array-createtypedarray.tq
View file @ 4418a7b9
...@@ -122,7 +122,7 @@ namespace typed_array_createtypedarray { ...@@ -122,7 +122,7 @@ namespace typed_array_createtypedarray {
// 22.2.4.2 TypedArray ( length ) // 22.2.4.2 TypedArray ( length )
// ES #sec-typedarray-length // ES #sec-typedarray-length
transitioning macro ConstructByLength(implicit context: Context)( transitioning macro ConstructByLength(implicit context: Context)(
map: Map, length: JSAny, map: Map, length: Object,
elementsInfo: typed_array::TypedArrayElementsInfo): JSTypedArray { elementsInfo: typed_array::TypedArrayElementsInfo): JSTypedArray {
const convertedLength: Number = const convertedLength: Number =
ToInteger_Inline(context, length, kTruncateMinusZero); ToInteger_Inline(context, length, kTruncateMinusZero);
...@@ -141,7 +141,7 @@ namespace typed_array_createtypedarray { ...@@ -141,7 +141,7 @@ namespace typed_array_createtypedarray {
// 22.2.4.4 TypedArray ( object ) // 22.2.4.4 TypedArray ( object )
// ES #sec-typedarray-object // ES #sec-typedarray-object
transitioning macro ConstructByArrayLike(implicit context: Context)( transitioning macro ConstructByArrayLike(implicit context: Context)(
map: Map, arrayLike: HeapObject, initialLength: JSAny, map: Map, arrayLike: HeapObject, initialLength: Object,
elementsInfo: typed_array::TypedArrayElementsInfo, elementsInfo: typed_array::TypedArrayElementsInfo,
bufferConstructor: JSReceiver): JSTypedArray { bufferConstructor: JSReceiver): JSTypedArray {
// The caller has looked up length on arrayLike, which is observable. // The caller has looked up length on arrayLike, which is observable.
...@@ -178,7 +178,7 @@ namespace typed_array_createtypedarray { ...@@ -178,7 +178,7 @@ namespace typed_array_createtypedarray {
// ES #sec-typedarray-object // ES #sec-typedarray-object
transitioning macro ConstructByIterable(implicit context: Context)( transitioning macro ConstructByIterable(implicit context: Context)(
iterable: JSReceiver, iteratorFn: Callable): never iterable: JSReceiver, iteratorFn: Callable): never
labels IfConstructByArrayLike(JSArray, Number, JSReceiver) { labels IfConstructByArrayLike(HeapObject, Object, JSReceiver) {
const array: JSArray = const array: JSArray =
IterableToListMayPreserveHoles(context, iterable, iteratorFn); IterableToListMayPreserveHoles(context, iterable, iteratorFn);
goto IfConstructByArrayLike(array, array.length, GetArrayBufferFunction()); goto IfConstructByArrayLike(array, array.length, GetArrayBufferFunction());
...@@ -188,7 +188,7 @@ namespace typed_array_createtypedarray { ...@@ -188,7 +188,7 @@ namespace typed_array_createtypedarray {
// ES #sec-typedarray-typedarray // ES #sec-typedarray-typedarray
transitioning macro ConstructByTypedArray(implicit context: Context)( transitioning macro ConstructByTypedArray(implicit context: Context)(
srcTypedArray: JSTypedArray): never srcTypedArray: JSTypedArray): never
labels IfConstructByArrayLike(JSTypedArray, Number, JSReceiver) { labels IfConstructByArrayLike(HeapObject, Object, JSReceiver) {
let bufferConstructor: JSReceiver = GetArrayBufferFunction(); let bufferConstructor: JSReceiver = GetArrayBufferFunction();
const srcBuffer: JSArrayBuffer = srcTypedArray.buffer; const srcBuffer: JSArrayBuffer = srcTypedArray.buffer;
// TODO(petermarshall): Throw on detached typedArray. // TODO(petermarshall): Throw on detached typedArray.
...@@ -210,7 +210,7 @@ namespace typed_array_createtypedarray { ...@@ -210,7 +210,7 @@ namespace typed_array_createtypedarray {
// 22.2.4.5 TypedArray ( buffer, byteOffset, length ) // 22.2.4.5 TypedArray ( buffer, byteOffset, length )
// ES #sec-typedarray-buffer-byteoffset-length // ES #sec-typedarray-buffer-byteoffset-length
transitioning macro ConstructByArrayBuffer(implicit context: Context)( transitioning macro ConstructByArrayBuffer(implicit context: Context)(
map: Map, buffer: JSArrayBuffer, byteOffset: JSAny, length: JSAny, map: Map, buffer: JSArrayBuffer, byteOffset: Object, length: Object,
elementsInfo: typed_array::TypedArrayElementsInfo): JSTypedArray { elementsInfo: typed_array::TypedArrayElementsInfo): JSTypedArray {
try { try {
let offset: uintptr = 0; let offset: uintptr = 0;
...@@ -294,7 +294,7 @@ namespace typed_array_createtypedarray { ...@@ -294,7 +294,7 @@ namespace typed_array_createtypedarray {
transitioning macro ConstructByJSReceiver(implicit context: transitioning macro ConstructByJSReceiver(implicit context:
Context)(obj: JSReceiver): never Context)(obj: JSReceiver): never
labels IfConstructByArrayLike(JSReceiver, Number, JSReceiver) { labels IfConstructByArrayLike(HeapObject, Object, JSReceiver) {
try { try {
const iteratorMethod: Object = const iteratorMethod: Object =
GetIteratorMethod(obj) otherwise IfIteratorUndefined; GetIteratorMethod(obj) otherwise IfIteratorUndefined;
...@@ -304,7 +304,7 @@ namespace typed_array_createtypedarray { ...@@ -304,7 +304,7 @@ namespace typed_array_createtypedarray {
otherwise IfConstructByArrayLike; otherwise IfConstructByArrayLike;
} }
label IfIteratorUndefined { label IfIteratorUndefined {
const lengthObj: JSAny = GetProperty(obj, kLengthString); const lengthObj: Object = GetProperty(obj, kLengthString);
const length: Smi = ToSmiLength(lengthObj) const length: Smi = ToSmiLength(lengthObj)
otherwise goto IfInvalidLength(lengthObj); otherwise goto IfInvalidLength(lengthObj);
goto IfConstructByArrayLike(obj, length, GetArrayBufferFunction()); goto IfConstructByArrayLike(obj, length, GetArrayBufferFunction());
...@@ -317,8 +317,8 @@ namespace typed_array_createtypedarray { ...@@ -317,8 +317,8 @@ namespace typed_array_createtypedarray {
// 22.2.4 The TypedArray Constructors // 22.2.4 The TypedArray Constructors
// ES #sec-typedarray-constructors // ES #sec-typedarray-constructors
transitioning builtin CreateTypedArray( transitioning builtin CreateTypedArray(
context: Context, target: JSFunction, newTarget: JSReceiver, arg1: JSAny, context: Context, target: JSFunction, newTarget: JSReceiver, arg1: Object,
arg2: JSAny, arg3: JSAny): JSTypedArray { arg2: Object, arg3: Object): JSTypedArray {
assert(IsConstructor(target)); assert(IsConstructor(target));
// 4. Let O be ? AllocateTypedArray(constructorName, NewTarget, // 4. Let O be ? AllocateTypedArray(constructorName, NewTarget,
// "%TypedArrayPrototype%"). // "%TypedArrayPrototype%").
...@@ -345,16 +345,16 @@ namespace typed_array_createtypedarray { ...@@ -345,16 +345,16 @@ namespace typed_array_createtypedarray {
} }
// The first argument was a number or fell through and is treated as // The first argument was a number or fell through and is treated as
// a number. https://tc39.github.io/ecma262/#sec-typedarray-length // a number. https://tc39.github.io/ecma262/#sec-typedarray-length
case (lengthObj: JSAny): { case (lengthObj: HeapObject): {
goto IfConstructByLength(lengthObj); goto IfConstructByLength(lengthObj);
} }
} }
} }
label IfConstructByLength(length: JSAny) { label IfConstructByLength(length: Object) {
return ConstructByLength(map, length, elementsInfo); return ConstructByLength(map, length, elementsInfo);
} }
label IfConstructByArrayLike( label IfConstructByArrayLike(
arrayLike: JSReceiver, length: Number, bufferConstructor: JSReceiver) { arrayLike: HeapObject, length: Object, bufferConstructor: JSReceiver) {
return ConstructByArrayLike( return ConstructByArrayLike(
map, arrayLike, length, elementsInfo, bufferConstructor); map, arrayLike, length, elementsInfo, bufferConstructor);
} }
...@@ -362,8 +362,8 @@ namespace typed_array_createtypedarray { ...@@ -362,8 +362,8 @@ namespace typed_array_createtypedarray {
transitioning macro TypedArraySpeciesCreate(implicit context: Context)( transitioning macro TypedArraySpeciesCreate(implicit context: Context)(
methodName: constexpr string, numArgs: constexpr int31, methodName: constexpr string, numArgs: constexpr int31,
exemplar: JSTypedArray, arg0: JSAny, arg1: JSAny, exemplar: JSTypedArray, arg0: Object, arg1: Object,
arg2: JSAny): JSTypedArray { arg2: Object): JSTypedArray {
const defaultConstructor = GetDefaultConstructor(exemplar); const defaultConstructor = GetDefaultConstructor(exemplar);
try { try {
...@@ -386,7 +386,7 @@ namespace typed_array_createtypedarray { ...@@ -386,7 +386,7 @@ namespace typed_array_createtypedarray {
// TODO(pwong): Simplify and remove numArgs when varargs are supported in // TODO(pwong): Simplify and remove numArgs when varargs are supported in
// macros. // macros.
let newObj: JSAny = Undefined; let newObj: Object = Undefined;
if constexpr (numArgs == 1) { if constexpr (numArgs == 1) {
newObj = Construct(constructor, arg0); newObj = Construct(constructor, arg0);
} else { } else {
......
src/builtins/typed-array-every.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace typed_array_every { ...@@ -9,7 +9,7 @@ namespace typed_array_every {
transitioning macro EveryAllElements(implicit context: Context)( transitioning macro EveryAllElements(implicit context: Context)(
array: typed_array::AttachedJSTypedArray, callbackfn: Callable, array: typed_array::AttachedJSTypedArray, callbackfn: Callable,
thisArg: JSAny): Boolean { thisArg: Object): Boolean {
let witness = typed_array::NewAttachedJSTypedArrayWitness(array); let witness = typed_array::NewAttachedJSTypedArrayWitness(array);
// TODO(v8:4153): Support huge TypedArrays here. // TODO(v8:4153): Support huge TypedArrays here.
const length = const length =
...@@ -17,7 +17,7 @@ namespace typed_array_every { ...@@ -17,7 +17,7 @@ namespace typed_array_every {
for (let k: Smi = 0; k < length; k++) { for (let k: Smi = 0; k < length; k++) {
// BUG(4895): We should throw on detached buffers rather than simply exit. // BUG(4895): We should throw on detached buffers rather than simply exit.
witness.Recheck() otherwise break; witness.Recheck() otherwise break;
const value: JSAny = witness.Load(k); const value: Object = witness.Load(k);
const result = const result =
Call(context, callbackfn, thisArg, value, k, witness.GetStable()); Call(context, callbackfn, thisArg, value, k, witness.GetStable());
if (!ToBoolean(result)) { if (!ToBoolean(result)) {
...@@ -29,7 +29,7 @@ namespace typed_array_every { ...@@ -29,7 +29,7 @@ namespace typed_array_every {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.every // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.every
transitioning javascript builtin transitioning javascript builtin
TypedArrayPrototypeEvery(js-implicit context: Context, receiver: JSAny)( TypedArrayPrototypeEvery(js-implicit context: Context, receiver: Object)(
...arguments): Object { ...arguments): Object {
// arguments[0] = callback // arguments[0] = callback
// arguments[1] = thisArg // arguments[1] = thisArg
......
src/builtins/typed-array-filter.tq
View file @ 4418a7b9
...@@ -10,7 +10,7 @@ namespace typed_array_filter { ...@@ -10,7 +10,7 @@ namespace typed_array_filter {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.filter // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.filter
transitioning javascript builtin TypedArrayPrototypeFilter( transitioning javascript builtin TypedArrayPrototypeFilter(
js-implicit context: Context, receiver: JSAny)(...arguments): Object { js-implicit context: Context, receiver: Object)(...arguments): Object {
// arguments[0] = callback // arguments[0] = callback
// arguments[1] = thisArg // arguments[1] = thisArg
try { try {
...@@ -29,7 +29,7 @@ namespace typed_array_filter { ...@@ -29,7 +29,7 @@ namespace typed_array_filter {
otherwise ThrowTypeError(kCalledNonCallable, arguments[0]); otherwise ThrowTypeError(kCalledNonCallable, arguments[0]);
// 5. If thisArg is present, let T be thisArg; else let T be undefined. // 5. If thisArg is present, let T be thisArg; else let T be undefined.
const thisArg: JSAny = arguments[1]; const thisArg: Object = arguments[1];
// 6. Let kept be a new empty List. // 6. Let kept be a new empty List.
let kept = growable_fixed_array::NewGrowableFixedArray(); let kept = growable_fixed_array::NewGrowableFixedArray();
...@@ -43,11 +43,11 @@ namespace typed_array_filter { ...@@ -43,11 +43,11 @@ namespace typed_array_filter {
// a. Let Pk be ! ToString(k). // a. Let Pk be ! ToString(k).
// b. Let kValue be ? Get(O, Pk). // b. Let kValue be ? Get(O, Pk).
const value: JSAny = witness.Load(k); const value: Object = witness.Load(k);
// c. Let selected be ToBoolean(? Call(callbackfn, T, « kValue, k, O // c. Let selected be ToBoolean(? Call(callbackfn, T, « kValue, k, O
// »)). // »)).
const selected: JSAny = const selected: Object =
Call(context, callbackfn, thisArg, value, k, witness.GetStable()); Call(context, callbackfn, thisArg, value, k, witness.GetStable());
// d. If selected is true, then // d. If selected is true, then
......
src/builtins/typed-array-find.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace typed_array_find { ...@@ -9,7 +9,7 @@ namespace typed_array_find {
transitioning macro FindAllElements(implicit context: Context)( transitioning macro FindAllElements(implicit context: Context)(
array: typed_array::AttachedJSTypedArray, callbackfn: Callable, array: typed_array::AttachedJSTypedArray, callbackfn: Callable,
thisArg: JSAny): Object { thisArg: Object): Object {
let witness = typed_array::NewAttachedJSTypedArrayWitness(array); let witness = typed_array::NewAttachedJSTypedArrayWitness(array);
// TODO(v8:4153): Support huge TypedArrays here. // TODO(v8:4153): Support huge TypedArrays here.
const length = const length =
...@@ -17,7 +17,7 @@ namespace typed_array_find { ...@@ -17,7 +17,7 @@ namespace typed_array_find {
for (let k: Smi = 0; k < length; k++) { for (let k: Smi = 0; k < length; k++) {
// BUG(4895): We should throw on detached buffers rather than simply exit. // BUG(4895): We should throw on detached buffers rather than simply exit.
witness.Recheck() otherwise break; witness.Recheck() otherwise break;
const value: JSAny = witness.Load(k); const value: Object = witness.Load(k);
const result = const result =
Call(context, callbackfn, thisArg, value, k, witness.GetStable()); Call(context, callbackfn, thisArg, value, k, witness.GetStable());
if (ToBoolean(result)) { if (ToBoolean(result)) {
...@@ -29,7 +29,7 @@ namespace typed_array_find { ...@@ -29,7 +29,7 @@ namespace typed_array_find {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.find // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.find
transitioning javascript builtin transitioning javascript builtin
TypedArrayPrototypeFind(js-implicit context: Context, receiver: JSAny)( TypedArrayPrototypeFind(js-implicit context: Context, receiver: Object)(
...arguments): Object { ...arguments): Object {
// arguments[0] = callback // arguments[0] = callback
// arguments[1] = thisArg // arguments[1] = thisArg
......
src/builtins/typed-array-findindex.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace typed_array_findindex { ...@@ -9,7 +9,7 @@ namespace typed_array_findindex {
transitioning macro FindIndexAllElements(implicit context: Context)( transitioning macro FindIndexAllElements(implicit context: Context)(
array: typed_array::AttachedJSTypedArray, callbackfn: Callable, array: typed_array::AttachedJSTypedArray, callbackfn: Callable,
thisArg: JSAny): Number { thisArg: Object): Number {
let witness = typed_array::NewAttachedJSTypedArrayWitness(array); let witness = typed_array::NewAttachedJSTypedArrayWitness(array);
// TODO(v8:4153): Support huge TypedArrays here. // TODO(v8:4153): Support huge TypedArrays here.
const length = const length =
...@@ -17,7 +17,7 @@ namespace typed_array_findindex { ...@@ -17,7 +17,7 @@ namespace typed_array_findindex {
for (let k: Smi = 0; k < length; k++) { for (let k: Smi = 0; k < length; k++) {
// BUG(4895): We should throw on detached buffers rather than simply exit. // BUG(4895): We should throw on detached buffers rather than simply exit.
witness.Recheck() otherwise break; witness.Recheck() otherwise break;
const value: JSAny = witness.Load(k); const value: Object = witness.Load(k);
const result = const result =
Call(context, callbackfn, thisArg, value, k, witness.GetStable()); Call(context, callbackfn, thisArg, value, k, witness.GetStable());
if (ToBoolean(result)) { if (ToBoolean(result)) {
...@@ -29,7 +29,7 @@ namespace typed_array_findindex { ...@@ -29,7 +29,7 @@ namespace typed_array_findindex {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.findIndex // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.findIndex
transitioning javascript builtin transitioning javascript builtin
TypedArrayPrototypeFindIndex(js-implicit context: Context, receiver: JSAny)( TypedArrayPrototypeFindIndex(js-implicit context: Context, receiver: Object)(
...arguments): Object { ...arguments): Object {
// arguments[0] = callback // arguments[0] = callback
// arguments[1] = thisArg. // arguments[1] = thisArg.
......
src/builtins/typed-array-foreach.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace typed_array_foreach { ...@@ -9,7 +9,7 @@ namespace typed_array_foreach {
transitioning macro ForEachAllElements(implicit context: Context)( transitioning macro ForEachAllElements(implicit context: Context)(
array: typed_array::AttachedJSTypedArray, callbackfn: Callable, array: typed_array::AttachedJSTypedArray, callbackfn: Callable,
thisArg: JSAny): Undefined { thisArg: Object): Object {
let witness = typed_array::NewAttachedJSTypedArrayWitness(array); let witness = typed_array::NewAttachedJSTypedArrayWitness(array);
// TODO(v8:4153): Support huge TypedArrays here. // TODO(v8:4153): Support huge TypedArrays here.
const length = const length =
...@@ -17,7 +17,7 @@ namespace typed_array_foreach { ...@@ -17,7 +17,7 @@ namespace typed_array_foreach {
for (let k: Smi = 0; k < length; k++) { for (let k: Smi = 0; k < length; k++) {
// BUG(4895): We should throw on detached buffers rather than simply exit. // BUG(4895): We should throw on detached buffers rather than simply exit.
witness.Recheck() otherwise break; witness.Recheck() otherwise break;
const value: JSAny = witness.Load(k); const value: Object = witness.Load(k);
Call(context, callbackfn, thisArg, value, k, witness.GetStable()); Call(context, callbackfn, thisArg, value, k, witness.GetStable());
} }
return Undefined; return Undefined;
...@@ -25,8 +25,8 @@ namespace typed_array_foreach { ...@@ -25,8 +25,8 @@ namespace typed_array_foreach {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.every // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.every
transitioning javascript builtin transitioning javascript builtin
TypedArrayPrototypeForEach(js-implicit context: Context, receiver: JSAny)( TypedArrayPrototypeForEach(js-implicit context: Context, receiver: Object)(
...arguments): Undefined { ...arguments): Object {
// arguments[0] = callback // arguments[0] = callback
// arguments[1] = this_arg. // arguments[1] = this_arg.
......
src/builtins/typed-array-reduce.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace typed_array_reduce { ...@@ -9,7 +9,7 @@ namespace typed_array_reduce {
transitioning macro ReduceAllElements(implicit context: Context)( transitioning macro ReduceAllElements(implicit context: Context)(
array: typed_array::AttachedJSTypedArray, callbackfn: Callable, array: typed_array::AttachedJSTypedArray, callbackfn: Callable,
initialValue: JSAny | TheHole): JSAny { initialValue: Object): Object {
let witness = typed_array::NewAttachedJSTypedArrayWitness(array); let witness = typed_array::NewAttachedJSTypedArrayWitness(array);
// TODO(v8:4153): Support huge TypedArrays here. // TODO(v8:4153): Support huge TypedArrays here.
const length = const length =
...@@ -18,31 +18,24 @@ namespace typed_array_reduce { ...@@ -18,31 +18,24 @@ namespace typed_array_reduce {
for (let k: Smi = 0; k < length; k++) { for (let k: Smi = 0; k < length; k++) {
// BUG(4895): We should throw on detached buffers rather than simply exit. // BUG(4895): We should throw on detached buffers rather than simply exit.
witness.Recheck() otherwise break; witness.Recheck() otherwise break;
const value: JSAny = witness.Load(k); const value: Object = witness.Load(k);
typeswitch (accumulator) { if (accumulator == TheHole) {
case (TheHole): {
accumulator = value; accumulator = value;
} } else {
case (accumulatorNotHole: JSAny): {
accumulator = Call( accumulator = Call(
context, callbackfn, Undefined, accumulatorNotHole, value, k, context, callbackfn, Undefined, accumulator, value, k,
witness.GetStable()); witness.GetStable());
} }
} }
} if (accumulator == TheHole) {
typeswitch (accumulator) {
case (TheHole): {
ThrowTypeError(kReduceNoInitial, kBuiltinName); ThrowTypeError(kReduceNoInitial, kBuiltinName);
} }
case (accumulator: JSAny): {
return accumulator; return accumulator;
} }
}
}
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.reduce // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.reduce
transitioning javascript builtin transitioning javascript builtin
TypedArrayPrototypeReduce(js-implicit context: Context, receiver: JSAny)( TypedArrayPrototypeReduce(js-implicit context: Context, receiver: Object)(
...arguments): Object { ...arguments): Object {
// arguments[0] = callback // arguments[0] = callback
// arguments[1] = initialValue. // arguments[1] = initialValue.
......
src/builtins/typed-array-reduceright.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace typed_array_reduceright { ...@@ -9,7 +9,7 @@ namespace typed_array_reduceright {
transitioning macro ReduceRightAllElements(implicit context: Context)( transitioning macro ReduceRightAllElements(implicit context: Context)(
array: typed_array::AttachedJSTypedArray, callbackfn: Callable, array: typed_array::AttachedJSTypedArray, callbackfn: Callable,
initialValue: JSAny | TheHole): JSAny { initialValue: Object): Object {
let witness = typed_array::NewAttachedJSTypedArrayWitness(array); let witness = typed_array::NewAttachedJSTypedArrayWitness(array);
// TODO(v8:4153): Support huge TypedArrays here. // TODO(v8:4153): Support huge TypedArrays here.
const length = const length =
...@@ -18,32 +18,25 @@ namespace typed_array_reduceright { ...@@ -18,32 +18,25 @@ namespace typed_array_reduceright {
for (let k: Smi = length - 1; k >= 0; k--) { for (let k: Smi = length - 1; k >= 0; k--) {
// BUG(4895): We should throw on detached buffers rather than simply exit. // BUG(4895): We should throw on detached buffers rather than simply exit.
witness.Recheck() otherwise break; witness.Recheck() otherwise break;
const value: JSAny = witness.Load(k); const value: Object = witness.Load(k);
typeswitch (accumulator) { if (accumulator == TheHole) {
case (TheHole): {
accumulator = value; accumulator = value;
} } else {
case (accumulatorNotHole: JSAny): {
accumulator = Call( accumulator = Call(
context, callbackfn, Undefined, accumulatorNotHole, value, k, context, callbackfn, Undefined, accumulator, value, k,
witness.GetStable()); witness.GetStable());
} }
} }
} if (accumulator == TheHole) {
typeswitch (accumulator) {
case (TheHole): {
ThrowTypeError(kReduceNoInitial, kBuiltinName); ThrowTypeError(kReduceNoInitial, kBuiltinName);
} }
case (accumulator: JSAny): {
return accumulator; return accumulator;
} }
}
}
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.reduceright // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.reduceright
transitioning javascript builtin transitioning javascript builtin
TypedArrayPrototypeReduceRight(js-implicit context: Context, receiver: JSAny)( TypedArrayPrototypeReduceRight(
...arguments): Object { js-implicit context: Context, receiver: Object)(...arguments): Object {
// arguments[0] = callback // arguments[0] = callback
// arguments[1] = initialValue. // arguments[1] = initialValue.
try { try {
......
src/builtins/typed-array-slice.tq
View file @ 4418a7b9
...@@ -53,7 +53,7 @@ namespace typed_array_slice { ...@@ -53,7 +53,7 @@ namespace typed_array_slice {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.slice // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.slice
transitioning javascript builtin TypedArrayPrototypeSlice( transitioning javascript builtin TypedArrayPrototypeSlice(
js-implicit context: Context, receiver: JSAny)(...arguments): Object { js-implicit context: Context, receiver: Object)(...arguments): Object {
// arguments[0] = start // arguments[0] = start
// arguments[1] = end // arguments[1] = end
......
src/builtins/typed-array-some.tq
View file @ 4418a7b9
...@@ -9,7 +9,7 @@ namespace typed_array_some { ...@@ -9,7 +9,7 @@ namespace typed_array_some {
transitioning macro SomeAllElements(implicit context: Context)( transitioning macro SomeAllElements(implicit context: Context)(
array: typed_array::AttachedJSTypedArray, callbackfn: Callable, array: typed_array::AttachedJSTypedArray, callbackfn: Callable,
thisArg: JSAny): Boolean { thisArg: Object): Boolean {
let witness = typed_array::NewAttachedJSTypedArrayWitness(array); let witness = typed_array::NewAttachedJSTypedArrayWitness(array);
// TODO(v8:4153): Support huge TypedArrays here. // TODO(v8:4153): Support huge TypedArrays here.
const length = const length =
...@@ -17,7 +17,7 @@ namespace typed_array_some { ...@@ -17,7 +17,7 @@ namespace typed_array_some {
for (let k: Smi = 0; k < length; k++) { for (let k: Smi = 0; k < length; k++) {
// BUG(4895): We should throw on detached buffers rather than simply exit. // BUG(4895): We should throw on detached buffers rather than simply exit.
witness.Recheck() otherwise break; witness.Recheck() otherwise break;
const value: JSAny = witness.Load(k); const value: Object = witness.Load(k);
const result = const result =
Call(context, callbackfn, thisArg, value, k, witness.GetStable()); Call(context, callbackfn, thisArg, value, k, witness.GetStable());
if (ToBoolean(result)) { if (ToBoolean(result)) {
...@@ -29,7 +29,7 @@ namespace typed_array_some { ...@@ -29,7 +29,7 @@ namespace typed_array_some {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.some // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.some
transitioning javascript builtin transitioning javascript builtin
TypedArrayPrototypeSome(js-implicit context: Context, receiver: JSAny)( TypedArrayPrototypeSome(js-implicit context: Context, receiver: Object)(
...arguments): Object { ...arguments): Object {
// arguments[0] = callback // arguments[0] = callback
// arguments[1] = thisArg. // arguments[1] = thisArg.
......
src/builtins/typed-array-subarray.tq
View file @ 4418a7b9
...@@ -6,7 +6,7 @@ namespace typed_array_subarray { ...@@ -6,7 +6,7 @@ namespace typed_array_subarray {
// ES %TypedArray%.prototype.subarray // ES %TypedArray%.prototype.subarray
transitioning javascript builtin TypedArrayPrototypeSubArray( transitioning javascript builtin TypedArrayPrototypeSubArray(
js-implicit context: Context, js-implicit context: Context,
receiver: JSAny)(...arguments): JSTypedArray { receiver: Object)(...arguments): JSTypedArray {
const methodName: constexpr string = '%TypedArray%.prototype.subarray'; const methodName: constexpr string = '%TypedArray%.prototype.subarray';
// 1. Let O be the this value. // 1. Let O be the this value.
......
src/builtins/typed-array.tq
View file @ 4418a7b9
...@@ -51,9 +51,9 @@ namespace typed_array { ...@@ -51,9 +51,9 @@ namespace typed_array {
sizeLog2: uintptr; sizeLog2: uintptr;
kind: ElementsKind; kind: ElementsKind;
} }
extern runtime TypedArraySortFast(Context, JSAny): JSTypedArray; extern runtime TypedArraySortFast(Context, Object): JSTypedArray;
extern macro TypedArrayBuiltinsAssembler::ValidateTypedArray( extern macro TypedArrayBuiltinsAssembler::ValidateTypedArray(
Context, JSAny, constexpr string): JSTypedArray; Context, Object, constexpr string): JSTypedArray;
extern macro TypedArrayBuiltinsAssembler::CallCMemcpy( extern macro TypedArrayBuiltinsAssembler::CallCMemcpy(
RawPtr, RawPtr, uintptr): void; RawPtr, RawPtr, uintptr): void;
...@@ -72,10 +72,10 @@ namespace typed_array { ...@@ -72,10 +72,10 @@ namespace typed_array {
extern macro LoadFixedTypedArrayElementAsTagged( extern macro LoadFixedTypedArrayElementAsTagged(
RawPtr, Smi, constexpr ElementsKind): Numeric; RawPtr, Smi, constexpr ElementsKind): Numeric;
extern macro StoreJSTypedArrayElementFromTagged( extern macro StoreJSTypedArrayElementFromTagged(
Context, JSTypedArray, Smi, JSAny, constexpr ElementsKind); Context, JSTypedArray, Smi, Object, constexpr ElementsKind);
type LoadFn = builtin(Context, JSTypedArray, Smi) => JSAny; type LoadFn = builtin(Context, JSTypedArray, Smi) => Object;
type StoreFn = builtin(Context, JSTypedArray, Smi, JSAny) => JSAny; type StoreFn = builtin(Context, JSTypedArray, Smi, Object) => Object;
// AttachedJSTypedArray guards that the array's buffer is not detached. // AttachedJSTypedArray guards that the array's buffer is not detached.
transient type AttachedJSTypedArray extends JSTypedArray; transient type AttachedJSTypedArray extends JSTypedArray;
...@@ -100,7 +100,7 @@ namespace typed_array { ...@@ -100,7 +100,7 @@ namespace typed_array {
this.unstable = %RawDownCast<AttachedJSTypedArray>(this.stable); this.unstable = %RawDownCast<AttachedJSTypedArray>(this.stable);
} }
Load(implicit context: Context)(k: Smi): JSAny { Load(implicit context: Context)(k: Smi): Object {
const lf: LoadFn = this.loadfn; const lf: LoadFn = this.loadfn;
return lf(context, this.unstable, k); return lf(context, this.unstable, k);
} }
...@@ -190,14 +190,14 @@ namespace typed_array { ...@@ -190,14 +190,14 @@ namespace typed_array {
} }
builtin LoadFixedElement<T: type>( builtin LoadFixedElement<T: type>(
_context: Context, array: JSTypedArray, index: Smi): JSAny { _context: Context, array: JSTypedArray, index: Smi): Object {
return LoadFixedTypedArrayElementAsTagged( return LoadFixedTypedArrayElementAsTagged(
array.data_ptr, index, KindForArrayType<T>()); array.data_ptr, index, KindForArrayType<T>());
} }
builtin StoreFixedElement<T: type>( builtin StoreFixedElement<T: type>(
context: Context, typedArray: JSTypedArray, index: Smi, context: Context, typedArray: JSTypedArray, index: Smi,
value: JSAny): JSAny { value: Object): Object {
StoreJSTypedArrayElementFromTagged( StoreJSTypedArrayElementFromTagged(
context, typedArray, index, value, KindForArrayType<T>()); context, typedArray, index, value, KindForArrayType<T>());
return Undefined; return Undefined;
...@@ -205,7 +205,7 @@ namespace typed_array { ...@@ -205,7 +205,7 @@ namespace typed_array {
transitioning macro CallCompare( transitioning macro CallCompare(
implicit context: Context, array: JSTypedArray, implicit context: Context, array: JSTypedArray,
comparefn: Callable)(a: JSAny, b: JSAny): Number { comparefn: Callable)(a: Object, b: Object): Number {
// a. Let v be ? ToNumber(? Call(comparefn, undefined, x, y)). // a. Let v be ? ToNumber(? Call(comparefn, undefined, x, y)).
const v: Number = const v: Number =
ToNumber_Inline(context, Call(context, comparefn, Undefined, a, b)); ToNumber_Inline(context, Call(context, comparefn, Undefined, a, b));
...@@ -238,8 +238,8 @@ namespace typed_array { ...@@ -238,8 +238,8 @@ namespace typed_array {
target.objects[targetIndex] = source.objects[left++]; target.objects[targetIndex] = source.objects[left++];
} else if (left < middle) { } else if (left < middle) {
// If both have elements, we need to compare. // If both have elements, we need to compare.
const leftElement = UnsafeCast<JSAny>(source.objects[left]); const leftElement: Object = source.objects[left];
const rightElement = UnsafeCast<JSAny>(source.objects[right]); const rightElement: Object = source.objects[right];
if (CallCompare(leftElement, rightElement) <= 0) { if (CallCompare(leftElement, rightElement) <= 0) {
target.objects[targetIndex] = leftElement; target.objects[targetIndex] = leftElement;
left++; left++;
...@@ -259,7 +259,7 @@ namespace typed_array { ...@@ -259,7 +259,7 @@ namespace typed_array {
transitioning builtin transitioning builtin
TypedArrayMergeSort( TypedArrayMergeSort(
implicit context: Context, array: JSTypedArray, comparefn: Callable)( implicit context: Context, array: JSTypedArray, comparefn: Callable)(
source: FixedArray, from: Smi, to: Smi, target: FixedArray): JSAny { source: FixedArray, from: Smi, to: Smi, target: FixedArray): Object {
assert(to - from > 1); assert(to - from > 1);
const middle: Smi = from + ((to - from) >> 1); const middle: Smi = from + ((to - from) >> 1);
...@@ -277,16 +277,17 @@ namespace typed_array { ...@@ -277,16 +277,17 @@ namespace typed_array {
// https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.sort // https://tc39.github.io/ecma262/#sec-%typedarray%.prototype.sort
transitioning javascript builtin TypedArrayPrototypeSort( transitioning javascript builtin TypedArrayPrototypeSort(
js-implicit context: Context, js-implicit context: Context,
receiver: JSAny)(...arguments): JSTypedArray { receiver: Object)(...arguments): JSTypedArray {
// 1. If comparefn is not undefined and IsCallable(comparefn) is false, // 1. If comparefn is not undefined and IsCallable(comparefn) is false,
// throw a TypeError exception. // throw a TypeError exception.
const comparefnObj: JSAny = arguments.length > 0 ? arguments[0] : Undefined; const comparefnObj: Object =
arguments.length > 0 ? arguments[0] : Undefined;
if (comparefnObj != Undefined && !TaggedIsCallable(comparefnObj)) { if (comparefnObj != Undefined && !TaggedIsCallable(comparefnObj)) {
ThrowTypeError(kBadSortComparisonFunction, comparefnObj); ThrowTypeError(kBadSortComparisonFunction, comparefnObj);
} }
// 2. Let obj be the this value. // 2. Let obj be the this value.
const obj: JSAny = receiver; const obj: Object = receiver;
// 3. Let buffer be ? ValidateTypedArray(obj). // 3. Let buffer be ? ValidateTypedArray(obj).
// ValidateTypedArray currently returns the array, not the ViewBuffer. // ValidateTypedArray currently returns the array, not the ViewBuffer.
...@@ -362,7 +363,7 @@ namespace typed_array { ...@@ -362,7 +363,7 @@ namespace typed_array {
const work2: FixedArray = AllocateZeroedFixedArray(Convert<intptr>(len)); const work2: FixedArray = AllocateZeroedFixedArray(Convert<intptr>(len));
for (let i: Smi = 0; i < len; ++i) { for (let i: Smi = 0; i < len; ++i) {
const element: JSAny = loadfn(context, array, i); const element: Object = loadfn(context, array, i);
work1.objects[i] = element; work1.objects[i] = element;
work2.objects[i] = element; work2.objects[i] = element;
} }
...@@ -371,7 +372,7 @@ namespace typed_array { ...@@ -371,7 +372,7 @@ namespace typed_array {
// work1 contains the sorted numbers. Write them back. // work1 contains the sorted numbers. Write them back.
for (let i: Smi = 0; i < len; ++i) for (let i: Smi = 0; i < len; ++i)
storefn(context, array, i, UnsafeCast<JSAny>(work1.objects[i])); storefn(context, array, i, work1.objects[i]);
return array; return array;
} }
......
src/objects/objects-inl.h
View file @ 4418a7b9
...@@ -133,13 +133,6 @@ bool Object::IsNullOrUndefined() const { ...@@ -133,13 +133,6 @@ bool Object::IsNullOrUndefined() const {
bool Object::IsZero() const { return *this == Smi::zero(); } bool Object::IsZero() const { return *this == Smi::zero(); }
bool Object::IsPublicSymbol() const {
return IsSymbol() && !Symbol::cast(*this).is_private();
}
bool Object::IsPrivateSymbol() const {
return IsSymbol() && Symbol::cast(*this).is_private();
}
bool Object::IsNoSharedNameSentinel() const { bool Object::IsNoSharedNameSentinel() const {
return *this == SharedFunctionInfo::kNoSharedNameSentinel; return *this == SharedFunctionInfo::kNoSharedNameSentinel;
} }
......
src/objects/objects.h
View file @ 4418a7b9
...@@ -289,8 +289,6 @@ class Object : public TaggedImpl<HeapObjectReferenceType::STRONG, Address> { ...@@ -289,8 +289,6 @@ class Object : public TaggedImpl<HeapObjectReferenceType::STRONG, Address> {
V8_INLINE bool IsZero() const; V8_INLINE bool IsZero() const;
V8_INLINE bool IsNoSharedNameSentinel() const; V8_INLINE bool IsNoSharedNameSentinel() const;
V8_INLINE bool IsPrivateSymbol() const;
V8_INLINE bool IsPublicSymbol() const;
enum class Conversion { kToNumber, kToNumeric }; enum class Conversion { kToNumber, kToNumeric };
......
src/torque/constants.h
View file @ 4418a7b9
...@@ -28,7 +28,6 @@ static const char* const JS_FUNCTION_TYPE_STRING = "JSFunction"; ...@@ -28,7 +28,6 @@ static const char* const JS_FUNCTION_TYPE_STRING = "JSFunction";
static const char* const MAP_TYPE_STRING = "Map"; static const char* const MAP_TYPE_STRING = "Map";
static const char* const OBJECT_TYPE_STRING = "Object"; static const char* const OBJECT_TYPE_STRING = "Object";
static const char* const HEAP_OBJECT_TYPE_STRING = "HeapObject"; static const char* const HEAP_OBJECT_TYPE_STRING = "HeapObject";
static const char* const JSANY_TYPE_STRING = "JSAny";
static const char* const JSOBJECT_TYPE_STRING = "JSObject"; static const char* const JSOBJECT_TYPE_STRING = "JSObject";
static const char* const SMI_TYPE_STRING = "Smi"; static const char* const SMI_TYPE_STRING = "Smi";
static const char* const TAGGED_TYPE_STRING = "Tagged"; static const char* const TAGGED_TYPE_STRING = "Tagged";
......
src/torque/implementation-visitor.cc
View file @ 4418a7b9
...@@ -468,13 +468,13 @@ void ImplementationVisitor::Visit(Builtin* builtin) { ...@@ -468,13 +468,13 @@ void ImplementationVisitor::Visit(Builtin* builtin) {
: "UncheckedCast<Object>(Parameter(Descriptor::kReceiver))") : "UncheckedCast<Object>(Parameter(Descriptor::kReceiver))")
<< ";\n"; << ";\n";
source_out() << "USE(" << generated_name << ");\n"; source_out() << "USE(" << generated_name << ");\n";
expected_type = TypeOracle::GetJSAnyType(); expected_type = TypeOracle::GetObjectType();
} else if (param_name == "newTarget") { } else if (param_name == "newTarget") {
source_out() << " TNode<Object> " << generated_name source_out() << " TNode<Object> " << generated_name
<< " = UncheckedCast<Object>(Parameter(" << " = UncheckedCast<Object>(Parameter("
<< "Descriptor::kJSNewTarget));\n"; << "Descriptor::kJSNewTarget));\n";
source_out() << "USE(" << generated_name << ");\n"; source_out() << "USE(" << generated_name << ");\n";
expected_type = TypeOracle::GetJSAnyType(); expected_type = TypeOracle::GetObjectType();
} else if (param_name == "target") { } else if (param_name == "target") {
source_out() << " TNode<JSFunction> " << generated_name source_out() << " TNode<JSFunction> " << generated_name
<< " = UncheckedCast<JSFunction>(Parameter(" << " = UncheckedCast<JSFunction>(Parameter("
...@@ -2264,10 +2264,9 @@ VisitResult ImplementationVisitor::GenerateCall( ...@@ -2264,10 +2264,9 @@ VisitResult ImplementationVisitor::GenerateCall(
size_t j = 0; size_t j = 0;
for (auto t : callable->signature().labels[i].types) { for (auto t : callable->signature().labels[i].types) {
const Type* parameter_type = label->parameter_types[j]; const Type* parameter_type = label->parameter_types[j];
if (!t->IsSubtypeOf(parameter_type)) { if (parameter_type != t) {
ReportError("mismatch of label parameters (label expects ", ReportError("mismatch of label parameters (expected ", *t, " got ",
*parameter_type, " but macro produces ", *t, parameter_type, " for parameter ", i + 1, ")");
" for parameter ", i + 1, ")");
} }
j++; j++;
} }
......
src/torque/instructions.cc
View file @ 4418a7b9
...@@ -133,7 +133,7 @@ void CallCsaMacroInstruction::TypeInstruction(Stack<const Type*>* stack, ...@@ -133,7 +133,7 @@ void CallCsaMacroInstruction::TypeInstruction(Stack<const Type*>* stack,
if (catch_block) { if (catch_block) {
Stack<const Type*> catch_stack = *stack; Stack<const Type*> catch_stack = *stack;
catch_stack.Push(TypeOracle::GetJSAnyType()); catch_stack.Push(TypeOracle::GetObjectType());
(*catch_block)->SetInputTypes(catch_stack); (*catch_block)->SetInputTypes(catch_stack);
} }
...@@ -170,7 +170,7 @@ void CallCsaMacroAndBranchInstruction::TypeInstruction( ...@@ -170,7 +170,7 @@ void CallCsaMacroAndBranchInstruction::TypeInstruction(
if (catch_block) { if (catch_block) {
Stack<const Type*> catch_stack = *stack; Stack<const Type*> catch_stack = *stack;
catch_stack.Push(TypeOracle::GetJSAnyType()); catch_stack.Push(TypeOracle::GetObjectType());
(*catch_block)->SetInputTypes(catch_stack); (*catch_block)->SetInputTypes(catch_stack);
} }
...@@ -201,7 +201,7 @@ void CallBuiltinInstruction::TypeInstruction(Stack<const Type*>* stack, ...@@ -201,7 +201,7 @@ void CallBuiltinInstruction::TypeInstruction(Stack<const Type*>* stack,
if (catch_block) { if (catch_block) {
Stack<const Type*> catch_stack = *stack; Stack<const Type*> catch_stack = *stack;
catch_stack.Push(TypeOracle::GetJSAnyType()); catch_stack.Push(TypeOracle::GetObjectType());
(*catch_block)->SetInputTypes(catch_stack); (*catch_block)->SetInputTypes(catch_stack);
} }
...@@ -236,7 +236,7 @@ void CallRuntimeInstruction::TypeInstruction(Stack<const Type*>* stack, ...@@ -236,7 +236,7 @@ void CallRuntimeInstruction::TypeInstruction(Stack<const Type*>* stack,
if (catch_block) { if (catch_block) {
Stack<const Type*> catch_stack = *stack; Stack<const Type*> catch_stack = *stack;
catch_stack.Push(TypeOracle::GetJSAnyType()); catch_stack.Push(TypeOracle::GetObjectType());
(*catch_block)->SetInputTypes(catch_stack); (*catch_block)->SetInputTypes(catch_stack);
} }
......
src/torque/torque-parser.cc
View file @ 4418a7b9
...@@ -1136,7 +1136,7 @@ base::Optional<ParseResult> MakeCatchBlock(ParseResultIterator* child_results) { ...@@ -1136,7 +1136,7 @@ base::Optional<ParseResult> MakeCatchBlock(ParseResultIterator* child_results) {
ParameterList parameters; ParameterList parameters;
parameters.names.push_back(MakeNode<Identifier>(variable)); parameters.names.push_back(MakeNode<Identifier>(variable));
parameters.types.push_back(MakeNode<BasicTypeExpression>( parameters.types.push_back(MakeNode<BasicTypeExpression>(
std::vector<std::string>{}, "JSAny", std::vector<TypeExpression*>{})); std::vector<std::string>{}, "Object", std::vector<TypeExpression*>{}));
parameters.has_varargs = false; parameters.has_varargs = false;
LabelBlock* result = MakeNode<LabelBlock>( LabelBlock* result = MakeNode<LabelBlock>(
MakeNode<Identifier>(kCatchLabelName), std::move(parameters), body); MakeNode<Identifier>(kCatchLabelName), std::move(parameters), body);
......
src/torque/type-oracle.h
View file @ 4418a7b9
...@@ -143,10 +143,6 @@ class TypeOracle : public ContextualClass<TypeOracle> { ...@@ -143,10 +143,6 @@ class TypeOracle : public ContextualClass<TypeOracle> {
return Get().GetBuiltinType(HEAP_OBJECT_TYPE_STRING); return Get().GetBuiltinType(HEAP_OBJECT_TYPE_STRING);
} }
static const Type* GetJSAnyType() {
return Get().GetBuiltinType(JSANY_TYPE_STRING);
}
static const Type* GetJSObjectType() { static const Type* GetJSObjectType() {
return Get().GetBuiltinType(JSOBJECT_TYPE_STRING); return Get().GetBuiltinType(JSOBJECT_TYPE_STRING);
} }
......
test/torque/test-torque.tq
View file @ 4418a7b9
...@@ -83,11 +83,11 @@ namespace test { ...@@ -83,11 +83,11 @@ namespace test {
} }
} }
builtin GenericBuiltinTest<T: type>(_c: Context, _param: T): JSAny { builtin GenericBuiltinTest<T: type>(_c: Context, _param: T): Object {
return Null; return Null;
} }
GenericBuiltinTest<JSAny>(_c: Context, param: JSAny): JSAny { GenericBuiltinTest<Object>(_c: Context, param: Object): Object {
return param; return param;
} }
...@@ -95,8 +95,8 @@ namespace test { ...@@ -95,8 +95,8 @@ namespace test {
macro TestBuiltinSpecialization(c: Context) { macro TestBuiltinSpecialization(c: Context) {
check(GenericBuiltinTest<Smi>(c, 0) == Null); check(GenericBuiltinTest<Smi>(c, 0) == Null);
check(GenericBuiltinTest<Smi>(c, 1) == Null); check(GenericBuiltinTest<Smi>(c, 1) == Null);
check(GenericBuiltinTest<JSAny>(c, Undefined) == Undefined); check(GenericBuiltinTest<Object>(c, Undefined) == Undefined);
check(GenericBuiltinTest<JSAny>(c, Undefined) == Undefined); check(GenericBuiltinTest<Object>(c, Undefined) == Undefined);
} }
macro LabelTestHelper4(flag: constexpr bool): never macro LabelTestHelper4(flag: constexpr bool): never
...@@ -202,8 +202,9 @@ namespace test { ...@@ -202,8 +202,9 @@ namespace test {
@export @export
macro TestFunctionPointerToGeneric(c: Context) { macro TestFunctionPointerToGeneric(c: Context) {
const fptr1: builtin(Context, Smi) => JSAny = GenericBuiltinTest<Smi>; const fptr1: builtin(Context, Smi) => Object = GenericBuiltinTest<Smi>;
const fptr2: builtin(Context, JSAny) => JSAny = GenericBuiltinTest<JSAny>; const fptr2: builtin(Context, Object) => Object =
GenericBuiltinTest<Object>;
check(fptr1(c, 0) == Null); check(fptr1(c, 0) == Null);
check(fptr1(c, 1) == Null); check(fptr1(c, 1) == Null);
...@@ -211,7 +212,7 @@ namespace test { ...@@ -211,7 +212,7 @@ namespace test {
check(fptr2(c, Undefined) == Undefined); check(fptr2(c, Undefined) == Undefined);
} }
type ObjectToObject = builtin(Context, JSAny) => JSAny; type ObjectToObject = builtin(Context, Object) => Object;
@export @export
macro TestTypeAlias(x: ObjectToObject): BuiltinPtr { macro TestTypeAlias(x: ObjectToObject): BuiltinPtr {
return x; return x;
...@@ -451,7 +452,7 @@ namespace test { ...@@ -451,7 +452,7 @@ namespace test {
@export @export
macro TestSubtyping(x: Smi) { macro TestSubtyping(x: Smi) {
const _foo: JSAny = x; const _foo: Object = x;
} }
macro IncrementIfSmi<A: type>(x: A): A { macro IncrementIfSmi<A: type>(x: A): A {
...@@ -626,7 +627,7 @@ namespace test { ...@@ -626,7 +627,7 @@ namespace test {
@export @export
macro TestQualifiedAccess(implicit context: Context)() { macro TestQualifiedAccess(implicit context: Context)() {
const s: Smi = 0; const s: Smi = 0;
check(!Is<JSArray>(s)); check(!array::IsJSArray(s));
} }
@export @export
...@@ -684,14 +685,14 @@ namespace test { ...@@ -684,14 +685,14 @@ namespace test {
@export @export
macro TestIterator(implicit context: Context)(o: JSReceiver, map: Map) { macro TestIterator(implicit context: Context)(o: JSReceiver, map: Map) {
try { try {
const t1: JSAny = iterator::GetIteratorMethod(o); const t1: Object = iterator::GetIteratorMethod(o);
const t2: iterator::IteratorRecord = iterator::GetIterator(o); const t2: iterator::IteratorRecord = iterator::GetIterator(o);
const _t3: JSAny = iterator::IteratorStep(t2) otherwise Fail; const _t3: Object = iterator::IteratorStep(t2) otherwise Fail;
const _t4: JSAny = iterator::IteratorStep(t2, map) otherwise Fail; const _t4: Object = iterator::IteratorStep(t2, map) otherwise Fail;
const t5: JSAny = iterator::IteratorValue(o); const t5: Object = iterator::IteratorValue(o);
const _t6: JSAny = iterator::IteratorValue(o, map); const _t6: Object = iterator::IteratorValue(o, map);
const _t7: JSArray = iterator::IterableToList(t1, t1); const _t7: JSArray = iterator::IterableToList(t1, t1);
......
third_party/v8/builtins/array-sort.tq
View file @ 4418a7b9
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
namespace array { namespace array {
class SortState extends Struct { class SortState extends Struct {
Compare(implicit context: Context)(x: JSAny, y: JSAny): Number { Compare(implicit context: Context)(x: Object, y: Object): Number {
const sortCompare: CompareBuiltinFn = this.sortComparePtr; const sortCompare: CompareBuiltinFn = this.sortComparePtr;
return sortCompare(context, this.userCmpFn, x, y); return sortCompare(context, this.userCmpFn, x, y);
} }
...@@ -214,12 +214,12 @@ namespace array { ...@@ -214,12 +214,12 @@ namespace array {
// it is first requested, but it has always at least this size. // it is first requested, but it has always at least this size.
const kSortStateTempSize: Smi = 32; const kSortStateTempSize: Smi = 32;
type LoadFn = builtin(Context, SortState, Smi) => (JSAny | TheHole); type LoadFn = builtin(Context, SortState, Smi) => Object;
type StoreFn = builtin(Context, SortState, Smi, JSAny) => Smi; type StoreFn = builtin(Context, SortState, Smi, Object) => Smi;
type DeleteFn = builtin(Context, SortState, Smi) => Smi; type DeleteFn = builtin(Context, SortState, Smi) => Smi;
type CanUseSameAccessorFn = builtin(Context, JSReceiver, Map, Number) => type CanUseSameAccessorFn = builtin(Context, JSReceiver, Object, Number) =>
Boolean; Boolean;
type CompareBuiltinFn = builtin(Context, JSAny, JSAny, JSAny) => Number; type CompareBuiltinFn = builtin(Context, Object, Object, Object) => Number;
// The following builtins implement Load/Store for all the Accessors. // The following builtins implement Load/Store for all the Accessors.
// The most generic baseline version uses Get-/SetProperty. We do not need // The most generic baseline version uses Get-/SetProperty. We do not need
...@@ -228,28 +228,28 @@ namespace array { ...@@ -228,28 +228,28 @@ namespace array {
// through a hole. // through a hole.
transitioning builtin Load<ElementsAccessor: type>( transitioning builtin Load<ElementsAccessor: type>(
context: Context, sortState: SortState, index: Smi): JSAny | TheHole { context: Context, sortState: SortState, index: Smi): Object {
const receiver = sortState.receiver; const receiver = sortState.receiver;
if (!HasProperty_Inline(receiver, index)) return TheHole; if (!HasProperty_Inline(receiver, index)) return TheHole;
return GetProperty(receiver, index); return GetProperty(receiver, index);
} }
Load<FastSmiElements>(context: Context, sortState: SortState, index: Smi): Load<FastSmiElements>(context: Context, sortState: SortState, index: Smi):
JSAny | TheHole { Object {
const object = UnsafeCast<JSObject>(sortState.receiver); const object = UnsafeCast<JSObject>(sortState.receiver);
const elements = UnsafeCast<FixedArray>(object.elements); const elements = UnsafeCast<FixedArray>(object.elements);
return UnsafeCast<(JSAny | TheHole)>(elements.objects[index]); return elements.objects[index];
} }
Load<FastObjectElements>(context: Context, sortState: SortState, index: Smi): Load<FastObjectElements>(context: Context, sortState: SortState, index: Smi):
JSAny | TheHole { Object {
const object = UnsafeCast<JSObject>(sortState.receiver); const object = UnsafeCast<JSObject>(sortState.receiver);
const elements = UnsafeCast<FixedArray>(object.elements); const elements = UnsafeCast<FixedArray>(object.elements);
return UnsafeCast<(JSAny | TheHole)>(elements.objects[index]); return elements.objects[index];
} }
Load<FastDoubleElements>(context: Context, sortState: SortState, index: Smi): Load<FastDoubleElements>(context: Context, sortState: SortState, index: Smi):
JSAny | TheHole { Object {
try { try {
const object = UnsafeCast<JSObject>(sortState.receiver); const object = UnsafeCast<JSObject>(sortState.receiver);
const elements = UnsafeCast<FixedDoubleArray>(object.elements); const elements = UnsafeCast<FixedDoubleArray>(object.elements);
...@@ -262,13 +262,13 @@ namespace array { ...@@ -262,13 +262,13 @@ namespace array {
} }
transitioning builtin Store<ElementsAccessor: type>( transitioning builtin Store<ElementsAccessor: type>(
context: Context, sortState: SortState, index: Smi, value: JSAny): Smi { context: Context, sortState: SortState, index: Smi, value: Object): Smi {
SetProperty(sortState.receiver, index, value); SetProperty(sortState.receiver, index, value);
return kSuccess; return kSuccess;
} }
Store<FastSmiElements>( Store<FastSmiElements>(
context: Context, sortState: SortState, index: Smi, value: JSAny): Smi { context: Context, sortState: SortState, index: Smi, value: Object): Smi {
const object = UnsafeCast<JSObject>(sortState.receiver); const object = UnsafeCast<JSObject>(sortState.receiver);
const elements = UnsafeCast<FixedArray>(object.elements); const elements = UnsafeCast<FixedArray>(object.elements);
const value = UnsafeCast<Smi>(value); const value = UnsafeCast<Smi>(value);
...@@ -277,7 +277,7 @@ namespace array { ...@@ -277,7 +277,7 @@ namespace array {
} }
Store<FastObjectElements>( Store<FastObjectElements>(
context: Context, sortState: SortState, index: Smi, value: JSAny): Smi { context: Context, sortState: SortState, index: Smi, value: Object): Smi {
const object = UnsafeCast<JSObject>(sortState.receiver); const object = UnsafeCast<JSObject>(sortState.receiver);
const elements = UnsafeCast<FixedArray>(object.elements); const elements = UnsafeCast<FixedArray>(object.elements);
elements.objects[index] = value; elements.objects[index] = value;
...@@ -285,7 +285,7 @@ namespace array { ...@@ -285,7 +285,7 @@ namespace array {
} }
Store<FastDoubleElements>( Store<FastDoubleElements>(
context: Context, sortState: SortState, index: Smi, value: JSAny): Smi { context: Context, sortState: SortState, index: Smi, value: Object): Smi {
const object = UnsafeCast<JSObject>(sortState.receiver); const object = UnsafeCast<JSObject>(sortState.receiver);
const elements = UnsafeCast<FixedDoubleArray>(object.elements); const elements = UnsafeCast<FixedDoubleArray>(object.elements);
const heapVal = UnsafeCast<HeapNumber>(value); const heapVal = UnsafeCast<HeapNumber>(value);
...@@ -333,7 +333,7 @@ namespace array { ...@@ -333,7 +333,7 @@ namespace array {
} }
transitioning builtin SortCompareDefault( transitioning builtin SortCompareDefault(
context: Context, comparefn: JSAny, x: JSAny, y: JSAny): Number { context: Context, comparefn: Object, x: Object, y: Object): Number {
assert(comparefn == Undefined); assert(comparefn == Undefined);
if (TaggedIsSmi(x) && TaggedIsSmi(y)) { if (TaggedIsSmi(x) && TaggedIsSmi(y)) {
...@@ -361,7 +361,7 @@ namespace array { ...@@ -361,7 +361,7 @@ namespace array {
} }
transitioning builtin SortCompareUserFn( transitioning builtin SortCompareUserFn(
context: Context, comparefn: JSAny, x: JSAny, y: JSAny): Number { context: Context, comparefn: Object, x: Object, y: Object): Number {
assert(comparefn != Undefined); assert(comparefn != Undefined);
const cmpfn = UnsafeCast<Callable>(comparefn); const cmpfn = UnsafeCast<Callable>(comparefn);
...@@ -376,7 +376,7 @@ namespace array { ...@@ -376,7 +376,7 @@ namespace array {
} }
builtin CanUseSameAccessor<ElementsAccessor: type>( builtin CanUseSameAccessor<ElementsAccessor: type>(
context: Context, receiver: JSReceiver, initialReceiverMap: Map, context: Context, receiver: JSReceiver, initialReceiverMap: Object,
initialReceiverLength: Number): Boolean { initialReceiverLength: Number): Boolean {
if (receiver.map != initialReceiverMap) return False; if (receiver.map != initialReceiverMap) return False;
...@@ -389,7 +389,7 @@ namespace array { ...@@ -389,7 +389,7 @@ namespace array {
} }
CanUseSameAccessor<GenericElementsAccessor>( CanUseSameAccessor<GenericElementsAccessor>(
_context: Context, _receiver: JSReceiver, _initialReceiverMap: Map, _context: Context, _receiver: JSReceiver, _initialReceiverMap: Object,
_initialReceiverLength: Number): Boolean { _initialReceiverLength: Number): Boolean {
// Do nothing. We are already on the slow path. // Do nothing. We are already on the slow path.
return True; return True;
...@@ -456,7 +456,7 @@ namespace array { ...@@ -456,7 +456,7 @@ namespace array {
transitioning builtin transitioning builtin
Copy(implicit context: Context)( Copy(implicit context: Context)(
source: FixedArray, srcPos: Smi, target: FixedArray, dstPos: Smi, source: FixedArray, srcPos: Smi, target: FixedArray, dstPos: Smi,
length: Smi): JSAny { length: Smi): Object {
assert(srcPos >= 0); assert(srcPos >= 0);
assert(dstPos >= 0); assert(dstPos >= 0);
assert(srcPos <= source.length - length); assert(srcPos <= source.length - length);
...@@ -509,7 +509,7 @@ namespace array { ...@@ -509,7 +509,7 @@ namespace array {
let left: Smi = low; let left: Smi = low;
let right: Smi = start; let right: Smi = start;
const pivot = UnsafeCast<JSAny>(workArray.objects[right]); const pivot = workArray.objects[right];
// Invariants: // Invariants:
// pivot >= all in [low, left). // pivot >= all in [low, left).
...@@ -519,8 +519,7 @@ namespace array { ...@@ -519,8 +519,7 @@ namespace array {
// Find pivot insertion point. // Find pivot insertion point.
while (left < right) { while (left < right) {
const mid: Smi = left + ((right - left) >> 1); const mid: Smi = left + ((right - left) >> 1);
const order = const order = sortState.Compare(pivot, workArray.objects[mid]);
sortState.Compare(pivot, UnsafeCast<JSAny>(workArray.objects[mid]));
if (order < 0) { if (order < 0) {
right = mid; right = mid;
...@@ -572,8 +571,8 @@ namespace array { ...@@ -572,8 +571,8 @@ namespace array {
let runLength: Smi = 2; let runLength: Smi = 2;
const elementLow = UnsafeCast<JSAny>(workArray.objects[low]); const elementLow = workArray.objects[low];
const elementLowPred = UnsafeCast<JSAny>(workArray.objects[low - 1]); const elementLowPred = workArray.objects[low - 1];
let order = sortState.Compare(elementLow, elementLowPred); let order = sortState.Compare(elementLow, elementLowPred);
// TODO(szuend): Replace with "order < 0" once Torque supports it. // TODO(szuend): Replace with "order < 0" once Torque supports it.
...@@ -581,9 +580,9 @@ namespace array { ...@@ -581,9 +580,9 @@ namespace array {
// 'never' and uses two labels to branch. // 'never' and uses two labels to branch.
const isDescending: bool = order < 0 ? true : false; const isDescending: bool = order < 0 ? true : false;
let previousElement: JSAny = elementLow; let previousElement: Object = elementLow;
for (let idx: Smi = low + 1; idx < high; ++idx) { for (let idx: Smi = low + 1; idx < high; ++idx) {
const currentElement = UnsafeCast<JSAny>(workArray.objects[idx]); const currentElement = workArray.objects[idx];
order = sortState.Compare(currentElement, previousElement); order = sortState.Compare(currentElement, previousElement);
if (isDescending) { if (isDescending) {
...@@ -651,7 +650,7 @@ namespace array { ...@@ -651,7 +650,7 @@ namespace array {
// Where does b start in a? Elements in a before that can be ignored, // Where does b start in a? Elements in a before that can be ignored,
// because they are already in place. // because they are already in place.
const keyRight = UnsafeCast<JSAny>(workArray.objects[baseB]); const keyRight = workArray.objects[baseB];
const k: Smi = GallopRight(workArray, keyRight, baseA, lengthA, 0); const k: Smi = GallopRight(workArray, keyRight, baseA, lengthA, 0);
assert(k >= 0); assert(k >= 0);
...@@ -662,7 +661,7 @@ namespace array { ...@@ -662,7 +661,7 @@ namespace array {
// Where does a end in b? Elements in b after that can be ignored, // Where does a end in b? Elements in b after that can be ignored,
// because they are already in place. // because they are already in place.
const keyLeft = UnsafeCast<JSAny>(workArray.objects[baseA + lengthA - 1]); const keyLeft = workArray.objects[baseA + lengthA - 1];
lengthB = GallopLeft(workArray, keyLeft, baseB, lengthB, lengthB - 1); lengthB = GallopLeft(workArray, keyLeft, baseB, lengthB, lengthB - 1);
assert(lengthB >= 0); assert(lengthB >= 0);
if (lengthB == 0) return kSuccess; if (lengthB == 0) return kSuccess;
...@@ -696,14 +695,14 @@ namespace array { ...@@ -696,14 +695,14 @@ namespace array {
// pretending that array[base - 1] is minus infinity and array[base + len] // pretending that array[base - 1] is minus infinity and array[base + len]
// is plus infinity. In other words, key belongs at index base + k. // is plus infinity. In other words, key belongs at index base + k.
builtin GallopLeft(implicit context: Context, sortState: SortState)( builtin GallopLeft(implicit context: Context, sortState: SortState)(
array: FixedArray, key: JSAny, base: Smi, length: Smi, hint: Smi): Smi { array: FixedArray, key: Object, base: Smi, length: Smi, hint: Smi): Smi {
assert(length > 0 && base >= 0); assert(length > 0 && base >= 0);
assert(0 <= hint && hint < length); assert(0 <= hint && hint < length);
let lastOfs: Smi = 0; let lastOfs: Smi = 0;
let offset: Smi = 1; let offset: Smi = 1;
const baseHintElement = UnsafeCast<JSAny>(array.objects[base + hint]); const baseHintElement = array.objects[base + hint];
let order = sortState.Compare(baseHintElement, key); let order = sortState.Compare(baseHintElement, key);
if (order < 0) { if (order < 0) {
...@@ -713,8 +712,7 @@ namespace array { ...@@ -713,8 +712,7 @@ namespace array {
// a[base + length - 1] is highest. // a[base + length - 1] is highest.
const maxOfs: Smi = length - hint; const maxOfs: Smi = length - hint;
while (offset < maxOfs) { while (offset < maxOfs) {
const offsetElement = const offsetElement = array.objects[base + hint + offset];
UnsafeCast<JSAny>(array.objects[base + hint + offset]);
order = sortState.Compare(offsetElement, key); order = sortState.Compare(offsetElement, key);
// a[base + hint + offset] >= key? Break. // a[base + hint + offset] >= key? Break.
...@@ -740,8 +738,7 @@ namespace array { ...@@ -740,8 +738,7 @@ namespace array {
// a[base + hint] is lowest. // a[base + hint] is lowest.
const maxOfs: Smi = hint + 1; const maxOfs: Smi = hint + 1;
while (offset < maxOfs) { while (offset < maxOfs) {
const offsetElement = const offsetElement = array.objects[base + hint - offset];
UnsafeCast<JSAny>(array.objects[base + hint - offset]);
order = sortState.Compare(offsetElement, key); order = sortState.Compare(offsetElement, key);
if (order < 0) break; if (order < 0) break;
...@@ -771,8 +768,7 @@ namespace array { ...@@ -771,8 +768,7 @@ namespace array {
while (lastOfs < offset) { while (lastOfs < offset) {
const m: Smi = lastOfs + ((offset - lastOfs) >> 1); const m: Smi = lastOfs + ((offset - lastOfs) >> 1);
order = order = sortState.Compare(array.objects[base + m], key);
sortState.Compare(UnsafeCast<JSAny>(array.objects[base + m]), key);
if (order < 0) { if (order < 0) {
lastOfs = m + 1; // a[base + m] < key. lastOfs = m + 1; // a[base + m] < key.
...@@ -796,14 +792,14 @@ namespace array { ...@@ -796,14 +792,14 @@ namespace array {
// //
// or kFailure on error. // or kFailure on error.
builtin GallopRight(implicit context: Context, sortState: SortState)( builtin GallopRight(implicit context: Context, sortState: SortState)(
array: FixedArray, key: JSAny, base: Smi, length: Smi, hint: Smi): Smi { array: FixedArray, key: Object, base: Smi, length: Smi, hint: Smi): Smi {
assert(length > 0 && base >= 0); assert(length > 0 && base >= 0);
assert(0 <= hint && hint < length); assert(0 <= hint && hint < length);
let lastOfs: Smi = 0; let lastOfs: Smi = 0;
let offset: Smi = 1; let offset: Smi = 1;
const baseHintElement = UnsafeCast<JSAny>(array.objects[base + hint]); const baseHintElement = array.objects[base + hint];
let order = sortState.Compare(key, baseHintElement); let order = sortState.Compare(key, baseHintElement);
if (order < 0) { if (order < 0) {
...@@ -813,8 +809,7 @@ namespace array { ...@@ -813,8 +809,7 @@ namespace array {
// a[base + hint] is lowest. // a[base + hint] is lowest.
const maxOfs: Smi = hint + 1; const maxOfs: Smi = hint + 1;
while (offset < maxOfs) { while (offset < maxOfs) {
const offsetElement = const offsetElement = array.objects[base + hint - offset];
UnsafeCast<JSAny>(array.objects[base + hint - offset]);
order = sortState.Compare(key, offsetElement); order = sortState.Compare(key, offsetElement);
if (order >= 0) break; if (order >= 0) break;
...@@ -839,8 +834,7 @@ namespace array { ...@@ -839,8 +834,7 @@ namespace array {
// a[base + length - 1] is highest. // a[base + length - 1] is highest.
const maxOfs: Smi = length - hint; const maxOfs: Smi = length - hint;
while (offset < maxOfs) { while (offset < maxOfs) {
const offsetElement = const offsetElement = array.objects[base + hint + offset];
UnsafeCast<JSAny>(array.objects[base + hint + offset]);
order = sortState.Compare(key, offsetElement); order = sortState.Compare(key, offsetElement);
// a[base + hint + ofs] <= key. // a[base + hint + ofs] <= key.
...@@ -869,8 +863,7 @@ namespace array { ...@@ -869,8 +863,7 @@ namespace array {
while (lastOfs < offset) { while (lastOfs < offset) {
const m: Smi = lastOfs + ((offset - lastOfs) >> 1); const m: Smi = lastOfs + ((offset - lastOfs) >> 1);
order = order = sortState.Compare(key, array.objects[base + m]);
sortState.Compare(key, UnsafeCast<JSAny>(array.objects[base + m]));
if (order < 0) { if (order < 0) {
offset = m; // key < a[base + m]. offset = m; // key < a[base + m].
...@@ -928,8 +921,7 @@ namespace array { ...@@ -928,8 +921,7 @@ namespace array {
assert(lengthA > 1 && lengthB > 0); assert(lengthA > 1 && lengthB > 0);
const order = sortState.Compare( const order = sortState.Compare(
UnsafeCast<JSAny>(workArray.objects[cursorB]), workArray.objects[cursorB], tempArray.objects[cursorTemp]);
UnsafeCast<JSAny>(tempArray.objects[cursorTemp]));
if (order < 0) { if (order < 0) {
workArray.objects[dest++] = workArray.objects[cursorB++]; workArray.objects[dest++] = workArray.objects[cursorB++];
...@@ -966,8 +958,7 @@ namespace array { ...@@ -966,8 +958,7 @@ namespace array {
sortState.minGallop = minGallop; sortState.minGallop = minGallop;
nofWinsA = GallopRight( nofWinsA = GallopRight(
tempArray, UnsafeCast<JSAny>(workArray.objects[cursorB]), tempArray, workArray.objects[cursorB], cursorTemp, lengthA, 0);
cursorTemp, lengthA, 0);
assert(nofWinsA >= 0); assert(nofWinsA >= 0);
if (nofWinsA > 0) { if (nofWinsA > 0) {
...@@ -986,8 +977,7 @@ namespace array { ...@@ -986,8 +977,7 @@ namespace array {
if (--lengthB == 0) goto Succeed; if (--lengthB == 0) goto Succeed;
nofWinsB = GallopLeft( nofWinsB = GallopLeft(
workArray, UnsafeCast<JSAny>(tempArray.objects[cursorTemp]), workArray, tempArray.objects[cursorTemp], cursorB, lengthB, 0);
cursorB, lengthB, 0);
assert(nofWinsB >= 0); assert(nofWinsB >= 0);
if (nofWinsB > 0) { if (nofWinsB > 0) {
Copy(workArray, cursorB, workArray, dest, nofWinsB); Copy(workArray, cursorB, workArray, dest, nofWinsB);
...@@ -1063,8 +1053,7 @@ namespace array { ...@@ -1063,8 +1053,7 @@ namespace array {
assert(lengthA > 0 && lengthB > 1); assert(lengthA > 0 && lengthB > 1);
const order = sortState.Compare( const order = sortState.Compare(
UnsafeCast<JSAny>(tempArray.objects[cursorTemp]), tempArray.objects[cursorTemp], workArray.objects[cursorA]);
UnsafeCast<JSAny>(workArray.objects[cursorA]));
if (order < 0) { if (order < 0) {
workArray.objects[dest--] = workArray.objects[cursorA--]; workArray.objects[dest--] = workArray.objects[cursorA--];
...@@ -1102,8 +1091,8 @@ namespace array { ...@@ -1102,8 +1091,8 @@ namespace array {
sortState.minGallop = minGallop; sortState.minGallop = minGallop;
let k: Smi = GallopRight( let k: Smi = GallopRight(
workArray, UnsafeCast<JSAny>(tempArray.objects[cursorTemp]), workArray, tempArray.objects[cursorTemp], baseA, lengthA,
baseA, lengthA, lengthA - 1); lengthA - 1);
assert(k >= 0); assert(k >= 0);
nofWinsA = lengthA - k; nofWinsA = lengthA - k;
...@@ -1119,8 +1108,7 @@ namespace array { ...@@ -1119,8 +1108,7 @@ namespace array {
if (--lengthB == 1) goto CopyA; if (--lengthB == 1) goto CopyA;
k = GallopLeft( k = GallopLeft(
tempArray, UnsafeCast<JSAny>(workArray.objects[cursorA]), 0, tempArray, workArray.objects[cursorA], 0, lengthB, lengthB - 1);
lengthB, lengthB - 1);
assert(k >= 0); assert(k >= 0);
nofWinsB = lengthB - k; nofWinsB = lengthB - k;
...@@ -1307,7 +1295,7 @@ namespace array { ...@@ -1307,7 +1295,7 @@ namespace array {
// are ignored. // are ignored.
let numberOfUndefined: Smi = 0; let numberOfUndefined: Smi = 0;
for (let i: Smi = 0; i < receiverLength; ++i) { for (let i: Smi = 0; i < receiverLength; ++i) {
const element: JSAny | TheHole = loadFn(context, sortState, i); const element: Object = loadFn(context, sortState, i);
if (element == TheHole) { if (element == TheHole) {
// Do nothing for holes. The result is that elements are // Do nothing for holes. The result is that elements are
...@@ -1345,9 +1333,7 @@ namespace array { ...@@ -1345,9 +1333,7 @@ namespace array {
// set them to the TheHole up to {sortState.sortLength}. // set them to the TheHole up to {sortState.sortLength}.
let index: Smi = 0; let index: Smi = 0;
for (; index < numberOfNonUndefined; ++index) { for (; index < numberOfNonUndefined; ++index) {
storeFn( storeFn(context, sortState, index, workArray.objects[index]);
context, sortState, index,
UnsafeCast<JSAny>(workArray.objects[index]));
} }
const numberOfUndefinedEnd: Smi = const numberOfUndefinedEnd: Smi =
...@@ -1364,7 +1350,7 @@ namespace array { ...@@ -1364,7 +1350,7 @@ namespace array {
} }
transitioning builtin transitioning builtin
ArrayTimSort(context: Context, sortState: SortState): JSAny { ArrayTimSort(context: Context, sortState: SortState): Object {
const numberOfNonUndefined: Smi = CompactReceiverElementsIntoWorkArray(); const numberOfNonUndefined: Smi = CompactReceiverElementsIntoWorkArray();
ArrayTimSortImpl(context, sortState, numberOfNonUndefined); ArrayTimSortImpl(context, sortState, numberOfNonUndefined);
...@@ -1383,11 +1369,11 @@ namespace array { ...@@ -1383,11 +1369,11 @@ namespace array {
// https://tc39.github.io/ecma262/#sec-array.prototype.sort // https://tc39.github.io/ecma262/#sec-array.prototype.sort
transitioning javascript builtin transitioning javascript builtin
ArrayPrototypeSort(js-implicit context: Context, receiver: JSAny)( ArrayPrototypeSort(js-implicit context: Context, receiver: Object)(
...arguments): JSAny { ...arguments): Object {
// 1. If comparefn is not undefined and IsCallable(comparefn) is false, // 1. If comparefn is not undefined and IsCallable(comparefn) is false,
// throw a TypeError exception. // throw a TypeError exception.
const comparefnObj: JSAny = arguments[0]; const comparefnObj: Object = arguments[0];
const comparefn = Cast<(Undefined | Callable)>(comparefnObj) otherwise const comparefn = Cast<(Undefined | Callable)>(comparefnObj) otherwise
ThrowTypeError(kBadSortComparisonFunction, comparefnObj); ThrowTypeError(kBadSortComparisonFunction, comparefnObj);
......
tools/torque/format-torque.py
View file @ 4418a7b9
...@@ -20,9 +20,18 @@ kPercentEscape = r'α'; # Unicode alpha ...@@ -20,9 +20,18 @@ kPercentEscape = r'α'; # Unicode alpha
def preprocess(input): def preprocess(input):
input = re.sub(r'(if\s+)constexpr(\s*\()', r'\1/*COxp*/\2', input) input = re.sub(r'(if\s+)constexpr(\s*\()', r'\1/*COxp*/\2', input)
input = re.sub(r'(\s+)operator\s*(\'[^\']+\')', r'\1/*_OPE \2*/', input) input = re.sub(r'(\s+)operator\s*(\'[^\']+\')', r'\1/*_OPE \2*/', input)
input = re.sub(r'\btypeswitch\s*(\([^{]*\))\s{', r' if /*tPsW*/ \1 {', input)
input = re.sub(r'\bcase\s*(\([^{]*\))\s*:\s*deferred\s*{', r' if /*cAsEdEfF*/ \1 {', input) # Mangle typeswitches to look like switch statements with the extra type
input = re.sub(r'\bcase\s*(\([^{]*\))\s*:\s*{', r' if /*cA*/ \1 {', input) # information and syntax encoded in comments.
input = re.sub(r'(\s+)typeswitch\s*\(', r'\1/*_TYPE*/switch (', input)
input = re.sub(r'(\s+)case\s*\(\s*([^\:]+)\s*\)(\s*)\:\s*deferred',
r'\1case \2: /*_TSXDEFERRED_*/', input)
input = re.sub(r'(\s+)case\s*\(\s*([^\:]+)\s*\)(\s*)\:',
r'\1case \2: /*_TSX*/', input)
input = re.sub(r'(\s+)case\s*\(\s*([^\s]+)\s*\:\s*([^\:]+)\s*\)(\s*)\:\s*deferred',
r'\1case \3: /*_TSVDEFERRED_\2:*/', input)
input = re.sub(r'(\s+)case\s*\(\s*([^\s]+)\s*\:\s*([^\:]+)\s*\)(\s*)\:',
r'\1case \3: /*_TSV\2:*/', input)
# Add extra space around | operators to fix union types later. # Add extra space around | operators to fix union types later.
while True: while True:
...@@ -56,9 +65,15 @@ def postprocess(output): ...@@ -56,9 +65,15 @@ def postprocess(output):
output = re.sub(r'(\S+)\s*: type([,>])', r'\1: type\2', output) output = re.sub(r'(\S+)\s*: type([,>])', r'\1: type\2', output)
output = re.sub(r'(\n\s*)labels( [A-Z])', r'\1 labels\2', output) output = re.sub(r'(\n\s*)labels( [A-Z])', r'\1 labels\2', output)
output = re.sub(r'\/\*_OPE \'([^\']+)\'\*\/', r"operator '\1'", output) output = re.sub(r'\/\*_OPE \'([^\']+)\'\*\/', r"operator '\1'", output)
output = re.sub(r'\bif\s*\/\*tPsW\*\/', r'typeswitch', output) output = re.sub(r'\/\*_TYPE\*\/(\s*)switch', r'typeswitch', output)
output = re.sub(r'\bif\s*\/\*cA\*\/\s*(\([^{]*\))\s*{', r'case \1: {', output) output = re.sub(r'case (\w+)\:\s*\/\*_TSXDEFERRED_\*\/',
output = re.sub(r'\bif\s*\/\*cAsEdEfF\*\/\s*(\([^{]*\))\s*{', r'case \1: deferred {', output) r'case (\1): deferred', output)
output = re.sub(r'case (\w+)\:\s*\/\*_TSX\*\/',
r'case (\1):', output)
output = re.sub(r'case (\w+)\:\s*\/\*_TSVDEFERRED_([^\:]+)\:\*\/',
r'case (\2: \1): deferred', output)
output = re.sub(r'case (\w+)\:\s*\/\*_TSV([^\:]+)\:\*\/',
r'case (\2: \1):', output)
output = re.sub(r'\n_GeNeRaTeS00_\s*\/\*([^@]+)@\*\/', output = re.sub(r'\n_GeNeRaTeS00_\s*\/\*([^@]+)@\*\/',
r"\n generates '\1'", output) r"\n generates '\1'", output)
output = re.sub(r'_GeNeRaTeS00_\s*\/\*([^@]+)@\*\/', output = re.sub(r'_GeNeRaTeS00_\s*\/\*([^@]+)@\*\/',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment