From f4151fdbc0102e90ab63a9fd665e38bc160821d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Fri, 8 Dec 2017 13:22:03 -0800
Subject: [PATCH] Add tests for TCO with eval and cross-realm cases
---
.../call/tco-cross-realm-class-construct.js | 39 ++++++++++++++++
...tco-cross-realm-class-derived-construct.js | 39 ++++++++++++++++
.../call/tco-cross-realm-fun-call.js | 38 +++++++++++++++
.../call/tco-cross-realm-fun-construct.js | 38 +++++++++++++++
.../call/tco-non-eval-function-dynamic.js | 44 ++++++++++++++++++
.../expressions/call/tco-non-eval-function.js | 44 ++++++++++++++++++
.../expressions/call/tco-non-eval-global.js | 43 +++++++++++++++++
.../expressions/call/tco-non-eval-with.js | 46 +++++++++++++++++++
8 files changed, 331 insertions(+)
create mode 100644 test/language/expressions/call/tco-cross-realm-class-construct.js
create mode 100644 test/language/expressions/call/tco-cross-realm-class-derived-construct.js
create mode 100644 test/language/expressions/call/tco-cross-realm-fun-call.js
create mode 100644 test/language/expressions/call/tco-cross-realm-fun-construct.js
create mode 100644 test/language/expressions/call/tco-non-eval-function-dynamic.js
create mode 100644 test/language/expressions/call/tco-non-eval-function.js
create mode 100644 test/language/expressions/call/tco-non-eval-global.js
create mode 100644 test/language/expressions/call/tco-non-eval-with.js
diff --git a/test/language/expressions/call/tco-cross-realm-class-construct.js b/test/language/expressions/call/tco-cross-realm-class-construct.js
new file mode 100644
index 0000000000..8d74cee29a
--- /dev/null
+++ b/test/language/expressions/call/tco-cross-realm-class-construct.js
@@ -0,0 +1,39 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+id: sec-function-calls-runtime-semantics-evaluation
+info: >
+ Check TypeError is thrown from correct realm with tco-call to class constructor from derived
+ class [[Construct]] invocation.
+description: |
+ 12.3.4.3 Runtime Semantics: EvaluateDirectCall( func, thisValue, arguments, tailPosition )
+ ...
+ 4. If tailPosition is true, perform PrepareForTailCall().
+ 5. Let result be Call(func, thisValue, argList).
+ 6. Assert: If tailPosition is true, the above call will not return here, but instead evaluation will continue as if the following return has already occurred.
+ 7. Assert: If result is not an abrupt completion, then Type(result) is an ECMAScript language type.
+ 8. Return result.
+
+ 9.2.1 [[Call]] ( thisArgument, argumentsList)
+ ...
+ 2. If F.[[FunctionKind]] is "classConstructor", throw a TypeError exception.
+ 3. Let callerContext be the running execution context.
+ 4. Let calleeContext be PrepareForOrdinaryCall(F, undefined).
+ 5. Assert: calleeContext is now the running execution context.
+ ...
+
+features: [tail-call-optimization, class]
+---*/
+
+// - The class constructor call is in a valid tail-call position, which means PrepareForTailCall is performed.
+// - The function call returns from `otherRealm` and proceeds the tail-call in this realm.
+// - Calling the class constructor throws a TypeError from the current realm, that means this realm and not `otherRealm`.
+var code = "(class { constructor() { return (class {})(); } });";
+
+var otherRealm = $262.createRealm();
+var tco = otherRealm.evalScript(code);
+
+assert.throws(TypeError, function() {
+ new tco();
+});
diff --git a/test/language/expressions/call/tco-cross-realm-class-derived-construct.js b/test/language/expressions/call/tco-cross-realm-class-derived-construct.js
new file mode 100644
index 0000000000..f55a8fe9b9
--- /dev/null
+++ b/test/language/expressions/call/tco-cross-realm-class-derived-construct.js
@@ -0,0 +1,39 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+id: sec-function-calls-runtime-semantics-evaluation
+info: >
+ Check TypeError is thrown from correct realm with tco-call to class constructor from
+ class [[Construct]] invocation.
+description: |
+ 12.3.4.3 Runtime Semantics: EvaluateDirectCall( func, thisValue, arguments, tailPosition )
+ ...
+ 4. If tailPosition is true, perform PrepareForTailCall().
+ 5. Let result be Call(func, thisValue, argList).
+ 6. Assert: If tailPosition is true, the above call will not return here, but instead evaluation will continue as if the following return has already occurred.
+ 7. Assert: If result is not an abrupt completion, then Type(result) is an ECMAScript language type.
+ 8. Return result.
+
+ 9.2.1 [[Call]] ( thisArgument, argumentsList)
+ ...
+ 2. If F.[[FunctionKind]] is "classConstructor", throw a TypeError exception.
+ 3. Let callerContext be the running execution context.
+ 4. Let calleeContext be PrepareForOrdinaryCall(F, undefined).
+ 5. Assert: calleeContext is now the running execution context.
+ ...
+
+features: [tail-call-optimization, class]
+---*/
+
+// - The class constructor call is in a valid tail-call position, which means PrepareForTailCall is performed.
+// - The function call returns from `otherRealm` and proceeds the tail-call in this realm.
+// - Calling the class constructor throws a TypeError from the current realm, that means this realm and not `otherRealm`.
+var code = "(class extends Object { constructor() { return (class {})(); } });";
+
+var otherRealm = $262.createRealm();
+var tco = otherRealm.evalScript(code);
+
+assert.throws(TypeError, function() {
+ new tco();
+});
diff --git a/test/language/expressions/call/tco-cross-realm-fun-call.js b/test/language/expressions/call/tco-cross-realm-fun-call.js
new file mode 100644
index 0000000000..6c0b3e30a4
--- /dev/null
+++ b/test/language/expressions/call/tco-cross-realm-fun-call.js
@@ -0,0 +1,38 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+id: sec-function-calls-runtime-semantics-evaluation
+info: >
+ Check TypeError is thrown from correct realm with tco-call to class constructor from [[Call]] invocation.
+description: |
+ 12.3.4.3 Runtime Semantics: EvaluateDirectCall( func, thisValue, arguments, tailPosition )
+ ...
+ 4. If tailPosition is true, perform PrepareForTailCall().
+ 5. Let result be Call(func, thisValue, argList).
+ 6. Assert: If tailPosition is true, the above call will not return here, but instead evaluation will continue as if the following return has already occurred.
+ 7. Assert: If result is not an abrupt completion, then Type(result) is an ECMAScript language type.
+ 8. Return result.
+
+ 9.2.1 [[Call]] ( thisArgument, argumentsList)
+ ...
+ 2. If F.[[FunctionKind]] is "classConstructor", throw a TypeError exception.
+ 3. Let callerContext be the running execution context.
+ 4. Let calleeContext be PrepareForOrdinaryCall(F, undefined).
+ 5. Assert: calleeContext is now the running execution context.
+ ...
+
+features: [tail-call-optimization, class]
+---*/
+
+// - The class constructor call is in a valid tail-call position, which means PrepareForTailCall is performed.
+// - The function call returns from `otherRealm` and proceeds the tail-call in this realm.
+// - Calling the class constructor throws a TypeError from the current realm, that means this realm and not `otherRealm`.
+var code = "'use strict'; (function() { return (class {})(); });";
+
+var otherRealm = $262.createRealm();
+var tco = otherRealm.evalScript(code);
+
+assert.throws(TypeError, function() {
+ tco();
+});
diff --git a/test/language/expressions/call/tco-cross-realm-fun-construct.js b/test/language/expressions/call/tco-cross-realm-fun-construct.js
new file mode 100644
index 0000000000..e26165ec86
--- /dev/null
+++ b/test/language/expressions/call/tco-cross-realm-fun-construct.js
@@ -0,0 +1,38 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+id: sec-function-calls-runtime-semantics-evaluation
+info: >
+ Check TypeError is thrown from correct realm with tco-call to class constructor from [[Construct]] invocation.
+description: |
+ 12.3.4.3 Runtime Semantics: EvaluateDirectCall( func, thisValue, arguments, tailPosition )
+ ...
+ 4. If tailPosition is true, perform PrepareForTailCall().
+ 5. Let result be Call(func, thisValue, argList).
+ 6. Assert: If tailPosition is true, the above call will not return here, but instead evaluation will continue as if the following return has already occurred.
+ 7. Assert: If result is not an abrupt completion, then Type(result) is an ECMAScript language type.
+ 8. Return result.
+
+ 9.2.1 [[Call]] ( thisArgument, argumentsList)
+ ...
+ 2. If F.[[FunctionKind]] is "classConstructor", throw a TypeError exception.
+ 3. Let callerContext be the running execution context.
+ 4. Let calleeContext be PrepareForOrdinaryCall(F, undefined).
+ 5. Assert: calleeContext is now the running execution context.
+ ...
+
+features: [tail-call-optimization, class]
+---*/
+
+// - The class constructor call is in a valid tail-call position, which means PrepareForTailCall is performed.
+// - The function call returns from `otherRealm` and proceeds the tail-call in this realm.
+// - Calling the class constructor throws a TypeError from the current realm, that means this realm and not `otherRealm`.
+var code = "'use strict'; (function() { return (class {})(); });";
+
+var otherRealm = $262.createRealm();
+var tco = otherRealm.evalScript(code);
+
+assert.throws(TypeError, function() {
+ new tco();
+});
diff --git a/test/language/expressions/call/tco-non-eval-function-dynamic.js b/test/language/expressions/call/tco-non-eval-function-dynamic.js
new file mode 100644
index 0000000000..a570c791cd
--- /dev/null
+++ b/test/language/expressions/call/tco-non-eval-function-dynamic.js
@@ -0,0 +1,44 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+id: sec-function-calls-runtime-semantics-evaluation
+info: >
+ Tail-call with identifier named "eval" in function environment, local "eval" binding dynamically added.
+description: |
+ 12.3.4.1 Runtime Semantics: Evaluation
+ ...
+ 6. If Type(ref) is Reference and IsPropertyReference(ref) is false and
+ GetReferencedName(ref) is "eval", then
+ a. If SameValue(func, %eval%) is true, then
+ ...
+ ...
+ 9. Return ? EvaluateCall(func, ref, arguments, tailCall).
+
+ 12.3.4.2 Runtime Semantics: EvaluateCall( func, ref, arguments, tailPosition )
+ ...
+ 7. If tailPosition is true, perform PrepareForTailCall().
+ 8. Let result be Call(func, thisValue, argList).
+ ...
+
+flags: [noStrict]
+features: [tail-call-optimization]
+includes: [tcoHelper.js]
+---*/
+
+var callCount = 0;
+
+(function() {
+ function f(n) {
+ "use strict";
+ if (n === 0) {
+ callCount += 1
+ return;
+ }
+ return eval(n - 1);
+ }
+ eval("var eval = f;");
+ f($MAX_ITERATIONS);
+})();
+
+assert.sameValue(callCount, 1);
diff --git a/test/language/expressions/call/tco-non-eval-function.js b/test/language/expressions/call/tco-non-eval-function.js
new file mode 100644
index 0000000000..623a101273
--- /dev/null
+++ b/test/language/expressions/call/tco-non-eval-function.js
@@ -0,0 +1,44 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+id: sec-function-calls-runtime-semantics-evaluation
+info: >
+ Tail-call with identifier named "eval" in function environment.
+description: |
+ 12.3.4.1 Runtime Semantics: Evaluation
+ ...
+ 6. If Type(ref) is Reference and IsPropertyReference(ref) is false and
+ GetReferencedName(ref) is "eval", then
+ a. If SameValue(func, %eval%) is true, then
+ ...
+ ...
+ 9. Return ? EvaluateCall(func, ref, arguments, tailCall).
+
+ 12.3.4.2 Runtime Semantics: EvaluateCall( func, ref, arguments, tailPosition )
+ ...
+ 7. If tailPosition is true, perform PrepareForTailCall().
+ 8. Let result be Call(func, thisValue, argList).
+ ...
+
+flags: [noStrict]
+features: [tail-call-optimization]
+includes: [tcoHelper.js]
+---*/
+
+var callCount = 0;
+
+(function() {
+ function f(n) {
+ "use strict";
+ if (n === 0) {
+ callCount += 1
+ return;
+ }
+ return eval(n - 1);
+ }
+ var eval = f;
+ f($MAX_ITERATIONS);
+})();
+
+assert.sameValue(callCount, 1);
diff --git a/test/language/expressions/call/tco-non-eval-global.js b/test/language/expressions/call/tco-non-eval-global.js
new file mode 100644
index 0000000000..8152b82538
--- /dev/null
+++ b/test/language/expressions/call/tco-non-eval-global.js
@@ -0,0 +1,43 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+id: sec-function-calls-runtime-semantics-evaluation
+info: >
+ Tail-call with identifier named "eval" in global environment.
+description: |
+ 12.3.4.1 Runtime Semantics: Evaluation
+ ...
+ 6. If Type(ref) is Reference and IsPropertyReference(ref) is false and
+ GetReferencedName(ref) is "eval", then
+ a. If SameValue(func, %eval%) is true, then
+ ...
+ ...
+ 9. Return ? EvaluateCall(func, ref, arguments, tailCall).
+
+ 12.3.4.2 Runtime Semantics: EvaluateCall( func, ref, arguments, tailPosition )
+ ...
+ 7. If tailPosition is true, perform PrepareForTailCall().
+ 8. Let result be Call(func, thisValue, argList).
+ ...
+
+flags: [noStrict]
+features: [tail-call-optimization]
+includes: [tcoHelper.js]
+---*/
+
+var callCount = 0;
+
+function f(n) {
+ "use strict";
+ if (n === 0) {
+ callCount += 1
+ return;
+ }
+ return eval(n - 1);
+}
+eval = f;
+
+f($MAX_ITERATIONS);
+
+assert.sameValue(callCount, 1);
diff --git a/test/language/expressions/call/tco-non-eval-with.js b/test/language/expressions/call/tco-non-eval-with.js
new file mode 100644
index 0000000000..6797874429
--- /dev/null
+++ b/test/language/expressions/call/tco-non-eval-with.js
@@ -0,0 +1,46 @@
+// Copyright (C) 2017 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+id: sec-function-calls-runtime-semantics-evaluation
+info: >
+ Tail-call with identifier named "eval" in object environment.
+description: |
+ 12.3.4.1 Runtime Semantics: Evaluation
+ ...
+ 6. If Type(ref) is Reference and IsPropertyReference(ref) is false and
+ GetReferencedName(ref) is "eval", then
+ a. If SameValue(func, %eval%) is true, then
+ ...
+ ...
+ 9. Return ? EvaluateCall(func, ref, arguments, tailCall).
+
+ 12.3.4.2 Runtime Semantics: EvaluateCall( func, ref, arguments, tailPosition )
+ ...
+ 7. If tailPosition is true, perform PrepareForTailCall().
+ 8. Let result be Call(func, thisValue, argList).
+ ...
+
+flags: [noStrict]
+features: [tail-call-optimization]
+includes: [tcoHelper.js]
+---*/
+
+var callCount = 0;
+
+var f, scope = {};
+with (scope) {
+ f = function (n) {
+ "use strict";
+ if (n === 0) {
+ callCount += 1
+ return;
+ }
+ return eval(n - 1);
+ }
+}
+scope.eval = f;
+
+f($MAX_ITERATIONS);
+
+assert.sameValue(callCount, 1);
--
GitLab