diff --git a/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template b/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
index d4bc7ada8268fff911f6ec87c2b897f4df5b29f5..02c933061a3dd90f5fb0f4e796739d40fc5a1f0e 100644
--- a/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
+++ b/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
@@ -24,6 +24,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let f = () => /*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-arrow.template b/src/dynamic-import/syntax/invalid/nested-arrow.template
index e612f7438bbdcd6c436a4d5e13135b39c379d918..3d408314d9e7a59098b034bd6e96b24d4e1b61a8 100644
--- a/src/dynamic-import/syntax/invalid/nested-arrow.template
+++ b/src/dynamic-import/syntax/invalid/nested-arrow.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let f = () => {
/*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-await.template b/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-await.template
index e8e7f8abd98e84cef566c790925fe5d9b594d037..41c5d484f648af69cba426e0b62b03d9ddd38d39 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-await.template
@@ -23,7 +23,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
(async () => {
await /*{ import }*/
diff --git a/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-return-await.template b/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-return-await.template
index 745cd7f8ab13d7ed792f1a1afd7f94d569a5f1e3..838178e9511d65fe3dea96158e06e4a04b7e0b0c 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-return-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-return-await.template
@@ -23,6 +23,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
(async () => await /*{ import }*/)
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function-await.template b/src/dynamic-import/syntax/invalid/nested-async-function-await.template
index 1163ecdba2ade9d62265c0dedf9c5b4c7b174bf8..31ab31b55d52d08b98f1b01496dbe72893a9bdf5 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function-await.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
await /*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template b/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
index ed254ccbb15fec7890cdac00dcff8151cfaad7a4..fe2d4bfb8d37d6324d8b9f014217f7141f849bfa 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
return await /*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function.template b/src/dynamic-import/syntax/invalid/nested-async-function.template
index 5df7986f002b8b617530b81cd49d64a83accdd1a..877f50c46a5b19181dfaed259336d9672994bd46 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
/*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-async-generator-await.template b/src/dynamic-import/syntax/invalid/nested-async-generator-await.template
index 1faf30ba39e6a5fdeea85b0fbd216173e5460b47..fe811eacee4a145a7e4579d1bbd2dcab95b6d6ce 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-generator-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-generator-await.template
@@ -23,7 +23,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function * f() {
await /*{ import }*/
diff --git a/src/dynamic-import/syntax/invalid/nested-block-labeled.template b/src/dynamic-import/syntax/invalid/nested-block-labeled.template
index 005b8a78f316205dc29e4c92c536d402101461c1..85876813bd17c76f66b05c9d91869d14ff537d88 100644
--- a/src/dynamic-import/syntax/invalid/nested-block-labeled.template
+++ b/src/dynamic-import/syntax/invalid/nested-block-labeled.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
label: {
/*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-block.template b/src/dynamic-import/syntax/invalid/nested-block.template
index 86179ad8a1e377189dcf6ea2fb0bb7cc32c193ca..b627fcfd8d03a4529fd924a25d788c038a89261d 100644
--- a/src/dynamic-import/syntax/invalid/nested-block.template
+++ b/src/dynamic-import/syntax/invalid/nested-block.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
{
/*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-do-while.template b/src/dynamic-import/syntax/invalid/nested-do-while.template
index d6f30142ab389197ad6b10b1cb35e18ad48ef496..4c95953622abcb597fd36d7de0b0d482fd9aa4be 100644
--- a/src/dynamic-import/syntax/invalid/nested-do-while.template
+++ b/src/dynamic-import/syntax/invalid/nested-do-while.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
do {
/*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-else-braceless.template b/src/dynamic-import/syntax/invalid/nested-else-braceless.template
index 57c47213f7a038d0071d93220fdad2be76a0b3cd..ea4d8985fa88a7bf8ccc56476ff2e1dc7809def5 100644
--- a/src/dynamic-import/syntax/invalid/nested-else-braceless.template
+++ b/src/dynamic-import/syntax/invalid/nested-else-braceless.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (false) {
diff --git a/src/dynamic-import/syntax/invalid/nested-else.template b/src/dynamic-import/syntax/invalid/nested-else.template
index 9cd633eafceb46fff5229482c2982a6946cdee13..bc5bdaeb00b88f542721fac8faedcd3890d310a1 100644
--- a/src/dynamic-import/syntax/invalid/nested-else.template
+++ b/src/dynamic-import/syntax/invalid/nested-else.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (false) {
diff --git a/src/dynamic-import/syntax/invalid/nested-function-return.template b/src/dynamic-import/syntax/invalid/nested-function-return.template
index 8ae06d5435e0524bb9aeb316b5caaf5bd6beb82b..2aef0f4ecaee9c9a176f6e2b66613f8602a87fc2 100644
--- a/src/dynamic-import/syntax/invalid/nested-function-return.template
+++ b/src/dynamic-import/syntax/invalid/nested-function-return.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
function fn() {
return /*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-function.template b/src/dynamic-import/syntax/invalid/nested-function.template
index 3d42e8756702fc86d1ac8cae4fc8998c2cc78d06..0dfa99bf711573546899cce873fb4c97bf0f0c2d 100644
--- a/src/dynamic-import/syntax/invalid/nested-function.template
+++ b/src/dynamic-import/syntax/invalid/nested-function.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
function fn() {
/*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-if-braceless.template b/src/dynamic-import/syntax/invalid/nested-if-braceless.template
index a2709b8943765380500e4cb4dc4d2b1c96a0271c..976b7565c452f7bee732237153e9fb6f5e6310b1 100644
--- a/src/dynamic-import/syntax/invalid/nested-if-braceless.template
+++ b/src/dynamic-import/syntax/invalid/nested-if-braceless.template
@@ -24,6 +24,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (true) /*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-if.template b/src/dynamic-import/syntax/invalid/nested-if.template
index 4de50d4ea05fd93ba6464f641b8dbbf27715c4f0..f7950d6b21e7bf8329f2908e809f29a4fb800a04 100644
--- a/src/dynamic-import/syntax/invalid/nested-if.template
+++ b/src/dynamic-import/syntax/invalid/nested-if.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (true) {
/*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-while.template b/src/dynamic-import/syntax/invalid/nested-while.template
index 55eab906b1a252420625af0122f5d4d2af6b9172..80b727e6e9753e7e214b23936ba99b09c8a44595 100644
--- a/src/dynamic-import/syntax/invalid/nested-while.template
+++ b/src/dynamic-import/syntax/invalid/nested-while.template
@@ -24,7 +24,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let x = 0;
while (!x) {
diff --git a/src/dynamic-import/syntax/invalid/nested-with.template b/src/dynamic-import/syntax/invalid/nested-with.template
index 8bad9931046e2c30fc2e464b4be5c318deb8949b..552eebad1c716e21e6e80048b8fd20a278359559 100644
--- a/src/dynamic-import/syntax/invalid/nested-with.template
+++ b/src/dynamic-import/syntax/invalid/nested-with.template
@@ -25,7 +25,7 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
with ({}) {
/*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/top-level.template b/src/dynamic-import/syntax/invalid/top-level.template
index ee6eee8709938e9f716f435b026564ab1e0b16a1..501771afd717dc1ce09d627ef1dbec8b962b111d 100644
--- a/src/dynamic-import/syntax/invalid/top-level.template
+++ b/src/dynamic-import/syntax/invalid/top-level.template
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
/*{ import }*/;
diff --git a/test/language/expressions/class/syntax/early-errors/super-private-access-invalid.js b/test/language/expressions/class/syntax/early-errors/super-private-access-invalid.js
index 86ebd3a25d4390ff0924ffd0f51c1c967ad8959f..a3bdcc4b71a9ac8e1418330191c0d403b76b781d 100644
--- a/test/language/expressions/class/syntax/early-errors/super-private-access-invalid.js
+++ b/test/language/expressions/class/syntax/early-errors/super-private-access-invalid.js
@@ -24,7 +24,7 @@ info: |
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
var C = class extends B
{
diff --git a/test/language/expressions/compound-assignment/add-arguments-strict.js b/test/language/expressions/compound-assignment/add-arguments-strict.js
index 1ebf1f01841405852f58609c81757b92504297e9..0053c688aaeebe7c721a1537c8d18d7628ed3c85 100644
--- a/test/language/expressions/compound-assignment/add-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/add-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments += 20;
diff --git a/test/language/expressions/compound-assignment/add-eval-strict.js b/test/language/expressions/compound-assignment/add-eval-strict.js
index 28e8a7ae59cab41bde006769b43f85eef97c0963..ddc5ae01476d9a0984e9cfb7c342fbf224cf8ca4 100644
--- a/test/language/expressions/compound-assignment/add-eval-strict.js
+++ b/test/language/expressions/compound-assignment/add-eval-strict.js
@@ -13,6 +13,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval += 20;
diff --git a/test/language/expressions/compound-assignment/and-arguments-strict.js b/test/language/expressions/compound-assignment/and-arguments-strict.js
index 52b4c126616e563bdb95af5691679419109c564e..a48915f5cb97a17cbc981fb91e3fc1ebfec9e994 100644
--- a/test/language/expressions/compound-assignment/and-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/and-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments &= 20;
diff --git a/test/language/expressions/compound-assignment/and-eval-strict.js b/test/language/expressions/compound-assignment/and-eval-strict.js
index 99727c6e76d946258a79f5db3a5597b4392c5971..8fedf02a54bb7efed8795fd86330862299b53122 100644
--- a/test/language/expressions/compound-assignment/and-eval-strict.js
+++ b/test/language/expressions/compound-assignment/and-eval-strict.js
@@ -13,6 +13,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval &= 20;
diff --git a/test/language/expressions/compound-assignment/div-arguments-strict.js b/test/language/expressions/compound-assignment/div-arguments-strict.js
index 55634e45de4c06871ed8405dd0274b848a7a5e48..595ec5c1656c588b9d36a925f0c64e9aa589d0b1 100644
--- a/test/language/expressions/compound-assignment/div-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/div-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments /= 20;
diff --git a/test/language/expressions/compound-assignment/div-eval-strict.js b/test/language/expressions/compound-assignment/div-eval-strict.js
index 0f9cbbb1c6b4a30a49a893054d4969d79a327d36..81deccc3adb1ad34461e3f5c4c7b4f6e55a2011f 100644
--- a/test/language/expressions/compound-assignment/div-eval-strict.js
+++ b/test/language/expressions/compound-assignment/div-eval-strict.js
@@ -13,6 +13,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval /= 20;
diff --git a/test/language/expressions/compound-assignment/lshift-arguments-strict.js b/test/language/expressions/compound-assignment/lshift-arguments-strict.js
index 71521fc1bc52b542dbd3b3f186eb01f9e97ceb1b..04c7322d1506a94d537db8473da2fd554a584458 100644
--- a/test/language/expressions/compound-assignment/lshift-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/lshift-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments <<= 20;
diff --git a/test/language/expressions/compound-assignment/lshift-eval-strict.js b/test/language/expressions/compound-assignment/lshift-eval-strict.js
index f1c8ae3fd89b3d53eb930f24039648022b48142a..6e66c97a6a4536433293959f558338311ef50c1c 100644
--- a/test/language/expressions/compound-assignment/lshift-eval-strict.js
+++ b/test/language/expressions/compound-assignment/lshift-eval-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval <<= 20;
diff --git a/test/language/expressions/compound-assignment/mod-arguments-strict.js b/test/language/expressions/compound-assignment/mod-arguments-strict.js
index 818c13caaa0eea9c218d0b36f55f7e7e0383d447..9bf55d6fb9409695840990e7aeb2a1831b3395a5 100644
--- a/test/language/expressions/compound-assignment/mod-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/mod-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments %= 20;
diff --git a/test/language/expressions/compound-assignment/mod-eval-strict.js b/test/language/expressions/compound-assignment/mod-eval-strict.js
index 251b9a817530e3e4f76a31d2ed1fa32ee20d3400..30c13e3785366a73ad45ec9ecc6453c88c26e539 100644
--- a/test/language/expressions/compound-assignment/mod-eval-strict.js
+++ b/test/language/expressions/compound-assignment/mod-eval-strict.js
@@ -13,6 +13,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval %= 20;
diff --git a/test/language/expressions/compound-assignment/mult-arguments-strict.js b/test/language/expressions/compound-assignment/mult-arguments-strict.js
index 84610c68fe640f45bb7878fb7a1820e5c4dc3bde..3e6fa30a0123bc7d777c64e4a8369b9cb621d215 100644
--- a/test/language/expressions/compound-assignment/mult-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/mult-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments *= 20;
diff --git a/test/language/expressions/compound-assignment/mult-eval-strict.js b/test/language/expressions/compound-assignment/mult-eval-strict.js
index fc4fa396f929804e783c7d07a3ac511e517ad4a8..a617f3acc1f7aa63f24b8ff8c3ec4defd0ab9aca 100644
--- a/test/language/expressions/compound-assignment/mult-eval-strict.js
+++ b/test/language/expressions/compound-assignment/mult-eval-strict.js
@@ -13,6 +13,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval *= 20;
diff --git a/test/language/expressions/compound-assignment/or-arguments-strict.js b/test/language/expressions/compound-assignment/or-arguments-strict.js
index 94fce92edfe06040528d421cfd0bc781590bdc1b..fb5e1de1fcf095db599bcf68b61c0162030e85c4 100644
--- a/test/language/expressions/compound-assignment/or-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/or-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments |= 20;
diff --git a/test/language/expressions/compound-assignment/or-eval-strict.js b/test/language/expressions/compound-assignment/or-eval-strict.js
index 049ba00fbca3a83bbdc7e0973d0ae51eb837cb78..4bc678fea1c8448adc0b9276fb30b017e2f18959 100644
--- a/test/language/expressions/compound-assignment/or-eval-strict.js
+++ b/test/language/expressions/compound-assignment/or-eval-strict.js
@@ -13,6 +13,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval |= 20;
diff --git a/test/language/expressions/compound-assignment/srshift-arguments-strict.js b/test/language/expressions/compound-assignment/srshift-arguments-strict.js
index b2225f7b3dec887c729525f28b0b369e656421f1..766ca8eb12fd798868ab7b4213b2855b40febf5a 100644
--- a/test/language/expressions/compound-assignment/srshift-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/srshift-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments >>= 20;
diff --git a/test/language/expressions/compound-assignment/srshift-eval-strict.js b/test/language/expressions/compound-assignment/srshift-eval-strict.js
index 2e716827f8c16b86a8a2ade42b37e64ffbadab5f..55dc97d0880ae490f54c19e856644723d82ef487 100644
--- a/test/language/expressions/compound-assignment/srshift-eval-strict.js
+++ b/test/language/expressions/compound-assignment/srshift-eval-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval >>= 20;
diff --git a/test/language/expressions/compound-assignment/sub-arguments-strict.js b/test/language/expressions/compound-assignment/sub-arguments-strict.js
index ea512076919f622d857aa8ddeeb3c17b3c1f370b..e57df6d126667380d098c8268207d923c32d23fc 100644
--- a/test/language/expressions/compound-assignment/sub-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/sub-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments -= 20;
diff --git a/test/language/expressions/compound-assignment/sub-eval-strict.js b/test/language/expressions/compound-assignment/sub-eval-strict.js
index d473bd2435ee1c504ae44484fd41207eeef9b069..f63ea8f5aaa20e806e059ffa4cfe63250e6199e2 100644
--- a/test/language/expressions/compound-assignment/sub-eval-strict.js
+++ b/test/language/expressions/compound-assignment/sub-eval-strict.js
@@ -13,6 +13,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval -= 20;
diff --git a/test/language/expressions/compound-assignment/urshift-arguments-strict.js b/test/language/expressions/compound-assignment/urshift-arguments-strict.js
index 1446712dec54ad699c3f539905c2baf46169c172..6af08165443e29fb4089cc236fd9356bcd505a68 100644
--- a/test/language/expressions/compound-assignment/urshift-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/urshift-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments >>>= 20;
diff --git a/test/language/expressions/compound-assignment/urshift-eval-strict.js b/test/language/expressions/compound-assignment/urshift-eval-strict.js
index 1fe46c025bd540955be977ba90f59449ed6fed4f..8dd62aa03fb48a3e34dad97f796cd0fbc25370ad 100644
--- a/test/language/expressions/compound-assignment/urshift-eval-strict.js
+++ b/test/language/expressions/compound-assignment/urshift-eval-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval >>>= 20;
diff --git a/test/language/expressions/compound-assignment/xor-arguments-strict.js b/test/language/expressions/compound-assignment/xor-arguments-strict.js
index 8d57c684f372f9bd1b3dd8b21b04a247c631af21..55f6e865c922098c1968d20220f5bb753ca719bf 100644
--- a/test/language/expressions/compound-assignment/xor-arguments-strict.js
+++ b/test/language/expressions/compound-assignment/xor-arguments-strict.js
@@ -14,6 +14,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
arguments ^= 20;
diff --git a/test/language/expressions/compound-assignment/xor-eval-strict.js b/test/language/expressions/compound-assignment/xor-eval-strict.js
index 8c3a8c1ce4ce014fecbf288c3bf69b9677dddf40..ba2f7b0a05f092baa9655ca3e5f702c0ce039b21 100644
--- a/test/language/expressions/compound-assignment/xor-eval-strict.js
+++ b/test/language/expressions/compound-assignment/xor-eval-strict.js
@@ -13,6 +13,6 @@ negative:
type: SyntaxError
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
eval ^= 20;
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js
index 1c22154efb03ac7b8d9a0d1112f06cbf6c8397dd..f1b129875f3c65fe05fa732c6e07ee6986c9622f 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let f = () => {
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js
index cffc0b81b83420a7e645bde1436a8e0537b174c2..3fc1d5c42027bde07dfa4708587be6a42006bb45 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let f = () => import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js
index 649537df22284ebef20ced849a13763ed72553d5..2f41f3e143535291d647b92906c6080df8a1bc07 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js
@@ -32,6 +32,6 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let f = () => import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js
index f567a656b67bbf4c6b187b1493920884624fc66b..4f4ec7d2520871b7f34095398ec75673d41bdc0b 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js
@@ -32,6 +32,6 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let f = () => import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js
index 892ba946de483293a7aecc7da1bcb8976aec5e4e..e243f1e29afcc56471e0ca4230e668ffcd8b294a 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let f = () => {
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js
index 7a1ac82403ea772ede087825d0c121c80a6ac970..18bc33ed9c61013cb40c299c4d3a26321089a9df 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let f = () => {
import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js
index f181c9484a55b5c6564b30e181b0c7c4ab157885..9018eb885c2abd6ae74b405a6f02f3059c25f6c8 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
(async () => {
await import()
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js
index 61edab92cd521bdd717d52df15b671f65601bef4..8501e2a607b95cbc2719eeaba644caf102805edf 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
(async () => {
await import('', '')
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js
index 6aedac9010c524e7eea9bcc32073627d289a7fc1..a1efe510e92d27c43452da1a00c9e5e4263ae614 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
(async () => {
await import('',)
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js
index 8e2ad604ce8c3647848dd50921c9d7bcf9ec9a1b..40af54024cfb673919723fac042f243021e31898 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
(async () => await import())
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js
index f3108aaabeb003eb412e6fb1970c15419769d905..bdc7c33184dbce2126333377a3be7d547b626328 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js
@@ -32,6 +32,6 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
(async () => await import('', ''))
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js
index 9ee304e195a203f125dd66ce14ccbf04b93b1f0d..06b48af0be425d507acd7380c196ff314f50efcc 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js
@@ -32,6 +32,6 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
(async () => await import('',))
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js
index 43fd7992b22b7bf2f24547f41713e3ec9da0c306..b3eeac59d7f0d3839c2e4eee9b8e3a94ec788566 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js
index 3bf559403517eb2845af621479b0ea2e36c2d13d..591b5c96493b800cf3494c65a81aa3b56fea5dec 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
await import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js
index 95af703720cfd7c38f766ce8715924d9483dd118..a7ca4cd977beb25f581cd373c975b374159ea60e 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
await import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js
index 610e918d46eb4757f4215443e7a5b05412131b8d..710d24ce6ae041d21a6b6b34b7de3e33a84689eb 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
await import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js
index 91dd884497feb7dec837c8cb344a29611bea5fba..0df607879988aebd728f3af76e2bbbed5accdc62 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js
index db47b50c3a03dce058f2a91ef9f6d88e40d36d90..5d010fa82325ce3f90a97b4460d54c5347c123a5 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js
index 7663c36529dde0c9b494858bc633f4d0ccca54d7..3f82765d44381a078786fe0f1312ba8a2f2a4ca0 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
return await import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js
index a91e9d1f633395ae11dab34554fec0688efe273c..f4ee4a86bf1fc274c6efbfddf24822797f2aef33 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
return await import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js
index 873820d4100788cb9f44296ac6af235785c9b68e..e76f6566269b3200e87e250e3f836d907eac1b90 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function f() {
return await import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js
index 6856f82526e2ed3f52dc7d55162f093647323a28..d158254b6b435bc393d8f94f8bc9da0574dc13e0 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function * f() {
await import()
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js
index b1abb171d90976e413b02b9dab884f45c0c63ba5..88a5d924ca0d2b55e5ad22b4426a04cbd337e535 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function * f() {
await import('', '')
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js
index 494ca2ef6c6f047fa7d18489769a224f54ca02a8..e3e167b77ddce42e82a0bb7ea4ff622afdb3c30a 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
async function * f() {
await import('',)
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js
index a4691ca71d19e4f99585c47c7d6aed54576fc7b3..03148f8892ddfbf91f99fb05d19ec587f686768e 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
{
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js
index 6932f7797e851389dc7042b864ca3cf5f487bf0e..b3f16a6312540021caaf2adb98d595265bf4992e 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
label: {
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js
index 1823f1486d10b1476a551f326e906c40c5bab79e..695168f09bddce22c053347811ea736e78c97e60 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
label: {
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js
index 774d853665a53bbce5f88e086823bcaa97051055..8ad1f221866ba9cf2a97c754025259f2079826aa 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
label: {
import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js
index 84e1499005c53cabcb007043ec9d40bb225a52b1..543f1668f865a3a233c31700d5cf2d32aec36dbb 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
{
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js
index a73878a6b408c7187b77e66263602785490d9b87..fb0a7dcaff58eb3e5aff4b5b9239fc24a2297856 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
{
import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js
index d1b92fee08b5849697cd94f68138b4be7b88a983..9ef6e8e2613abaf502366a514eb78e63dec512b5 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
do {
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js
index 48a8ee93b75aab7a19caccb780099717e15fb3e0..a1c614826a5354bb4b3bd4432cf549cad1b283b2 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
do {
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js
index 33224be168db88203ef05eee701fcadc6cc11bc1..0a9ea1158109d50a598c1e1004d0274ba2180816 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
do {
import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js
index 83ba3db7657881792bc18b501a24df28c29e0652..72a9dd6aa0978d7c907c5018d3a23e4e90d299ed 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (false) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js
index 11e7beec898f75a849e6440f3ca3a5c8470ac0e0..201f168bf5fbe92dfd8eed7332de089693e19cf3 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (false) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js
index d2eab4c9a01a5ae7d7d807c4ecc495253347ab89..0fe91eddc302e419bb9ffafb8abb3319d3b50c80 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (false) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js
index 69510347fae113204f84f6f6256024b178e2b4ec..c095c333f1388db7f412e8d36535088c4921a451 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (false) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js
index 4290f00c5f7d03348496eb699359b90c85bd37e0..b5667250f00e34b396385589521883b76e742bdc 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (false) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js
index f94c5105a1592d77b01b44d9f4c87e44dd720659..e7364567489b63d979a8bce91d09c9c0b25582cd 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (false) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js
index a6c48c3928aa83af2783c23dbe24d39e175c3d71..272dbca2eba75b4a6fd42682f34e3a640bbe9913 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
function fn() {
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js
index 5748b12dc33e0586bcdb9c24426d499d9f886c07..55e7b17954839d085d8e9c6dc37799732d19184b 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
function fn() {
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js
index e5b898ea2cd3bbb4e5b3a86b911ee870e96676f8..cf917de2cec867a826b5ec50fa82f02f05b3e955 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
function fn() {
import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js
index 042677a78963f2cfd00313f9fbf402b0ed4c1db4..603f1b6eb3814dd9328d7bbe585bf368cf8209e5 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
function fn() {
return import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js
index 9d80e2f20ff7cccc0e79372daed86a0aee59db32..36e9d874b382256cf9936e133c08a1b0206db02f 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
function fn() {
return import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js
index 298b979ae06b36770b91d8ef05c5ec00233ce64d..48a9397081cff76e0e2cd3d61602011bf438f5b0 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
function fn() {
return import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js
index c00eccbbb99727c10299baf37e8c2e0b1897b510..bfef0ca24d77878b6b6c6f80fe5345bd7fb6b8da 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (true) {
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js
index a53086c259e95abd995d5a7aca3f497aacfb7d28..d29c46aadd3d40c37bc31369bce6cdff83ae9825 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (true) import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js
index 713d0ac65e511fd87416dfffe6c3a706d53a4867..f3a4ee7f87e774eb9370efba2234cb2b099ec331 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js
@@ -32,6 +32,6 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (true) import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js
index ac7e9aa750c7f6f287fb587202bab64b410956bc..8029b2371e5d0288c3c26e9be71e87b0c740888a 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js
@@ -32,6 +32,6 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (true) import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js
index 98180c77ab57b40f12d77e9ff3a111e30de78be0..987aad6db370be10f900367ea68b8ea9be19aa7f 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (true) {
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js
index 87c91b7b533d4d950d220e9cdfac6ddc8262bcc4..88524b895651d0764e333d5f25d99d873593a718 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
if (true) {
import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js
index 478a5f5744248af98dba097291db00474e0d34aa..c2c3e24a05205c72f2c5be7c1f33fe9d2266066c 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let x = 0;
while (!x) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js
index d41674b4a0f3e8c43cc93a6e2c43629f0bfe3267..aceb334d56d6b575aa7c637a452dec3e0c0bb182 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let x = 0;
while (!x) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js
index 69cb2c18143924ec4be6c789daa9db574c6c4146..7e0c1a9368f2ddbb3ce501db63c89e2d1997fd95 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
let x = 0;
while (!x) {
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js
index be620c56664a11bd87e621ed91aa3f0dd6bb8eaf..2d4a3c46ef3c5cbd5960786a552671e4ee1dc3f8 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js
@@ -28,7 +28,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
with ({}) {
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js
index 6c43a0d1f4257164eb63ac8a5cc7e9a803766822..b2eb74c0bc9a9596d5735981bd6f48be111c554a 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
with ({}) {
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js
index ecafdd9455cae607ede2b106e353c35564271826..511ed1e28086360ff8d3a68209599ad77bb2d6f6 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js
@@ -32,7 +32,7 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
with ({}) {
import('',);
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js
index e0f2430577c4846e1fabc6e41f3d4569317cfea7..034ccd9aea49c4046106c4991d8ecd6a0215d415 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js
@@ -18,7 +18,7 @@ info: |
import( AssignmentExpression[+In, ?Yield] )
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
import();
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-args.js
index aa517c93ac87e798debff79cf940b09cdc4d36d0..be11f9b8b644e0ea6fe98104b05b5a32f3e7a746 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-args.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-args.js
@@ -22,6 +22,6 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
import('', '');
diff --git a/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js
index d7c12259fc8dde18d0c240683645421d1db37520..32464e6377da0b93b8cacb99a8d0c2c523c0a039 100644
--- a/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js
+++ b/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js
@@ -22,6 +22,6 @@ info: |
- ImportCall must not be extended.
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
import('',);
diff --git a/test/language/statements/class/syntax/early-errors/super-private-access-invalid.js b/test/language/statements/class/syntax/early-errors/super-private-access-invalid.js
index de865fcab1802dc300ba08eeeedce36f92f2746b..00bbf4446fc6e5f1ea3ee43dde34a31d34c65d46 100644
--- a/test/language/statements/class/syntax/early-errors/super-private-access-invalid.js
+++ b/test/language/statements/class/syntax/early-errors/super-private-access-invalid.js
@@ -24,7 +24,7 @@ info: |
---*/
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
class C extends B
{
diff --git a/tools/lint/lib/checks/negative.py b/tools/lint/lib/checks/negative.py
old mode 100644
new mode 100755