From 8869799c6d5c6b30e1d5cfd11b70728b09ba4f8d Mon Sep 17 00:00:00 2001
From: Mathias Bynens <mathias@qiwi.be>
Date: Fri, 19 Oct 2018 11:09:40 +0200
Subject: [PATCH] Rebase, regenerate, and update tests

---
 .../syntax/invalid/nested-arrow-assignment-expression.template  | 2 +-
 src/dynamic-import/syntax/invalid/nested-arrow.template         | 2 +-
 .../syntax/invalid/nested-async-arrow-fn-await.template         | 2 +-
 .../syntax/invalid/nested-async-arrow-fn-return-await.template  | 2 +-
 .../syntax/invalid/nested-async-function-await.template         | 2 +-
 .../syntax/invalid/nested-async-function-return-await.template  | 2 +-
 .../syntax/invalid/nested-async-function.template               | 2 +-
 .../syntax/invalid/nested-async-generator-await.template        | 2 +-
 src/dynamic-import/syntax/invalid/nested-block-labeled.template | 2 +-
 src/dynamic-import/syntax/invalid/nested-block.template         | 2 +-
 src/dynamic-import/syntax/invalid/nested-do-while.template      | 2 +-
 .../syntax/invalid/nested-else-braceless.template               | 2 +-
 src/dynamic-import/syntax/invalid/nested-else.template          | 2 +-
 .../syntax/invalid/nested-function-return.template              | 2 +-
 src/dynamic-import/syntax/invalid/nested-function.template      | 2 +-
 src/dynamic-import/syntax/invalid/nested-if-braceless.template  | 2 +-
 src/dynamic-import/syntax/invalid/nested-if.template            | 2 +-
 src/dynamic-import/syntax/invalid/nested-while.template         | 2 +-
 src/dynamic-import/syntax/invalid/nested-with.template          | 2 +-
 src/dynamic-import/syntax/invalid/top-level.template            | 2 +-
 .../class/syntax/early-errors/super-private-access-invalid.js   | 2 +-
 .../expressions/compound-assignment/add-arguments-strict.js     | 2 +-
 .../language/expressions/compound-assignment/add-eval-strict.js | 2 +-
 .../expressions/compound-assignment/and-arguments-strict.js     | 2 +-
 .../language/expressions/compound-assignment/and-eval-strict.js | 2 +-
 .../expressions/compound-assignment/div-arguments-strict.js     | 2 +-
 .../language/expressions/compound-assignment/div-eval-strict.js | 2 +-
 .../expressions/compound-assignment/lshift-arguments-strict.js  | 2 +-
 .../expressions/compound-assignment/lshift-eval-strict.js       | 2 +-
 .../expressions/compound-assignment/mod-arguments-strict.js     | 2 +-
 .../language/expressions/compound-assignment/mod-eval-strict.js | 2 +-
 .../expressions/compound-assignment/mult-arguments-strict.js    | 2 +-
 .../expressions/compound-assignment/mult-eval-strict.js         | 2 +-
 .../expressions/compound-assignment/or-arguments-strict.js      | 2 +-
 test/language/expressions/compound-assignment/or-eval-strict.js | 2 +-
 .../expressions/compound-assignment/srshift-arguments-strict.js | 2 +-
 .../expressions/compound-assignment/srshift-eval-strict.js      | 2 +-
 .../expressions/compound-assignment/sub-arguments-strict.js     | 2 +-
 .../language/expressions/compound-assignment/sub-eval-strict.js | 2 +-
 .../expressions/compound-assignment/urshift-arguments-strict.js | 2 +-
 .../expressions/compound-assignment/urshift-eval-strict.js      | 2 +-
 .../expressions/compound-assignment/xor-arguments-strict.js     | 2 +-
 .../language/expressions/compound-assignment/xor-eval-strict.js | 2 +-
 .../syntax/invalid/nested-arrow-assignment-expr-not-optional.js | 2 +-
 ...-arrow-assignment-expression-assignment-expr-not-optional.js | 2 +-
 .../nested-arrow-assignment-expression-not-extensible-args.js   | 2 +-
 ...ow-assignment-expression-not-extensible-no-trailing-comma.js | 2 +-
 .../syntax/invalid/nested-arrow-not-extensible-args.js          | 2 +-
 .../invalid/nested-arrow-not-extensible-no-trailing-comma.js    | 2 +-
 ...d-async-arrow-function-await-assignment-expr-not-optional.js | 2 +-
 .../nested-async-arrow-function-await-not-extensible-args.js    | 2 +-
 ...ync-arrow-function-await-not-extensible-no-trailing-comma.js | 2 +-
 ...-arrow-function-return-await-assignment-expr-not-optional.js | 2 +-
 ...ted-async-arrow-function-return-await-not-extensible-args.js | 2 +-
 ...ow-function-return-await-not-extensible-no-trailing-comma.js | 2 +-
 .../nested-async-function-assignment-expr-not-optional.js       | 2 +-
 .../nested-async-function-await-assignment-expr-not-optional.js | 2 +-
 .../invalid/nested-async-function-await-not-extensible-args.js  | 2 +-
 ...ted-async-function-await-not-extensible-no-trailing-comma.js | 2 +-
 .../syntax/invalid/nested-async-function-not-extensible-args.js | 2 +-
 .../nested-async-function-not-extensible-no-trailing-comma.js   | 2 +-
 ...-async-function-return-await-assignment-expr-not-optional.js | 2 +-
 .../nested-async-function-return-await-not-extensible-args.js   | 2 +-
 ...nc-function-return-await-not-extensible-no-trailing-comma.js | 2 +-
 .../nested-async-gen-await-assignment-expr-not-optional.js      | 2 +-
 .../invalid/nested-async-gen-await-not-extensible-args.js       | 2 +-
 .../nested-async-gen-await-not-extensible-no-trailing-comma.js  | 2 +-
 .../syntax/invalid/nested-block-assignment-expr-not-optional.js | 2 +-
 .../nested-block-labeled-assignment-expr-not-optional.js        | 2 +-
 .../syntax/invalid/nested-block-labeled-not-extensible-args.js  | 2 +-
 .../nested-block-labeled-not-extensible-no-trailing-comma.js    | 2 +-
 .../syntax/invalid/nested-block-not-extensible-args.js          | 2 +-
 .../invalid/nested-block-not-extensible-no-trailing-comma.js    | 2 +-
 .../invalid/nested-do-while-assignment-expr-not-optional.js     | 2 +-
 .../syntax/invalid/nested-do-while-not-extensible-args.js       | 2 +-
 .../invalid/nested-do-while-not-extensible-no-trailing-comma.js | 2 +-
 .../syntax/invalid/nested-else-assignment-expr-not-optional.js  | 2 +-
 .../nested-else-braceless-assignment-expr-not-optional.js       | 2 +-
 .../syntax/invalid/nested-else-braceless-not-extensible-args.js | 2 +-
 .../nested-else-braceless-not-extensible-no-trailing-comma.js   | 2 +-
 .../syntax/invalid/nested-else-not-extensible-args.js           | 2 +-
 .../invalid/nested-else-not-extensible-no-trailing-comma.js     | 2 +-
 .../invalid/nested-function-assignment-expr-not-optional.js     | 2 +-
 .../syntax/invalid/nested-function-not-extensible-args.js       | 2 +-
 .../invalid/nested-function-not-extensible-no-trailing-comma.js | 2 +-
 .../nested-function-return-assignment-expr-not-optional.js      | 2 +-
 .../invalid/nested-function-return-not-extensible-args.js       | 2 +-
 .../nested-function-return-not-extensible-no-trailing-comma.js  | 2 +-
 .../syntax/invalid/nested-if-assignment-expr-not-optional.js    | 2 +-
 .../invalid/nested-if-braceless-assignment-expr-not-optional.js | 2 +-
 .../syntax/invalid/nested-if-braceless-not-extensible-args.js   | 2 +-
 .../nested-if-braceless-not-extensible-no-trailing-comma.js     | 2 +-
 .../syntax/invalid/nested-if-not-extensible-args.js             | 2 +-
 .../invalid/nested-if-not-extensible-no-trailing-comma.js       | 2 +-
 .../syntax/invalid/nested-while-assignment-expr-not-optional.js | 2 +-
 .../syntax/invalid/nested-while-not-extensible-args.js          | 2 +-
 .../invalid/nested-while-not-extensible-no-trailing-comma.js    | 2 +-
 .../syntax/invalid/nested-with-assignment-expr-not-optional.js  | 2 +-
 .../syntax/invalid/nested-with-not-extensible-args.js           | 2 +-
 .../invalid/nested-with-not-extensible-no-trailing-comma.js     | 2 +-
 .../syntax/invalid/top-level-assignment-expr-not-optional.js    | 2 +-
 .../syntax/invalid/top-level-not-extensible-args.js             | 2 +-
 .../invalid/top-level-not-extensible-no-trailing-comma.js       | 2 +-
 .../class/syntax/early-errors/super-private-access-invalid.js   | 2 +-
 tools/lint/lib/checks/negative.py                               | 0
 105 files changed, 104 insertions(+), 104 deletions(-)
 mode change 100644 => 100755 tools/lint/lib/checks/negative.py

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 d4bc7ada82..02c933061a 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 e612f7438b..3d408314d9 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 e8e7f8abd9..41c5d484f6 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 745cd7f8ab..838178e951 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 1163ecdba2..31ab31b55d 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 ed254ccbb1..fe2d4bfb8d 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 5df7986f00..877f50c46a 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 1faf30ba39..fe811eacee 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 005b8a78f3..85876813bd 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 86179ad8a1..b627fcfd8d 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 d6f30142ab..4c95953622 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 57c47213f7..ea4d8985fa 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 9cd633eafc..bc5bdaeb00 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 8ae06d5435..2aef0f4eca 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 3d42e87567..0dfa99bf71 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 a2709b8943..976b7565c4 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 4de50d4ea0..f7950d6b21 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 55eab906b1..80b727e6e9 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 8bad993104..552eebad1c 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 ee6eee8709..501771afd7 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 86ebd3a25d..a3bdcc4b71 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 1ebf1f0184..0053c688aa 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 28e8a7ae59..ddc5ae0147 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 52b4c12661..a48915f5cb 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 99727c6e76..8fedf02a54 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 55634e45de..595ec5c165 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 0f9cbbb1c6..81deccc3ad 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 71521fc1bc..04c7322d15 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 f1c8ae3fd8..6e66c97a6a 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 818c13caaa..9bf55d6fb9 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 251b9a8175..30c13e3785 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 84610c68fe..3e6fa30a01 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 fc4fa396f9..a617f3acc1 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 94fce92edf..fb5e1de1fc 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 049ba00fbc..4bc678fea1 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 b2225f7b3d..766ca8eb12 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 2e716827f8..55dc97d088 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 ea51207691..e57df6d126 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 d473bd2435..f63ea8f5aa 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 1446712dec..6af0816544 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 1fe46c025b..8dd62aa03f 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 8d57c684f3..55f6e865c9 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 8c3a8c1ce4..ba2f7b0a05 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 1c22154efb..f1b129875f 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 cffc0b81b8..3fc1d5c420 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 649537df22..2f41f3e143 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 f567a656b6..4f4ec7d252 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 892ba946de..e243f1e29a 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 7a1ac82403..18bc33ed9c 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 f181c9484a..9018eb885c 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 61edab92cd..8501e2a607 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 6aedac9010..a1efe510e9 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 8e2ad604ce..40af54024c 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 f3108aaabe..bdc7c33184 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 9ee304e195..06b48af0be 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 43fd7992b2..b3eeac59d7 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 3bf5594035..591b5c9649 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 95af703720..a7ca4cd977 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 610e918d46..710d24ce6a 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 91dd884497..0df6078799 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 db47b50c3a..5d010fa823 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 7663c36529..3f82765d44 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 a91e9d1f63..f4ee4a86bf 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 873820d410..e76f656626 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 6856f82526..d158254b6b 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 b1abb171d9..88a5d924ca 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 494ca2ef6c..e3e167b77d 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 a4691ca71d..03148f8892 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 6932f7797e..b3f16a6312 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 1823f1486d..695168f09b 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 774d853665..8ad1f22186 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 84e1499005..543f1668f8 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 a73878a6b4..fb0a7dcaff 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 d1b92fee08..9ef6e8e261 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 48a8ee93b7..a1c614826a 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 33224be168..0a9ea11581 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 83ba3db765..72a9dd6aa0 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 11e7beec89..201f168bf5 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 d2eab4c9a0..0fe91eddc3 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 69510347fa..c095c333f1 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 4290f00c5f..b5667250f0 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 f94c5105a1..e736456748 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 a6c48c3928..272dbca2eb 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 5748b12dc3..55e7b17954 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 e5b898ea2c..cf917de2ce 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 042677a789..603f1b6eb3 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 9d80e2f20f..36e9d874b3 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 298b979ae0..48a9397081 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 c00eccbbb9..bfef0ca24d 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 a53086c259..d29c46aadd 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 713d0ac65e..f3a4ee7f87 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 ac7e9aa750..8029b2371e 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 98180c77ab..987aad6db3 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 87c91b7b53..88524b8956 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 478a5f5744..c2c3e24a05 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 d41674b4a0..aceb334d56 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 69cb2c1814..7e0c1a9368 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 be620c5666..2d4a3c46ef 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 6c43a0d1f4..b2eb74c0bc 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 ecafdd9455..511ed1e280 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 e0f2430577..034ccd9aea 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 aa517c93ac..be11f9b8b6 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 d7c12259fc..32464e6377 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 de865fcab1..00bbf4446f 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
-- 
GitLab