From b9daa57dcb7e2ccbc51abc17af5e1fc05aaf09a8 Mon Sep 17 00:00:00 2001
From: Mathias Bynens <mathias@qiwi.be>
Date: Thu, 11 Oct 2018 16:59:24 +0200
Subject: [PATCH] Rename to $DONOTEVALUATE per @leobalter's suggestion

---
 CONTRIBUTING.md                               | 21 ++++++++++---------
 INTERPRETING.md                               |  6 +++---
 harness/sta.js                                |  2 +-
 .../await-as-binding-identifier-escaped.case  |  2 +-
 .../await-as-binding-identifier.case          |  2 +-
 ...await-as-identifier-reference-escaped.case |  2 +-
 .../await-as-identifier-reference.case        |  2 +-
 .../await-as-label-identifier-escaped.case    |  2 +-
 .../await-as-label-identifier.case            |  2 +-
 .../await-as-binding-identifier-escaped.case  |  2 +-
 .../await-as-binding-identifier.case          |  2 +-
 ...await-as-identifier-reference-escaped.case |  2 +-
 .../await-as-identifier-reference.case        |  2 +-
 .../await-as-label-identifier-escaped.case    |  2 +-
 .../await-as-label-identifier.case            |  2 +-
 .../yield-as-binding-identifier-escaped.case  |  2 +-
 .../yield-as-binding-identifier.case          |  2 +-
 ...yield-as-identifier-reference-escaped.case |  2 +-
 .../yield-as-identifier-reference.case        |  2 +-
 .../yield-as-label-identifier-escaped.case    |  2 +-
 .../yield-as-label-identifier.case            |  2 +-
 .../yield-identifier-spread-strict.case       |  2 +-
 .../yield-identifier-strict.case              |  2 +-
 .../cls-decl-field-delete-covered.template    |  2 +-
 ...s-decl-field-delete-twice-covered.template |  2 +-
 .../cls-decl-field-delete.template            |  2 +-
 .../cls-decl-method-delete-covered.template   |  2 +-
 ...-decl-method-delete-twice-covered.template |  2 +-
 .../cls-decl-method-delete.template           |  2 +-
 .../cls-expr-field-delete-covered.template    |  2 +-
 ...s-expr-field-delete-twice-covered.template |  2 +-
 .../cls-expr-field-delete.template            |  2 +-
 .../cls-expr-method-delete-covered.template   |  2 +-
 ...-expr-method-delete-twice-covered.template |  2 +-
 .../cls-expr-method-delete.template           |  2 +-
 .../cls-decl-fields-arrow-fnc.template        |  2 +-
 .../cls-decl-fields-comp-name.template        |  2 +-
 .../cls-decl-fields-equality.template         |  2 +-
 .../cls-decl-fields-literal-name.template     |  2 +-
 ...cls-decl-fields-private-arrow-fnc.template |  2 +-
 .../cls-decl-fields-private-name.template     |  2 +-
 .../cls-decl-fields-private-ternary.template  |  2 +-
 .../cls-decl-fields-private-typeof.template   |  2 +-
 .../cls-decl-fields-static-comp-name.template |  2 +-
 ...s-decl-fields-static-literal-name.template |  2 +-
 ...s-decl-fields-static-private-name.template |  2 +-
 ...fields-static-string-literal-name.template |  2 +-
 ...s-decl-fields-string-literal-name.template |  2 +-
 .../cls-decl-fields-ternary.template          |  2 +-
 .../cls-decl-fields-typeof.template           |  2 +-
 .../cls-expr-fields-arrow-fnc.template        |  2 +-
 .../cls-expr-fields-comp-name.template        |  2 +-
 .../cls-expr-fields-equality.template         |  2 +-
 .../cls-expr-fields-literal-name.template     |  2 +-
 ...cls-expr-fields-private-arrow-fnc.template |  2 +-
 .../cls-expr-fields-private-name.template     |  2 +-
 .../cls-expr-fields-private-ternary.template  |  2 +-
 .../cls-expr-fields-private-typeof.template   |  2 +-
 .../cls-expr-fields-static-comp-name.template |  2 +-
 ...s-expr-fields-static-literal-name.template |  2 +-
 ...s-expr-fields-static-private-name.template |  2 +-
 ...fields-static-string-literal-name.template |  2 +-
 ...s-expr-fields-string-literal-name.template |  2 +-
 .../cls-expr-fields-ternary.template          |  2 +-
 .../cls-expr-fields-typeof.template           |  2 +-
 .../cls-decl-elements-invalid-syntax.template |  2 +-
 .../cls-expr-elements-invalid-syntax.template |  2 +-
 ...eclare-async-function-declaration.template |  2 +-
 ...clare-async-generator-declaration.template |  2 +-
 ...pt-to-redeclare-class-declaration.template |  2 +-
 ...pt-to-redeclare-const-declaration.template |  2 +-
 ...to-redeclare-function-declaration.template |  2 +-
 ...o-redeclare-generator-declaration.template |  2 +-
 ...empt-to-redeclare-let-declaration.template |  2 +-
 ...empt-to-redeclare-var-declaration.template |  2 +-
 ...eclare-async-function-declaration.template |  2 +-
 ...clare-async-generator-declaration.template |  2 +-
 ...pt-to-redeclare-class-declaration.template |  2 +-
 ...pt-to-redeclare-const-declaration.template |  2 +-
 ...to-redeclare-function-declaration.template |  2 +-
 ...o-redeclare-generator-declaration.template |  2 +-
 ...empt-to-redeclare-let-declaration.template |  2 +-
 ...empt-to-redeclare-var-declaration.template |  2 +-
 ...eclare-async-function-declaration.template |  2 +-
 ...clare-async-generator-declaration.template |  2 +-
 ...pt-to-redeclare-class-declaration.template |  2 +-
 ...pt-to-redeclare-const-declaration.template |  2 +-
 ...to-redeclare-function-declaration.template |  2 +-
 ...o-redeclare-generator-declaration.template |  2 +-
 ...empt-to-redeclare-let-declaration.template |  2 +-
 ...eclare-async-function-declaration.template |  2 +-
 ...clare-async-generator-declaration.template |  2 +-
 ...pt-to-redeclare-class-declaration.template |  2 +-
 ...pt-to-redeclare-const-declaration.template |  2 +-
 ...to-redeclare-function-declaration.template |  2 +-
 ...o-redeclare-generator-declaration.template |  2 +-
 ...empt-to-redeclare-let-declaration.template |  2 +-
 ...eclare-async-function-declaration.template |  2 +-
 ...clare-async-generator-declaration.template |  2 +-
 ...pt-to-redeclare-class-declaration.template |  2 +-
 ...pt-to-redeclare-const-declaration.template |  2 +-
 ...to-redeclare-function-declaration.template |  2 +-
 ...o-redeclare-generator-declaration.template |  2 +-
 ...empt-to-redeclare-let-declaration.template |  2 +-
 ...empt-to-redeclare-var-declaration.template |  2 +-
 ...eclare-async-function-declaration.template |  2 +-
 ...clare-async-generator-declaration.template |  2 +-
 ...pt-to-redeclare-class-declaration.template |  2 +-
 ...pt-to-redeclare-const-declaration.template |  2 +-
 ...to-redeclare-function-declaration.template |  2 +-
 ...o-redeclare-generator-declaration.template |  2 +-
 ...empt-to-redeclare-let-declaration.template |  2 +-
 ...empt-to-redeclare-var-declaration.template |  2 +-
 .../array-elem-init-yield-ident-invalid.case  |  2 +-
 .../array-elem-nested-array-invalid.case      |  2 +-
 ...elem-nested-array-yield-ident-invalid.case |  2 +-
 .../array-elem-nested-obj-invalid.case        |  2 +-
 ...y-elem-nested-obj-yield-ident-invalid.case |  2 +-
 .../array-elem-target-simple-strict.case      |  2 +-
 .../array-elem-target-yield-invalid.case      |  2 +-
 .../array-elem-init-yield-ident-invalid.case  |  2 +-
 .../array-elem-nested-array-invalid.case      |  2 +-
 ...elem-nested-array-yield-ident-invalid.case |  2 +-
 .../array-elem-nested-obj-invalid.case        |  2 +-
 ...y-elem-nested-obj-yield-ident-invalid.case |  2 +-
 .../array-elem-target-simple-strict.case      |  2 +-
 .../array-elem-target-yield-invalid.case      |  2 +-
 .../array-rest-before-element.case            |  2 +-
 .../array-rest-before-elision.case            |  2 +-
 .../array-rest-before-rest.case               |  2 +-
 .../array-rest-elision-invalid.case           |  2 +-
 src/dstr-assignment/array-rest-init.case      |  2 +-
 .../array-rest-nested-array-invalid.case      |  2 +-
 ...rest-nested-array-yield-ident-invalid.case |  2 +-
 .../array-rest-nested-obj-invalid.case        |  2 +-
 ...y-rest-nested-obj-yield-ident-invalid.case |  2 +-
 .../array-rest-yield-ident-invalid.case       |  2 +-
 .../obj-id-identifier-yield-expr.case         |  2 +-
 ...obj-id-identifier-yield-ident-invalid.case |  2 +-
 .../obj-id-init-simple-strict.case            |  2 +-
 .../obj-id-init-yield-ident-invalid.case      |  2 +-
 src/dstr-assignment/obj-id-simple-strict.case |  2 +-
 ...bj-prop-elem-init-yield-ident-invalid.case |  2 +-
 ...-prop-elem-target-yield-ident-invalid.case |  2 +-
 .../obj-prop-nested-array-invalid.case        |  2 +-
 ...prop-nested-array-yield-ident-invalid.case |  2 +-
 .../obj-prop-nested-obj-invalid.case          |  2 +-
 ...j-prop-nested-obj-yield-ident-invalid.case |  2 +-
 .../obj-rest-not-last-element-invalid.case    |  2 +-
 .../ary-ptrn-rest-init-ary.case               |  2 +-
 .../ary-ptrn-rest-init-id.case                |  2 +-
 .../ary-ptrn-rest-init-obj.case               |  2 +-
 .../ary-ptrn-rest-not-final-ary.case          |  2 +-
 .../ary-ptrn-rest-not-final-id.case           |  2 +-
 .../ary-ptrn-rest-not-final-obj.case          |  2 +-
 src/dstr-binding/ary-ptrn-rest-init-ary.case  |  2 +-
 src/dstr-binding/ary-ptrn-rest-init-id.case   |  2 +-
 src/dstr-binding/ary-ptrn-rest-init-obj.case  |  2 +-
 .../ary-ptrn-rest-not-final-ary.case          |  2 +-
 .../ary-ptrn-rest-not-final-id.case           |  2 +-
 .../ary-ptrn-rest-not-final-obj.case          |  2 +-
 .../dflt-params-duplicates.case               |  2 +-
 src/function-forms/dflt-params-rest.case      |  2 +-
 ...est-params-trailing-comma-early-error.case |  2 +-
 .../yield-as-binding-identifier-escaped.case  |  2 +-
 .../yield-as-binding-identifier.case          |  2 +-
 ...yield-as-identifier-reference-escaped.case |  2 +-
 .../yield-as-identifier-reference.case        |  2 +-
 .../yield-as-label-identifier-escaped.case    |  2 +-
 src/generators/yield-as-label-identifier.case |  2 +-
 .../yield-identifier-spread-strict.case       |  2 +-
 src/generators/yield-identifier-strict.case   |  2 +-
 .../expressions/object/__proto__-duplicate.js |  2 +-
 .../legacy-octal-escape-sequence-strict.js    |  2 +-
 .../statements/for-in/bare-initializer.js     |  2 +-
 .../statements/for-in/const-initializer.js    |  2 +-
 .../statements/for-in/let-initializer.js      |  2 +-
 .../statements/for-in/strict-initializer.js   |  2 +-
 .../var-arraybindingpattern-initializer.js    |  2 +-
 .../var-objectbindingpattern-initializer.js   |  2 +-
 ...y-property-with-value-ASCII_-_F-negated.js |  2 +-
 .../binary-property-with-value-ASCII_-_F.js   |  2 +-
 ...erty-with-value-ASCII_-_Invalid-negated.js |  2 +-
 ...ary-property-with-value-ASCII_-_Invalid.js |  2 +-
 ...y-property-with-value-ASCII_-_N-negated.js |  2 +-
 .../binary-property-with-value-ASCII_-_N.js   |  2 +-
 ...-property-with-value-ASCII_-_No-negated.js |  2 +-
 .../binary-property-with-value-ASCII_-_No.js  |  2 +-
 ...y-property-with-value-ASCII_-_T-negated.js |  2 +-
 .../binary-property-with-value-ASCII_-_T.js   |  2 +-
 ...y-property-with-value-ASCII_-_Y-negated.js |  2 +-
 .../binary-property-with-value-ASCII_-_Y.js   |  2 +-
 ...property-with-value-ASCII_-_Yes-negated.js |  2 +-
 .../binary-property-with-value-ASCII_-_Yes.js |  2 +-
 .../character-class-range-end.js              |  2 +-
 .../character-class-range-no-dash-end.js      |  2 +-
 .../character-class-range-no-dash-start.js    |  2 +-
 .../character-class-range-start.js            |  2 +-
 ...ension-In-prefix-Block-implicit-negated.js |  2 +-
 ...mmar-extension-In-prefix-Block-implicit.js |  2 +-
 ...nsion-In-prefix-Script-implicit-negated.js |  2 +-
 ...mar-extension-In-prefix-Script-implicit.js |  2 +-
 ...mmar-extension-In-prefix-Script-negated.js |  2 +-
 .../grammar-extension-In-prefix-Script.js     |  2 +-
 ...mmar-extension-Is-prefix-Script-negated.js |  2 +-
 .../grammar-extension-Is-prefix-Script.js     |  2 +-
 ...r-extension-circumflex-negation-negated.js |  2 +-
 .../grammar-extension-circumflex-negation.js  |  2 +-
 .../grammar-extension-empty-negated.js        |  2 +-
 .../grammar-extension-empty.js                |  2 +-
 .../grammar-extension-invalid-negated.js      |  2 +-
 .../grammar-extension-invalid.js              |  2 +-
 .../grammar-extension-no-braces-negated.js    |  2 +-
 ...ammar-extension-no-braces-value-negated.js |  2 +-
 .../grammar-extension-no-braces-value.js      |  2 +-
 .../grammar-extension-no-braces.js            |  2 +-
 ...ension-separator-and-value-only-negated.js |  2 +-
 ...mmar-extension-separator-and-value-only.js |  2 +-
 .../grammar-extension-separator-negated.js    |  2 +-
 ...rammar-extension-separator-only-negated.js |  2 +-
 .../grammar-extension-separator-only.js       |  2 +-
 .../grammar-extension-separator.js            |  2 +-
 .../grammar-extension-unclosed-negated.js     |  2 +-
 .../grammar-extension-unclosed.js             |  2 +-
 .../grammar-extension-unopened-negated.js     |  2 +-
 .../grammar-extension-unopened.js             |  2 +-
 .../loose-matching-01-negated.js              |  2 +-
 .../property-escapes/loose-matching-01.js     |  2 +-
 .../loose-matching-02-negated.js              |  2 +-
 .../property-escapes/loose-matching-02.js     |  2 +-
 .../loose-matching-03-negated.js              |  2 +-
 .../property-escapes/loose-matching-03.js     |  2 +-
 .../loose-matching-04-negated.js              |  2 +-
 .../property-escapes/loose-matching-04.js     |  2 +-
 .../loose-matching-05-negated.js              |  2 +-
 .../property-escapes/loose-matching-05.js     |  2 +-
 .../loose-matching-06-negated.js              |  2 +-
 .../property-escapes/loose-matching-06.js     |  2 +-
 .../loose-matching-07-negated.js              |  2 +-
 .../property-escapes/loose-matching-07.js     |  2 +-
 .../loose-matching-08-negated.js              |  2 +-
 .../property-escapes/loose-matching-08.js     |  2 +-
 .../loose-matching-09-negated.js              |  2 +-
 .../property-escapes/loose-matching-09.js     |  2 +-
 .../loose-matching-10-negated.js              |  2 +-
 .../property-escapes/loose-matching-10.js     |  2 +-
 .../loose-matching-11-negated.js              |  2 +-
 .../property-escapes/loose-matching-11.js     |  2 +-
 .../loose-matching-12-negated.js              |  2 +-
 .../property-escapes/loose-matching-12.js     |  2 +-
 .../loose-matching-13-negated.js              |  2 +-
 .../property-escapes/loose-matching-13.js     |  2 +-
 .../loose-matching-14-negated.js              |  2 +-
 .../property-escapes/loose-matching-14.js     |  2 +-
 ...t-value-General_Category-equals-negated.js |  2 +-
 ...y-without-value-General_Category-equals.js |  2 +-
 ...-without-value-General_Category-negated.js |  2 +-
 ...property-without-value-General_Category.js |  2 +-
 ...rty-without-value-Script-equals-negated.js |  2 +-
 ...ry-property-without-value-Script-equals.js |  2 +-
 ...y-property-without-value-Script-negated.js |  2 +-
 ...on-binary-property-without-value-Script.js |  2 +-
 ...-value-Script_Extensions-equals-negated.js |  2 +-
 ...-without-value-Script_Extensions-equals.js |  2 +-
 ...without-value-Script_Extensions-negated.js |  2 +-
 ...roperty-without-value-Script_Extensions.js |  2 +-
 .../non-existent-binary-property-negated.js   |  2 +-
 .../non-existent-binary-property.js           |  2 +-
 ...non-existent-property-and-value-negated.js |  2 +-
 .../non-existent-property-and-value.js        |  2 +-
 ...xistent-property-existing-value-negated.js |  2 +-
 .../non-existent-property-existing-value.js   |  2 +-
 ...property-value-General_Category-negated.js |  2 +-
 ...-existent-property-value-Script-negated.js |  2 +-
 .../non-existent-property-value-Script.js     |  2 +-
 ...roperty-value-Script_Extensions-negated.js |  2 +-
 ...istent-property-value-Script_Extensions.js |  2 +-
 ...xistent-property-value-general-category.js |  2 +-
 ...-property-Composition_Exclusion-negated.js |  2 +-
 ...d-binary-property-Composition_Exclusion.js |  2 +-
 ...-binary-property-Expands_On_NFC-negated.js |  2 +-
 ...upported-binary-property-Expands_On_NFC.js |  2 +-
 ...-binary-property-Expands_On_NFD-negated.js |  2 +-
 ...upported-binary-property-Expands_On_NFD.js |  2 +-
 ...binary-property-Expands_On_NFKC-negated.js |  2 +-
 ...pported-binary-property-Expands_On_NFKC.js |  2 +-
 ...binary-property-Expands_On_NFKD-negated.js |  2 +-
 ...pported-binary-property-Expands_On_NFKD.js |  2 +-
 ...binary-property-FC_NFKC_Closure-negated.js |  2 +-
 ...pported-binary-property-FC_NFKC_Closure.js |  2 +-
 ...erty-Full_Composition_Exclusion-negated.js |  2 +-
 ...ary-property-Full_Composition_Exclusion.js |  2 +-
 ...d-binary-property-Grapheme_Link-negated.js |  2 +-
 ...supported-binary-property-Grapheme_Link.js |  2 +-
 ...upported-binary-property-Hyphen-negated.js |  2 +-
 .../unsupported-binary-property-Hyphen.js     |  2 +-
 ...inary-property-Other_Alphabetic-negated.js |  2 +-
 ...ported-binary-property-Other_Alphabetic.js |  2 +-
 ...er_Default_Ignorable_Code_Point-negated.js |  2 +-
 ...erty-Other_Default_Ignorable_Code_Point.js |  2 +-
 ...-property-Other_Grapheme_Extend-negated.js |  2 +-
 ...d-binary-property-Other_Grapheme_Extend.js |  2 +-
 ...nary-property-Other_ID_Continue-negated.js |  2 +-
 ...orted-binary-property-Other_ID_Continue.js |  2 +-
 ...-binary-property-Other_ID_Start-negated.js |  2 +-
 ...upported-binary-property-Other_ID_Start.js |  2 +-
 ...binary-property-Other_Lowercase-negated.js |  2 +-
 ...pported-binary-property-Other_Lowercase.js |  2 +-
 ...rted-binary-property-Other_Math-negated.js |  2 +-
 .../unsupported-binary-property-Other_Math.js |  2 +-
 ...binary-property-Other_Uppercase-negated.js |  2 +-
 ...pported-binary-property-Other_Uppercase.js |  2 +-
 ...ty-Prepended_Concatenation_Mark-negated.js |  2 +-
 ...y-property-Prepended_Concatenation_Mark.js |  2 +-
 ...orted-property-Block-with-value-negated.js |  2 +-
 .../unsupported-property-Block-with-value.js  |  2 +-
 ...ported-property-FC_NFKC_Closure-negated.js |  2 +-
 .../unsupported-property-FC_NFKC_Closure.js   |  2 +-
 ...unsupported-property-Line_Break-negated.js |  2 +-
 ...-property-Line_Break-with-value-negated.js |  2 +-
 ...upported-property-Line_Break-with-value.js |  2 +-
 .../unsupported-property-Line_Break.js        |  2 +-
 test/harness/sta.js                           |  2 +-
 test/language/arguments-object/10.5-1gs.js    |  2 +-
 test/language/asi/S7.9.2_A1_T1.js             |  2 +-
 test/language/asi/S7.9.2_A1_T3.js             |  2 +-
 test/language/asi/S7.9.2_A1_T6.js             |  2 +-
 test/language/asi/S7.9_A10_T2.js              |  2 +-
 test/language/asi/S7.9_A10_T4.js              |  2 +-
 test/language/asi/S7.9_A10_T6.js              |  2 +-
 test/language/asi/S7.9_A10_T8.js              |  2 +-
 test/language/asi/S7.9_A11_T4.js              |  2 +-
 test/language/asi/S7.9_A11_T8.js              |  2 +-
 test/language/asi/S7.9_A4.js                  |  2 +-
 test/language/asi/S7.9_A5.1_T1.js             |  2 +-
 test/language/asi/S7.9_A5.3_T1.js             |  2 +-
 test/language/asi/S7.9_A5.7_T1.js             |  2 +-
 test/language/asi/S7.9_A6.2_T1.js             |  2 +-
 test/language/asi/S7.9_A6.2_T10.js            |  2 +-
 test/language/asi/S7.9_A6.2_T2.js             |  2 +-
 test/language/asi/S7.9_A6.2_T3.js             |  2 +-
 test/language/asi/S7.9_A6.2_T4.js             |  2 +-
 test/language/asi/S7.9_A6.2_T5.js             |  2 +-
 test/language/asi/S7.9_A6.2_T6.js             |  2 +-
 test/language/asi/S7.9_A6.2_T7.js             |  2 +-
 test/language/asi/S7.9_A6.2_T8.js             |  2 +-
 test/language/asi/S7.9_A6.2_T9.js             |  2 +-
 test/language/asi/S7.9_A6.3_T1.js             |  2 +-
 test/language/asi/S7.9_A6.3_T2.js             |  2 +-
 test/language/asi/S7.9_A6.3_T3.js             |  2 +-
 test/language/asi/S7.9_A6.3_T4.js             |  2 +-
 test/language/asi/S7.9_A6.3_T5.js             |  2 +-
 test/language/asi/S7.9_A6.3_T6.js             |  2 +-
 test/language/asi/S7.9_A6.3_T7.js             |  2 +-
 test/language/asi/S7.9_A6.4_T1.js             |  2 +-
 test/language/asi/S7.9_A6.4_T2.js             |  2 +-
 test/language/asi/S7.9_A9_T6.js               |  2 +-
 test/language/asi/S7.9_A9_T7.js               |  2 +-
 test/language/asi/S7.9_A9_T8.js               |  2 +-
 .../disallow-initialization-assignment.js     |  2 +-
 ...l-bindings-with-and-without-initializer.js |  2 +-
 ...tiple-lexical-bindings-with-initializer.js |  2 +-
 ...l-bindings-without-and-with-initializer.js |  2 +-
 .../disallow-multiple-lexical-bindings.js     |  2 +-
 ...-position-do-statement-while-expression.js |  2 +-
 .../in-statement-position-for-statement.js    |  2 +-
 ...-if-expression-statement-else-statement.js |  2 +-
 ...tement-position-if-expression-statement.js |  2 +-
 ...ent-position-while-expression-statement.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...with-var-declaration-nested-in-function.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 test/language/comments/S7.4_A2_T2.js          |  2 +-
 test/language/comments/S7.4_A3.js             |  2 +-
 test/language/comments/S7.4_A4_T1.js          |  2 +-
 test/language/comments/S7.4_A4_T4.js          |  2 +-
 .../comments/multi-line-html-close-extra.js   |  2 +-
 .../single-line-html-close-without-lt.js      |  2 +-
 .../export/escaped-as-export-specifier.js     |  2 +-
 test/language/export/escaped-default.js       |  2 +-
 test/language/export/escaped-from.js          |  2 +-
 .../arrow-function/dflt-params-duplicates.js  |  2 +-
 .../arrow-function/dflt-params-rest.js        |  2 +-
 .../dstr-ary-ptrn-rest-init-ary.js            |  2 +-
 .../dstr-ary-ptrn-rest-init-id.js             |  2 +-
 .../dstr-ary-ptrn-rest-init-obj.js            |  2 +-
 .../dstr-ary-ptrn-rest-not-final-ary.js       |  2 +-
 .../dstr-ary-ptrn-rest-not-final-id.js        |  2 +-
 .../dstr-ary-ptrn-rest-not-final-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-ary.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-id.js        |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../arrow-function/param-dflt-yield-expr.js   |  2 +-
 .../param-dflt-yield-id-strict.js             |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 ...dentifier-identifier-futurereservedword.js |  2 +-
 ...er-identifier-strict-futurereservedword.js |  2 +-
 ...parameters-bindingidentifier-identifier.js |  2 +-
 ...rameters-bindingidentifier-no-arguments.js |  2 +-
 ...rowparameters-bindingidentifier-no-eval.js |  2 +-
 ...owparameters-bindingidentifier-no-yield.js |  2 +-
 .../arrowparameters-bindingidentifier-rest.js |  2 +-
 .../arrowparameters-cover-no-arguments.js     |  2 +-
 ...ers-cover-no-duplicates-binding-array-1.js |  2 +-
 ...ers-cover-no-duplicates-binding-array-2.js |  2 +-
 ...ers-cover-no-duplicates-binding-array-3.js |  2 +-
 ...rs-cover-no-duplicates-binding-object-1.js |  2 +-
 ...rs-cover-no-duplicates-binding-object-2.js |  2 +-
 ...rs-cover-no-duplicates-binding-object-3.js |  2 +-
 ...rs-cover-no-duplicates-binding-object-4.js |  2 +-
 ...rs-cover-no-duplicates-binding-object-5.js |  2 +-
 ...rs-cover-no-duplicates-binding-object-6.js |  2 +-
 ...rrowparameters-cover-no-duplicates-rest.js |  2 +-
 .../arrowparameters-cover-no-duplicates.js    |  2 +-
 .../arrowparameters-cover-no-eval.js          |  2 +-
 .../arrowparameters-cover-no-yield.js         |  2 +-
 ...id-parenless-parameters-expression-body.js |  2 +-
 ...estriction-invalid-parenless-parameters.js |  2 +-
 .../early-errors/asi-restriction-invalid.js   |  2 +-
 .../use-strict-with-non-simple-param.js       |  2 +-
 ...str-array-elem-init-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-nested-array-invalid.js   |  2 +-
 ...y-elem-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-nested-obj-invalid.js     |  2 +-
 ...ray-elem-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-target-simple-strict.js   |  2 +-
 .../dstr-array-elem-target-yield-invalid.js   |  2 +-
 .../dstr-array-rest-before-element.js         |  2 +-
 .../dstr-array-rest-before-elision.js         |  2 +-
 .../assignment/dstr-array-rest-before-rest.js |  2 +-
 .../dstr-array-rest-elision-invalid.js        |  2 +-
 .../assignment/dstr-array-rest-init.js        |  2 +-
 .../dstr-array-rest-nested-array-invalid.js   |  2 +-
 ...y-rest-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-array-rest-nested-obj-invalid.js     |  2 +-
 ...ray-rest-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-array-rest-yield-ident-invalid.js    |  2 +-
 .../dstr-obj-id-identifier-yield-expr.js      |  2 +-
 ...r-obj-id-identifier-yield-ident-invalid.js |  2 +-
 .../dstr-obj-id-init-simple-strict.js         |  2 +-
 .../dstr-obj-id-init-yield-ident-invalid.js   |  2 +-
 .../assignment/dstr-obj-id-simple-strict.js   |  2 +-
 ...-obj-prop-elem-init-yield-ident-invalid.js |  2 +-
 ...bj-prop-elem-target-yield-ident-invalid.js |  2 +-
 .../dstr-obj-prop-nested-array-invalid.js     |  2 +-
 ...j-prop-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-obj-prop-nested-obj-invalid.js       |  2 +-
 ...obj-prop-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-obj-rest-not-last-element-invalid.js |  2 +-
 .../assignment/id-arguments-strict.js         |  2 +-
 .../expressions/assignment/id-eval-strict.js  |  2 +-
 .../assignment/non-simple-target.js           |  2 +-
 .../expressions/assignment/target-boolean.js  |  2 +-
 .../assignment/target-cover-newtarget.js      |  2 +-
 .../assignment/target-cover-yieldexpr.js      |  2 +-
 .../assignment/target-newtarget.js            |  2 +-
 .../expressions/assignment/target-null.js     |  2 +-
 .../expressions/assignment/target-number.js   |  2 +-
 .../expressions/assignment/target-string.js   |  2 +-
 .../await-as-binding-identifier-escaped.js    |  2 +-
 .../await-as-binding-identifier.js            |  2 +-
 .../await-as-identifier-reference-escaped.js  |  2 +-
 .../await-as-identifier-reference.js          |  2 +-
 .../await-as-label-identifier-escaped.js      |  2 +-
 .../await-as-label-identifier.js              |  2 +-
 ...m-ident-nested-arrow-parameter-position.js |  2 +-
 ...ait-as-param-nested-arrow-body-position.js |  2 +-
 ...s-param-nested-arrow-parameter-position.js |  2 +-
 ...am-rest-nested-arrow-parameter-position.js |  2 +-
 .../dflt-params-duplicates.js                 |  2 +-
 .../async-arrow-function/dflt-params-rest.js  |  2 +-
 .../early-errors-arrow-NSPL-with-USD.js       |  2 +-
 ...rs-arrow-arguments-in-formal-parameters.js |  2 +-
 ...y-errors-arrow-await-in-formals-default.js |  2 +-
 .../early-errors-arrow-await-in-formals.js    |  2 +-
 ...y-errors-arrow-body-contains-super-call.js |  2 +-
 ...rors-arrow-body-contains-super-property.js |  2 +-
 ...early-errors-arrow-duplicate-parameters.js |  2 +-
 ...-errors-arrow-eval-in-formal-parameters.js |  2 +-
 ...rly-errors-arrow-formals-body-duplicate.js |  2 +-
 ...rrors-arrow-formals-contains-super-call.js |  2 +-
 ...s-arrow-formals-contains-super-property.js |  2 +-
 ...rly-errors-arrow-formals-lineterminator.js |  2 +-
 .../async-arrow-function/escaped-async.js     |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 .../await-as-binding-identifier-escaped.js    |  2 +-
 .../await-as-binding-identifier.js            |  2 +-
 .../await-as-identifier-reference-escaped.js  |  2 +-
 .../await-as-identifier-reference.js          |  2 +-
 .../await-as-label-identifier-escaped.js      |  2 +-
 .../await-as-label-identifier.js              |  2 +-
 .../early-errors-expression-NSPL-with-USD.js  |  2 +-
 ...expression-binding-identifier-arguments.js |  2 +-
 ...rors-expression-binding-identifier-eval.js |  2 +-
 ...ors-expression-body-contains-super-call.js |  2 +-
 ...expression-body-contains-super-property.js |  2 +-
 ...rs-expression-eval-in-formal-parameters.js |  2 +-
 ...rrors-expression-formals-body-duplicate.js |  2 +-
 ...-expression-formals-contains-super-call.js |  2 +-
 ...ression-formals-contains-super-property.js |  2 +-
 ...expression-not-simple-assignment-target.js |  2 +-
 .../async-function/escaped-async.js           |  2 +-
 ...med-await-as-binding-identifier-escaped.js |  2 +-
 .../named-await-as-binding-identifier.js      |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 .../named-await-as-identifier-reference.js    |  2 +-
 ...named-await-as-label-identifier-escaped.js |  2 +-
 .../named-await-as-label-identifier.js        |  2 +-
 .../named-dflt-params-duplicates.js           |  2 +-
 .../async-function/named-dflt-params-rest.js  |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../nameless-dflt-params-duplicates.js        |  2 +-
 .../nameless-dflt-params-rest.js              |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../await-as-binding-identifier-escaped.js    |  2 +-
 .../await-as-binding-identifier.js            |  2 +-
 .../await-as-identifier-reference-escaped.js  |  2 +-
 .../await-as-identifier-reference.js          |  2 +-
 .../await-as-label-identifier-escaped.js      |  2 +-
 .../await-as-label-identifier.js              |  2 +-
 .../async-generator/dflt-params-duplicates.js |  2 +-
 .../async-generator/dflt-params-rest.js       |  2 +-
 .../dstr-ary-ptrn-rest-init-ary.js            |  2 +-
 .../dstr-ary-ptrn-rest-init-id.js             |  2 +-
 .../dstr-ary-ptrn-rest-init-obj.js            |  2 +-
 .../dstr-ary-ptrn-rest-not-final-ary.js       |  2 +-
 .../dstr-ary-ptrn-rest-not-final-id.js        |  2 +-
 .../dstr-ary-ptrn-rest-not-final-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-ary.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-id.js        |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../dstr-named-ary-ptrn-rest-init-ary.js      |  2 +-
 .../dstr-named-ary-ptrn-rest-init-id.js       |  2 +-
 .../dstr-named-ary-ptrn-rest-init-obj.js      |  2 +-
 .../dstr-named-ary-ptrn-rest-not-final-ary.js |  2 +-
 .../dstr-named-ary-ptrn-rest-not-final-id.js  |  2 +-
 .../dstr-named-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../dstr-named-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 .../dstr-named-dflt-ary-ptrn-rest-init-id.js  |  2 +-
 .../dstr-named-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...-named-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...r-named-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...-named-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../early-errors-expression-NSPL-with-USD.js  |  2 +-
 ...pression-arguments-in-formal-parameters.js |  2 +-
 ...on-await-as-function-binding-identifier.js |  2 +-
 ...expression-binding-identifier-arguments.js |  2 +-
 ...rors-expression-binding-identifier-eval.js |  2 +-
 ...ors-expression-body-contains-super-call.js |  2 +-
 ...expression-body-contains-super-property.js |  2 +-
 ...rs-expression-eval-in-formal-parameters.js |  2 +-
 ...expression-formals-body-duplicate-const.js |  2 +-
 ...s-expression-formals-body-duplicate-let.js |  2 +-
 ...-expression-formals-contains-await-expr.js |  2 +-
 ...rrors-expression-formals-contains-await.js |  2 +-
 ...-expression-formals-contains-super-call.js |  2 +-
 ...ression-formals-contains-super-property.js |  2 +-
 ...-expression-formals-contains-yield-expr.js |  2 +-
 ...rrors-expression-formals-contains-yield.js |  2 +-
 ...arly-errors-expression-label-name-await.js |  2 +-
 ...arly-errors-expression-label-name-yield.js |  2 +-
 ...expression-not-simple-assignment-target.js |  2 +-
 ...on-yield-as-function-binding-identifier.js |  2 +-
 ...ors-expression-yield-star-after-newline.js |  2 +-
 .../async-generator/escaped-async.js          |  2 +-
 ...med-await-as-binding-identifier-escaped.js |  2 +-
 .../named-await-as-binding-identifier.js      |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 .../named-await-as-identifier-reference.js    |  2 +-
 ...named-await-as-label-identifier-escaped.js |  2 +-
 .../named-await-as-label-identifier.js        |  2 +-
 .../named-dflt-params-duplicates.js           |  2 +-
 .../async-generator/named-dflt-params-rest.js |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...med-yield-as-binding-identifier-escaped.js |  2 +-
 .../named-yield-as-binding-identifier.js      |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 .../named-yield-as-identifier-reference.js    |  2 +-
 ...named-yield-as-label-identifier-escaped.js |  2 +-
 .../named-yield-as-label-identifier.js        |  2 +-
 .../named-yield-identifier-spread-strict.js   |  2 +-
 .../named-yield-identifier-strict.js          |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 .../yield-as-binding-identifier-escaped.js    |  2 +-
 .../yield-as-binding-identifier.js            |  2 +-
 .../yield-as-identifier-reference-escaped.js  |  2 +-
 .../yield-as-identifier-reference.js          |  2 +-
 .../yield-as-label-identifier-escaped.js      |  2 +-
 .../yield-as-label-identifier.js              |  2 +-
 .../yield-identifier-spread-strict.js         |  2 +-
 .../yield-identifier-strict.js                |  2 +-
 .../await/await-BindingIdentifier-nested.js   |  2 +-
 ...rors-await-not-simple-assignment-target.js |  2 +-
 test/language/expressions/await/no-operand.js |  2 +-
 .../expressions/call/S11.2.4_A1.3_T1.js       |  2 +-
 .../async-gen-meth-dflt-params-duplicates.js  |  2 +-
 .../class/async-gen-meth-dflt-params-rest.js  |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...-gen-meth-static-dflt-params-duplicates.js |  2 +-
 .../async-gen-meth-static-dflt-params-rest.js |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...hod-await-as-binding-identifier-escaped.js |  2 +-
 ...-gen-method-await-as-binding-identifier.js |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 ...en-method-await-as-identifier-reference.js |  2 +-
 ...ethod-await-as-label-identifier-escaped.js |  2 +-
 ...nc-gen-method-await-as-label-identifier.js |  2 +-
 ...tic-await-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-await-as-binding-identifier.js |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 ...od-static-await-as-identifier-reference.js |  2 +-
 ...tatic-await-as-label-identifier-escaped.js |  2 +-
 ...method-static-await-as-label-identifier.js |  2 +-
 ...tic-yield-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-yield-as-binding-identifier.js |  2 +-
 ...c-yield-as-identifier-reference-escaped.js |  2 +-
 ...od-static-yield-as-identifier-reference.js |  2 +-
 ...tatic-yield-as-label-identifier-escaped.js |  2 +-
 ...method-static-yield-as-label-identifier.js |  2 +-
 ...d-static-yield-identifier-spread-strict.js |  2 +-
 ...n-method-static-yield-identifier-strict.js |  2 +-
 ...hod-yield-as-binding-identifier-escaped.js |  2 +-
 ...-gen-method-yield-as-binding-identifier.js |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 ...en-method-yield-as-identifier-reference.js |  2 +-
 ...ethod-yield-as-label-identifier-escaped.js |  2 +-
 ...nc-gen-method-yield-as-label-identifier.js |  2 +-
 ...n-method-yield-identifier-spread-strict.js |  2 +-
 ...sync-gen-method-yield-identifier-strict.js |  2 +-
 ...hod-await-as-binding-identifier-escaped.js |  2 +-
 ...vate-method-await-as-binding-identifier.js |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 ...te-method-await-as-identifier-reference.js |  2 +-
 ...ethod-await-as-label-identifier-escaped.js |  2 +-
 ...rivate-method-await-as-label-identifier.js |  2 +-
 ...tic-await-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-await-as-binding-identifier.js |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 ...od-static-await-as-identifier-reference.js |  2 +-
 ...tatic-await-as-label-identifier-escaped.js |  2 +-
 ...method-static-await-as-label-identifier.js |  2 +-
 ...tic-yield-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-yield-as-binding-identifier.js |  2 +-
 ...c-yield-as-identifier-reference-escaped.js |  2 +-
 ...od-static-yield-as-identifier-reference.js |  2 +-
 ...tatic-yield-as-label-identifier-escaped.js |  2 +-
 ...method-static-yield-as-label-identifier.js |  2 +-
 ...d-static-yield-identifier-spread-strict.js |  2 +-
 ...e-method-static-yield-identifier-strict.js |  2 +-
 ...hod-yield-as-binding-identifier-escaped.js |  2 +-
 ...vate-method-yield-as-binding-identifier.js |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 ...te-method-yield-as-identifier-reference.js |  2 +-
 ...ethod-yield-as-label-identifier-escaped.js |  2 +-
 ...rivate-method-yield-as-label-identifier.js |  2 +-
 ...e-method-yield-identifier-spread-strict.js |  2 +-
 ...-private-method-yield-identifier-strict.js |  2 +-
 .../async-meth-dflt-params-duplicates.js      |  2 +-
 .../class/async-meth-dflt-params-rest.js      |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...sync-meth-static-dflt-params-duplicates.js |  2 +-
 .../async-meth-static-dflt-params-rest.js     |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...hod-await-as-binding-identifier-escaped.js |  2 +-
 ...sync-method-await-as-binding-identifier.js |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 ...nc-method-await-as-identifier-reference.js |  2 +-
 ...ethod-await-as-label-identifier-escaped.js |  2 +-
 .../async-method-await-as-label-identifier.js |  2 +-
 ...tic-await-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-await-as-binding-identifier.js |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 ...od-static-await-as-identifier-reference.js |  2 +-
 ...tatic-await-as-label-identifier-escaped.js |  2 +-
 ...method-static-await-as-label-identifier.js |  2 +-
 ...hod-await-as-binding-identifier-escaped.js |  2 +-
 ...vate-method-await-as-binding-identifier.js |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 ...te-method-await-as-identifier-reference.js |  2 +-
 ...ethod-await-as-label-identifier-escaped.js |  2 +-
 ...rivate-method-await-as-label-identifier.js |  2 +-
 ...tic-await-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-await-as-binding-identifier.js |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 ...od-static-await-as-identifier-reference.js |  2 +-
 ...tatic-await-as-label-identifier-escaped.js |  2 +-
 ...method-static-await-as-label-identifier.js |  2 +-
 .../class-name-ident-await-escaped-module.js  |  2 +-
 .../class/class-name-ident-await-module.js    |  2 +-
 .../class/class-name-ident-let-escaped.js     |  2 +-
 .../expressions/class/class-name-ident-let.js |  2 +-
 .../class/class-name-ident-static-escaped.js  |  2 +-
 .../class/class-name-ident-static.js          |  2 +-
 .../class/class-name-ident-yield-escaped.js   |  2 +-
 .../class/class-name-ident-yield.js           |  2 +-
 ...r-async-gen-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...tr-async-gen-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...r-async-gen-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...nc-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...ync-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...nc-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...nc-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...ync-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...nc-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...c-gen-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...private-gen-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...-private-gen-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...private-gen-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...te-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...ate-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...te-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...te-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...ate-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...te-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...e-gen-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-ary.js   |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-id.js    |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-obj.js   |  2 +-
 ...tr-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...str-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...tr-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...tr-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...str-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...tr-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...r-gen-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../class/dstr-meth-ary-ptrn-rest-init-ary.js |  2 +-
 .../class/dstr-meth-ary-ptrn-rest-init-id.js  |  2 +-
 .../class/dstr-meth-ary-ptrn-rest-init-obj.js |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-ary.js  |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-id.js   |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-obj.js  |  2 +-
 ...r-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...tr-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...r-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...dstr-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 .../dstr-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...dstr-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...private-gen-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...-private-gen-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...private-gen-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...te-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...ate-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...te-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...te-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...ate-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...te-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...e-gen-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...str-private-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...dstr-private-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...str-private-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...rivate-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...private-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...rivate-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...rivate-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...private-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...rivate-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...e-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...te-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...e-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...vate-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...ivate-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...vate-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...s-arrow-fnc-init-err-contains-arguments.js |  2 +-
 ...ields-arrow-fnc-init-err-contains-super.js |  2 +-
 .../expressions/class/fields-asi-3.js         |  2 +-
 .../expressions/class/fields-asi-4.js         |  2 +-
 ...s-comp-name-init-err-contains-arguments.js |  2 +-
 ...ields-comp-name-init-err-contains-super.js |  2 +-
 .../class/fields-duplicate-privatenames.js    |  2 +-
 ...ds-equality-init-err-contains-arguments.js |  2 +-
 ...fields-equality-init-err-contains-super.js |  2 +-
 ...iteral-name-init-err-contains-arguments.js |  2 +-
 ...ds-literal-name-init-err-contains-super.js |  2 +-
 ...ields-literal-name-propname-constructor.js |  2 +-
 ...iteral-name-static-propname-constructor.js |  2 +-
 ...-literal-name-static-propname-prototype.js |  2 +-
 ...e-arrow-fnc-init-err-contains-arguments.js |  2 +-
 ...ivate-arrow-fnc-init-err-contains-super.js |  2 +-
 ...iteral-name-init-err-contains-arguments.js |  2 +-
 ...te-literal-name-init-err-contains-super.js |  2 +-
 ...ate-ternary-init-err-contains-arguments.js |  2 +-
 ...private-ternary-init-err-contains-super.js |  2 +-
 ...vate-typeof-init-err-contains-arguments.js |  2 +-
 ...-private-typeof-init-err-contains-super.js |  2 +-
 ...c-comp-name-init-err-contains-arguments.js |  2 +-
 ...tatic-comp-name-init-err-contains-super.js |  2 +-
 ...tic-literal-init-err-contains-arguments.js |  2 +-
 ...-static-literal-init-err-contains-super.js |  2 +-
 ...tic-private-init-err-contains-arguments.js |  2 +-
 ...-static-private-init-err-contains-super.js |  2 +-
 ...iteral-name-init-err-contains-arguments.js |  2 +-
 ...ng-literal-name-init-err-contains-super.js |  2 +-
 ...iteral-name-init-err-contains-arguments.js |  2 +-
 ...ng-literal-name-init-err-contains-super.js |  2 +-
 ...fields-string-name-propname-constructor.js |  2 +-
 ...string-name-static-propname-constructor.js |  2 +-
 ...s-string-name-static-propname-prototype.js |  2 +-
 ...lds-ternary-init-err-contains-arguments.js |  2 +-
 .../fields-ternary-init-err-contains-super.js |  2 +-
 ...elds-typeof-init-err-contains-arguments.js |  2 +-
 .../fields-typeof-init-err-contains-super.js  |  2 +-
 .../class/gen-meth-dflt-params-duplicates.js  |  2 +-
 .../class/gen-meth-dflt-params-rest.js        |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../gen-meth-static-dflt-params-duplicates.js |  2 +-
 .../class/gen-meth-static-dflt-params-rest.js |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../class/gen-method-param-dflt-yield.js      |  2 +-
 ...tic-yield-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-yield-as-binding-identifier.js |  2 +-
 ...c-yield-as-identifier-reference-escaped.js |  2 +-
 ...od-static-yield-as-identifier-reference.js |  2 +-
 ...tatic-yield-as-label-identifier-escaped.js |  2 +-
 ...method-static-yield-as-label-identifier.js |  2 +-
 ...d-static-yield-identifier-spread-strict.js |  2 +-
 ...n-method-static-yield-identifier-strict.js |  2 +-
 ...hod-yield-as-binding-identifier-escaped.js |  2 +-
 .../gen-method-yield-as-binding-identifier.js |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 ...en-method-yield-as-identifier-reference.js |  2 +-
 ...ethod-yield-as-label-identifier-escaped.js |  2 +-
 .../gen-method-yield-as-label-identifier.js   |  2 +-
 ...n-method-yield-identifier-spread-strict.js |  2 +-
 .../gen-method-yield-identifier-strict.js     |  2 +-
 ...tic-yield-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-yield-as-binding-identifier.js |  2 +-
 ...c-yield-as-identifier-reference-escaped.js |  2 +-
 ...od-static-yield-as-identifier-reference.js |  2 +-
 ...tatic-yield-as-label-identifier-escaped.js |  2 +-
 ...method-static-yield-as-label-identifier.js |  2 +-
 ...d-static-yield-identifier-spread-strict.js |  2 +-
 ...e-method-static-yield-identifier-strict.js |  2 +-
 ...hod-yield-as-binding-identifier-escaped.js |  2 +-
 ...vate-method-yield-as-binding-identifier.js |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 ...te-method-yield-as-identifier-reference.js |  2 +-
 ...ethod-yield-as-label-identifier-escaped.js |  2 +-
 ...rivate-method-yield-as-label-identifier.js |  2 +-
 ...e-method-yield-identifier-spread-strict.js |  2 +-
 ...-private-method-yield-identifier-strict.js |  2 +-
 .../expressions/class/getter-param-dflt.js    |  2 +-
 .../class/meth-dflt-params-duplicates.js      |  2 +-
 .../class/meth-dflt-params-rest.js            |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../meth-static-dflt-params-duplicates.js     |  2 +-
 .../class/meth-static-dflt-params-rest.js     |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../class/method-param-dflt-yield.js          |  2 +-
 .../static-gen-method-param-dflt-yield.js     |  2 +-
 .../class/static-method-param-dflt-yield.js   |  2 +-
 .../grammar-class-body-ctor-duplicate.js      |  2 +-
 .../grammar-ctor-super-no-heritage.js         |  2 +-
 ...mmar-field-identifier-invalid-ues-error.js |  2 +-
 ...mmar-field-identifier-invalid-zwj-error.js |  2 +-
 ...mar-field-identifier-invalid-zwnj-error.js |  2 +-
 .../grammar-fields-same-line-error.js         |  2 +-
 ...grammar-privatemeth-duplicate-get-field.js |  2 +-
 .../grammar-privatemeth-duplicate-get-get.js  |  2 +-
 ...rammar-privatemeth-duplicate-meth-field.js |  2 +-
 .../grammar-privatemeth-duplicate-meth-get.js |  2 +-
 ...grammar-privatemeth-duplicate-meth-meth.js |  2 +-
 .../grammar-privatemeth-duplicate-meth-set.js |  2 +-
 ...-privatemeth-duplicate-meth-staticfield.js |  2 +-
 ...r-privatemeth-duplicate-meth-staticmeth.js |  2 +-
 ...grammar-privatemeth-duplicate-set-field.js |  2 +-
 .../grammar-privatemeth-duplicate-set-set.js  |  2 +-
 .../grammar-privatename-constructor.js        |  2 +-
 .../early-errors/grammar-privatename-error.js |  2 +-
 ...mmar-privatename-identifier-invalid-ues.js |  2 +-
 ...rivatename-identifier-invalid-zwj-error.js |  2 +-
 ...ivatename-identifier-invalid-zwnj-error.js |  2 +-
 ...name-whitespace-error-accessor-get-meth.js |  2 +-
 ...name-whitespace-error-accessor-set-meth.js |  2 +-
 ...atename-whitespace-error-async-gen-meth.js |  2 +-
 ...privatename-whitespace-error-async-meth.js |  2 +-
 ...-privatename-whitespace-error-call-expr.js |  2 +-
 ...privatename-whitespace-error-field-init.js |  2 +-
 ...mmar-privatename-whitespace-error-field.js |  2 +-
 ...r-privatename-whitespace-error-gen-meth.js |  2 +-
 ...rivatename-whitespace-error-member-expr.js |  2 +-
 ...-privatename-whitespace-error-meth.case.js |  2 +-
 ...itespace-error-static-accessor-get-meth.js |  2 +-
 ...itespace-error-static-accessor-set-meth.js |  2 +-
 ...-whitespace-error-static-async-gen-meth.js |  2 +-
 ...name-whitespace-error-static-async-meth.js |  2 +-
 ...name-whitespace-error-static-field-init.js |  2 +-
 ...ivatename-whitespace-error-static-field.js |  2 +-
 ...tename-whitespace-error-static-gen-meth.js |  2 +-
 ...rivatename-whitespace-error-static-meth.js |  2 +-
 .../grammar-privatenames-same-line-error.js   |  2 +-
 ...r-special-meth-contains-super-async-gen.js |  2 +-
 ...ammar-special-meth-contains-super-async.js |  2 +-
 ...grammar-special-meth-contains-super-gen.js |  2 +-
 ...grammar-special-meth-contains-super-get.js |  2 +-
 ...mmar-special-meth-contains-super-method.js |  2 +-
 ...l-meth-contains-super-private-async-gen.js |  2 +-
 ...ecial-meth-contains-super-private-async.js |  2 +-
 ...special-meth-contains-super-private-gen.js |  2 +-
 ...cial-meth-contains-super-private-method.js |  2 +-
 ...grammar-special-meth-contains-super-set.js |  2 +-
 .../grammar-special-meth-ctor-async-gen.js    |  2 +-
 .../grammar-special-meth-ctor-async-meth.js   |  2 +-
 .../grammar-special-meth-ctor-gen.js          |  2 +-
 .../grammar-special-meth-ctor-get.js          |  2 +-
 .../grammar-special-meth-ctor-set.js          |  2 +-
 ...grammar-static-async-gen-meth-prototype.js |  2 +-
 .../grammar-static-async-gen-meth-super.js    |  2 +-
 .../grammar-static-async-meth-prototype.js    |  2 +-
 .../grammar-static-async-meth-super.js        |  2 +-
 .../grammar-static-gen-meth-prototype.js      |  2 +-
 .../grammar-static-gen-meth-super.js          |  2 +-
 .../grammar-static-get-meth-prototype.js      |  2 +-
 .../grammar-static-get-meth-super.js          |  2 +-
 .../grammar-static-meth-prototype.js          |  2 +-
 .../early-errors/grammar-static-meth-super.js |  2 +-
 ...atic-private-async-gen-meth-constructor.js |  2 +-
 ...mar-static-private-async-gen-meth-super.js |  2 +-
 ...r-static-private-async-meth-constructor.js |  2 +-
 ...grammar-static-private-async-meth-super.js |  2 +-
 ...mar-static-private-gen-meth-constructor.js |  2 +-
 .../grammar-static-private-gen-meth-super.js  |  2 +-
 ...grammar-static-private-meth-constructor.js |  2 +-
 .../grammar-static-private-meth-super.js      |  2 +-
 .../grammar-static-privatename-constructor.js |  2 +-
 .../grammar-static-set-meth-prototype.js      |  2 +-
 .../grammar-static-set-meth-super.js          |  2 +-
 .../compound-assignment/11.13.2-6-1gs.js      |  2 +-
 .../compound-assignment/add-non-simple.js     |  2 +-
 .../btws-and-non-simple.js                    |  2 +-
 .../compound-assignment/btws-or-non-simple.js |  2 +-
 .../btws-xor-non-simple.js                    |  2 +-
 .../compound-assignment/div-non-simple.js     |  2 +-
 .../left-shift-non-simple.js                  |  2 +-
 .../compound-assignment/mod-div-non-simple.js |  2 +-
 .../compound-assignment/mult-non-simple.js    |  2 +-
 .../right-shift-non-simple.js                 |  2 +-
 .../subtract-non-simple.js                    |  2 +-
 .../u-right-shift-non-simple.js               |  2 +-
 .../expressions/conditional/in-branch-2.js    |  2 +-
 .../expressions/conditional/in-condition.js   |  2 +-
 .../expressions/delete/11.4.1-5-a-5gs.js      |  2 +-
 .../expressions/delete/identifier-strict.js   |  2 +-
 ...ntax-error-bitnot-unary-expression-base.js |  2 +-
 ...ntax-error-delete-unary-expression-base.js |  2 +-
 ...error-logical-not-unary-expression-base.js |  2 +-
 ...ntax-error-negate-unary-expression-base.js |  2 +-
 ...syntax-error-plus-unary-expression-base.js |  2 +-
 ...ntax-error-typeof-unary-expression-base.js |  2 +-
 ...syntax-error-void-unary-expression-base.js |  2 +-
 .../function/dflt-params-duplicates.js        |  2 +-
 .../expressions/function/dflt-params-rest.js  |  2 +-
 .../function/dstr-ary-ptrn-rest-init-ary.js   |  2 +-
 .../function/dstr-ary-ptrn-rest-init-id.js    |  2 +-
 .../function/dstr-ary-ptrn-rest-init-obj.js   |  2 +-
 .../dstr-ary-ptrn-rest-not-final-ary.js       |  2 +-
 .../dstr-ary-ptrn-rest-not-final-id.js        |  2 +-
 .../dstr-ary-ptrn-rest-not-final-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-ary.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-id.js        |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../function/early-body-super-call.js         |  2 +-
 .../function/early-body-super-prop.js         |  2 +-
 .../function/early-params-super-call.js       |  2 +-
 .../function/early-params-super-prop.js       |  2 +-
 .../function/name-arguments-strict-body.js    |  2 +-
 .../function/name-arguments-strict.js         |  2 +-
 .../function/name-eval-strict-body.js         |  2 +-
 .../expressions/function/name-eval-strict.js  |  2 +-
 .../function/param-dflt-yield-strict.js       |  2 +-
 .../function/param-duplicated-strict-1.js     |  2 +-
 .../function/param-duplicated-strict-2.js     |  2 +-
 .../function/param-duplicated-strict-3.js     |  2 +-
 .../param-duplicated-strict-body-1.js         |  2 +-
 .../param-duplicated-strict-body-2.js         |  2 +-
 .../param-duplicated-strict-body-3.js         |  2 +-
 .../function/param-eval-strict-body.js        |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 .../use-strict-with-non-simple-param.js       |  2 +-
 .../generators/dflt-params-duplicates.js      |  2 +-
 .../generators/dflt-params-rest.js            |  2 +-
 .../generators/dstr-ary-ptrn-rest-init-ary.js |  2 +-
 .../generators/dstr-ary-ptrn-rest-init-id.js  |  2 +-
 .../generators/dstr-ary-ptrn-rest-init-obj.js |  2 +-
 .../dstr-ary-ptrn-rest-not-final-ary.js       |  2 +-
 .../dstr-ary-ptrn-rest-not-final-id.js        |  2 +-
 .../dstr-ary-ptrn-rest-not-final-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-ary.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-id.js        |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-obj.js  |  2 +-
 ...med-yield-as-binding-identifier-escaped.js |  2 +-
 .../named-yield-as-binding-identifier.js      |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 .../named-yield-as-identifier-reference.js    |  2 +-
 ...named-yield-as-label-identifier-escaped.js |  2 +-
 .../named-yield-as-label-identifier.js        |  2 +-
 .../named-yield-identifier-spread-strict.js   |  2 +-
 .../named-yield-identifier-strict.js          |  2 +-
 .../generators/param-dflt-yield.js            |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 .../use-strict-with-non-simple-param.js       |  2 +-
 .../yield-as-binding-identifier-escaped.js    |  2 +-
 .../generators/yield-as-binding-identifier.js |  2 +-
 ...generator-expression-binding-identifier.js |  2 +-
 .../yield-as-identifier-reference-escaped.js  |  2 +-
 .../yield-as-identifier-reference.js          |  2 +-
 .../yield-as-label-identifier-escaped.js      |  2 +-
 .../generators/yield-as-label-identifier.js   |  2 +-
 .../yield-as-logical-or-expression.js         |  2 +-
 .../generators/yield-as-parameter.js          |  2 +-
 .../yield-identifier-spread-strict.js         |  2 +-
 .../generators/yield-identifier-strict.js     |  2 +-
 .../generators/yield-star-after-newline.js    |  2 +-
 .../generators/yield-weak-binding.js          |  2 +-
 .../expressions/new.target/escaped-new.js     |  2 +-
 .../expressions/new.target/escaped-target.js  |  2 +-
 .../language/expressions/object/11.1.5-1gs.js |  2 +-
 .../object/cover-initialized-name.js          |  2 +-
 ...r-async-gen-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...tr-async-gen-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...r-async-gen-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...nc-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...ync-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...nc-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...nc-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...ync-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...nc-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-ary.js   |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-id.js    |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-obj.js   |  2 +-
 ...tr-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...str-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...tr-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...tr-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...str-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...tr-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../dstr-meth-ary-ptrn-rest-init-ary.js       |  2 +-
 .../object/dstr-meth-ary-ptrn-rest-init-id.js |  2 +-
 .../dstr-meth-ary-ptrn-rest-init-obj.js       |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-ary.js  |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-id.js   |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-obj.js  |  2 +-
 ...r-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...tr-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...r-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../object/getter-body-strict-inside.js       |  2 +-
 .../object/getter-body-strict-outside.js      |  2 +-
 .../expressions/object/getter-param-dflt.js   |  2 +-
 ...ntifier-shorthand-invalid-computed-name.js |  2 +-
 .../identifier-shorthand-invalid-zero.js      |  2 +-
 ...ync-await-as-binding-identifier-escaped.js |  2 +-
 .../async-await-as-binding-identifier.js      |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 .../async-await-as-identifier-reference.js    |  2 +-
 ...async-await-as-label-identifier-escaped.js |  2 +-
 .../async-await-as-label-identifier.js        |  2 +-
 ...gen-await-as-binding-identifier-escaped.js |  2 +-
 .../async-gen-await-as-binding-identifier.js  |  2 +-
 ...n-await-as-identifier-reference-escaped.js |  2 +-
 ...async-gen-await-as-identifier-reference.js |  2 +-
 ...c-gen-await-as-label-identifier-escaped.js |  2 +-
 .../async-gen-await-as-label-identifier.js    |  2 +-
 .../async-gen-meth-dflt-params-duplicates.js  |  2 +-
 .../async-gen-meth-dflt-params-rest.js        |  2 +-
 .../async-gen-meth-escaped-async.js           |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...gen-yield-as-binding-identifier-escaped.js |  2 +-
 .../async-gen-yield-as-binding-identifier.js  |  2 +-
 ...n-yield-as-identifier-reference-escaped.js |  2 +-
 ...async-gen-yield-as-identifier-reference.js |  2 +-
 ...c-gen-yield-as-label-identifier-escaped.js |  2 +-
 .../async-gen-yield-as-label-identifier.js    |  2 +-
 ...sync-gen-yield-identifier-spread-strict.js |  2 +-
 .../async-gen-yield-identifier-strict.js      |  2 +-
 .../async-meth-dflt-params-duplicates.js      |  2 +-
 .../async-meth-dflt-params-rest.js            |  2 +-
 .../async-meth-escaped-async.js               |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...arly-errors-object-method-NSPL-with-USD.js |  2 +-
 ...t-method-arguments-in-formal-parameters.js |  2 +-
 ...rors-object-method-async-lineterminator.js |  2 +-
 ...-object-method-await-in-formals-default.js |  2 +-
 ...y-errors-object-method-await-in-formals.js |  2 +-
 ...-object-method-body-contains-super-call.js |  2 +-
 ...rors-object-method-duplicate-parameters.js |  2 +-
 ...object-method-eval-in-formal-parameters.js |  2 +-
 ...rs-object-method-formals-body-duplicate.js |  2 +-
 ...ject-method-formals-contains-super-call.js |  2 +-
 .../object/method-definition/escaped-get.js   |  2 +-
 .../object/method-definition/escaped-set.js   |  2 +-
 .../gen-meth-dflt-params-duplicates.js        |  2 +-
 .../gen-meth-dflt-params-rest.js              |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...gen-yield-as-binding-identifier-escaped.js |  2 +-
 .../gen-yield-as-binding-identifier.js        |  2 +-
 ...n-yield-as-identifier-reference-escaped.js |  2 +-
 .../gen-yield-as-identifier-reference.js      |  2 +-
 .../gen-yield-as-label-identifier-escaped.js  |  2 +-
 .../gen-yield-as-label-identifier.js          |  2 +-
 .../gen-yield-identifier-spread-strict.js     |  2 +-
 .../gen-yield-identifier-strict.js            |  2 +-
 .../generator-param-id-yield.js               |  2 +-
 .../generator-param-init-yield.js             |  2 +-
 .../generator-param-redecl-const.js           |  2 +-
 .../generator-param-redecl-let.js             |  2 +-
 .../generator-super-call-body.js              |  2 +-
 .../generator-super-call-param.js             |  2 +-
 ...erator-use-strict-with-non-simple-param.js |  2 +-
 .../meth-dflt-params-duplicates.js            |  2 +-
 .../meth-dflt-params-rest.js                  |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../method-definition/name-param-redecl.js    |  2 +-
 .../method-definition/name-super-call-body.js |  2 +-
 .../name-super-call-param.js                  |  2 +-
 ...setter-use-strict-with-non-simple-param.js |  2 +-
 .../use-strict-with-non-simple-param.js       |  2 +-
 .../yield-as-logical-or-expression.js         |  2 +-
 .../method-definition/yield-as-parameter.js   |  2 +-
 .../yield-star-after-newline.js               |  2 +-
 .../method-definition/yield-weak-binding.js   |  2 +-
 .../object/prop-def-invalid-async-prefix.js   |  2 +-
 .../object/setter-body-strict-inside.js       |  2 +-
 .../object/setter-body-strict-outside.js      |  2 +-
 .../setter-param-arguments-strict-inside.js   |  2 +-
 .../setter-param-arguments-strict-outside.js  |  2 +-
 .../object/setter-param-eval-strict-inside.js |  2 +-
 .../setter-param-eval-strict-outside.js       |  2 +-
 .../postfix-decrement/arguments.js            |  2 +-
 .../expressions/postfix-decrement/eval.js     |  2 +-
 .../line-terminator-carriage-return.js        |  2 +-
 .../line-terminator-line-feed.js              |  2 +-
 .../line-terminator-line-separator.js         |  2 +-
 .../line-terminator-paragraph-separator.js    |  2 +-
 .../postfix-decrement/non-simple.js           |  2 +-
 .../target-cover-newtarget.js                 |  2 +-
 .../target-cover-yieldexpr.js                 |  2 +-
 .../postfix-decrement/target-newtarget.js     |  2 +-
 .../postfix-increment/11.3.1-2-1gs.js         |  2 +-
 .../postfix-increment/arguments.js            |  2 +-
 .../expressions/postfix-increment/eval.js     |  2 +-
 .../line-terminator-carriage-return.js        |  2 +-
 .../line-terminator-line-feed.js              |  2 +-
 .../line-terminator-line-separator.js         |  2 +-
 .../line-terminator-paragraph-separator.js    |  2 +-
 .../postfix-increment/non-simple.js           |  2 +-
 .../target-cover-newtarget.js                 |  2 +-
 .../target-cover-yieldexpr.js                 |  2 +-
 .../postfix-increment/target-newtarget.js     |  2 +-
 .../prefix-decrement/11.4.5-2-2gs.js          |  2 +-
 .../expressions/prefix-decrement/arguments.js |  2 +-
 .../expressions/prefix-decrement/eval.js      |  2 +-
 .../prefix-decrement/non-simple.js            |  2 +-
 .../target-cover-newtarget.js                 |  2 +-
 .../target-cover-yieldexpr.js                 |  2 +-
 .../prefix-decrement/target-newtarget.js      |  2 +-
 .../expressions/prefix-increment/arguments.js |  2 +-
 .../expressions/prefix-increment/eval.js      |  2 +-
 .../prefix-increment/non-simple.js            |  2 +-
 .../target-cover-newtarget.js                 |  2 +-
 .../target-cover-yieldexpr.js                 |  2 +-
 .../prefix-increment/target-newtarget.js      |  2 +-
 .../property-accessors/non-identifier-name.js |  2 +-
 ...l-character-escape-sequence-truncated-1.js |  2 +-
 ...l-character-escape-sequence-truncated-2.js |  2 +-
 ...l-character-escape-sequence-truncated-3.js |  2 +-
 .../invalid-legacy-octal-escape-sequence.js   |  2 +-
 .../invalid-unicode-escape-sequence-1.js      |  2 +-
 .../invalid-unicode-escape-sequence-2.js      |  2 +-
 .../invalid-unicode-escape-sequence-3.js      |  2 +-
 .../invalid-unicode-escape-sequence-4.js      |  2 +-
 .../invalid-unicode-escape-sequence-5.js      |  2 +-
 .../invalid-unicode-escape-sequence-6.js      |  2 +-
 .../invalid-unicode-escape-sequence-7.js      |  2 +-
 .../invalid-unicode-escape-sequence-8.js      |  2 +-
 .../unicode-escape-nls-err.js                 |  2 +-
 test/language/expressions/this/S11.1.1_A1.js  |  2 +-
 .../expressions/yield/in-iteration-stmt.js    |  2 +-
 .../yield/invalid-left-hand-side.js           |  2 +-
 .../yield/star-in-iteration-stmt.js           |  2 +-
 test/language/future-reserved-words/class.js  |  2 +-
 test/language/future-reserved-words/const.js  |  2 +-
 .../future-reserved-words/debugger.js         |  2 +-
 test/language/future-reserved-words/enum.js   |  2 +-
 test/language/future-reserved-words/export.js |  2 +-
 .../language/future-reserved-words/extends.js |  2 +-
 .../implements-strict-escaped.js              |  2 +-
 .../implements-strict.js                      |  2 +-
 test/language/future-reserved-words/import.js |  2 +-
 .../interface-strict-escaped.js               |  2 +-
 .../future-reserved-words/interface-strict.js |  2 +-
 .../let-strict-escaped.js                     |  2 +-
 .../future-reserved-words/let-strict.js       |  2 +-
 .../package-strict-escaped.js                 |  2 +-
 .../future-reserved-words/package-strict.js   |  2 +-
 .../private-strict-escaped.js                 |  2 +-
 .../future-reserved-words/private-strict.js   |  2 +-
 .../protected-strict-escaped.js               |  2 +-
 .../future-reserved-words/protected-strict.js |  2 +-
 .../public-strict-escaped.js                  |  2 +-
 .../future-reserved-words/public-strict.js    |  2 +-
 .../static-strict-escaped.js                  |  2 +-
 .../future-reserved-words/static-strict.js    |  2 +-
 test/language/future-reserved-words/super.js  |  2 +-
 .../yield-strict-escaped.js                   |  2 +-
 .../future-reserved-words/yield-strict.js     |  2 +-
 test/language/global-code/export.js           |  2 +-
 test/language/global-code/import.js           |  2 +-
 test/language/global-code/new.target-arrow.js |  2 +-
 test/language/global-code/new.target.js       |  2 +-
 test/language/global-code/return.js           |  2 +-
 test/language/global-code/super-call-arrow.js |  2 +-
 test/language/global-code/super-call.js       |  2 +-
 test/language/global-code/super-prop-arrow.js |  2 +-
 test/language/global-code/super-prop.js       |  2 +-
 test/language/global-code/yield-strict.js     |  2 +-
 .../identifiers/unicode-escape-nls-err.js     |  2 +-
 .../identifiers/val-break-via-escape-hex.js   |  2 +-
 .../identifiers/val-break-via-escape-hex4.js  |  2 +-
 test/language/identifiers/val-break.js        |  2 +-
 .../identifiers/val-case-via-escape-hex.js    |  2 +-
 .../identifiers/val-case-via-escape-hex4.js   |  2 +-
 test/language/identifiers/val-case.js         |  2 +-
 .../identifiers/val-catch-via-escape-hex.js   |  2 +-
 .../identifiers/val-catch-via-escape-hex4.js  |  2 +-
 test/language/identifiers/val-catch.js        |  2 +-
 .../identifiers/val-class-via-escape-hex.js   |  2 +-
 .../identifiers/val-class-via-escape-hex4.js  |  2 +-
 test/language/identifiers/val-class.js        |  2 +-
 .../identifiers/val-const-via-escape-hex.js   |  2 +-
 .../identifiers/val-const-via-escape-hex4.js  |  2 +-
 test/language/identifiers/val-const.js        |  2 +-
 .../val-continue-via-escape-hex.js            |  2 +-
 .../val-continue-via-escape-hex4.js           |  2 +-
 test/language/identifiers/val-continue.js     |  2 +-
 .../val-debugger-via-escape-hex.js            |  2 +-
 .../val-debugger-via-escape-hex4.js           |  2 +-
 test/language/identifiers/val-debugger.js     |  2 +-
 .../identifiers/val-default-via-escape-hex.js |  2 +-
 .../val-default-via-escape-hex4.js            |  2 +-
 test/language/identifiers/val-default.js      |  2 +-
 .../identifiers/val-delete-via-escape-hex.js  |  2 +-
 .../identifiers/val-delete-via-escape-hex4.js |  2 +-
 test/language/identifiers/val-delete.js       |  2 +-
 .../identifiers/val-do-via-escape-hex.js      |  2 +-
 .../identifiers/val-do-via-escape-hex4.js     |  2 +-
 test/language/identifiers/val-do.js           |  2 +-
 .../identifiers/val-else-via-escape-hex.js    |  2 +-
 .../identifiers/val-else-via-escape-hex4.js   |  2 +-
 test/language/identifiers/val-else.js         |  2 +-
 .../identifiers/val-enum-via-escape-hex.js    |  2 +-
 .../identifiers/val-enum-via-escape-hex4.js   |  2 +-
 test/language/identifiers/val-enum.js         |  2 +-
 .../identifiers/val-export-via-escape-hex.js  |  2 +-
 .../identifiers/val-export-via-escape-hex4.js |  2 +-
 test/language/identifiers/val-export.js       |  2 +-
 .../identifiers/val-extends-via-escape-hex.js |  2 +-
 .../val-extends-via-escape-hex4.js            |  2 +-
 test/language/identifiers/val-extends.js      |  2 +-
 .../identifiers/val-false-via-escape-hex.js   |  2 +-
 .../identifiers/val-false-via-escape-hex4.js  |  2 +-
 test/language/identifiers/val-false.js        |  2 +-
 .../identifiers/val-finally-via-escape-hex.js |  2 +-
 .../val-finally-via-escape-hex4.js            |  2 +-
 test/language/identifiers/val-finally.js      |  2 +-
 .../identifiers/val-for-via-escape-hex.js     |  2 +-
 .../identifiers/val-for-via-escape-hex4.js    |  2 +-
 test/language/identifiers/val-for.js          |  2 +-
 .../val-function-via-escape-hex.js            |  2 +-
 .../val-function-via-escape-hex4.js           |  2 +-
 test/language/identifiers/val-function.js     |  2 +-
 .../identifiers/val-if-via-escape-hex.js      |  2 +-
 .../identifiers/val-if-via-escape-hex4.js     |  2 +-
 test/language/identifiers/val-if.js           |  2 +-
 .../identifiers/val-import-via-escape-hex.js  |  2 +-
 .../identifiers/val-import-via-escape-hex4.js |  2 +-
 test/language/identifiers/val-import.js       |  2 +-
 .../identifiers/val-in-via-escape-hex.js      |  2 +-
 .../identifiers/val-in-via-escape-hex4.js     |  2 +-
 test/language/identifiers/val-in.js           |  2 +-
 .../val-instanceof-via-escape-hex.js          |  2 +-
 .../val-instanceof-via-escape-hex4.js         |  2 +-
 test/language/identifiers/val-instanceof.js   |  2 +-
 .../identifiers/val-new-via-escape-hex.js     |  2 +-
 .../identifiers/val-new-via-escape-hex4.js    |  2 +-
 test/language/identifiers/val-new.js          |  2 +-
 .../identifiers/val-null-via-escape-hex.js    |  2 +-
 .../identifiers/val-null-via-escape-hex4.js   |  2 +-
 test/language/identifiers/val-null.js         |  2 +-
 .../identifiers/val-return-via-escape-hex.js  |  2 +-
 .../identifiers/val-return-via-escape-hex4.js |  2 +-
 test/language/identifiers/val-return.js       |  2 +-
 .../identifiers/val-super-via-escape-hex.js   |  2 +-
 .../identifiers/val-super-via-escape-hex4.js  |  2 +-
 test/language/identifiers/val-super.js        |  2 +-
 .../identifiers/val-switch-via-escape-hex.js  |  2 +-
 .../identifiers/val-switch-via-escape-hex4.js |  2 +-
 test/language/identifiers/val-switch.js       |  2 +-
 .../identifiers/val-this-via-escape-hex.js    |  2 +-
 .../identifiers/val-this-via-escape-hex4.js   |  2 +-
 test/language/identifiers/val-this.js         |  2 +-
 .../identifiers/val-throw-via-escape-hex.js   |  2 +-
 .../identifiers/val-throw-via-escape-hex4.js  |  2 +-
 test/language/identifiers/val-throw.js        |  2 +-
 .../identifiers/val-true-via-escape-hex.js    |  2 +-
 .../identifiers/val-true-via-escape-hex4.js   |  2 +-
 test/language/identifiers/val-true.js         |  2 +-
 .../identifiers/val-try-via-escape-hex.js     |  2 +-
 .../identifiers/val-try-via-escape-hex4.js    |  2 +-
 test/language/identifiers/val-try.js          |  2 +-
 .../identifiers/val-typeof-via-escape-hex.js  |  2 +-
 .../identifiers/val-typeof-via-escape-hex4.js |  2 +-
 test/language/identifiers/val-typeof.js       |  2 +-
 .../identifiers/val-var-via-escape-hex.js     |  2 +-
 .../identifiers/val-var-via-escape-hex4.js    |  2 +-
 test/language/identifiers/val-var.js          |  2 +-
 .../identifiers/val-void-via-escape-hex.js    |  2 +-
 .../identifiers/val-void-via-escape-hex4.js   |  2 +-
 test/language/identifiers/val-void.js         |  2 +-
 .../identifiers/val-while-via-escape-hex.js   |  2 +-
 .../identifiers/val-while-via-escape-hex4.js  |  2 +-
 test/language/identifiers/val-while.js        |  2 +-
 .../identifiers/val-with-via-escape-hex.js    |  2 +-
 .../identifiers/val-with-via-escape-hex4.js   |  2 +-
 test/language/identifiers/val-with.js         |  2 +-
 test/language/identifiers/val-yield-strict.js |  2 +-
 .../vertical-tilde-continue-escaped.js        |  2 +-
 .../identifiers/vertical-tilde-continue.js    |  2 +-
 .../vertical-tilde-start-escaped.js           |  2 +-
 .../identifiers/vertical-tilde-start.js       |  2 +-
 test/language/import/dup-bound-names.js       |  2 +-
 .../import/escaped-as-import-specifier.js     |  2 +-
 .../import/escaped-as-namespace-import.js     |  2 +-
 test/language/import/escaped-from.js          |  2 +-
 test/language/keywords/ident-ref-break.js     |  2 +-
 test/language/keywords/ident-ref-case.js      |  2 +-
 test/language/keywords/ident-ref-catch.js     |  2 +-
 test/language/keywords/ident-ref-continue.js  |  2 +-
 test/language/keywords/ident-ref-default.js   |  2 +-
 test/language/keywords/ident-ref-delete.js    |  2 +-
 test/language/keywords/ident-ref-do.js        |  2 +-
 test/language/keywords/ident-ref-else.js      |  2 +-
 test/language/keywords/ident-ref-finally.js   |  2 +-
 test/language/keywords/ident-ref-for.js       |  2 +-
 test/language/keywords/ident-ref-function.js  |  2 +-
 test/language/keywords/ident-ref-if.js        |  2 +-
 test/language/keywords/ident-ref-in.js        |  2 +-
 .../language/keywords/ident-ref-instanceof.js |  2 +-
 test/language/keywords/ident-ref-new.js       |  2 +-
 test/language/keywords/ident-ref-return.js    |  2 +-
 test/language/keywords/ident-ref-switch.js    |  2 +-
 test/language/keywords/ident-ref-this.js      |  2 +-
 test/language/keywords/ident-ref-throw.js     |  2 +-
 test/language/keywords/ident-ref-try.js       |  2 +-
 test/language/keywords/ident-ref-typeof.js    |  2 +-
 test/language/keywords/ident-ref-var.js       |  2 +-
 test/language/keywords/ident-ref-void.js      |  2 +-
 test/language/keywords/ident-ref-while.js     |  2 +-
 test/language/keywords/ident-ref-with.js      |  2 +-
 .../language/line-terminators/S7.3_A2.1_T2.js |  2 +-
 .../language/line-terminators/S7.3_A2.2_T2.js |  2 +-
 .../language/line-terminators/S7.3_A3.1_T3.js |  2 +-
 .../language/line-terminators/S7.3_A3.2_T1.js |  2 +-
 .../language/line-terminators/S7.3_A3.2_T3.js |  2 +-
 .../language/line-terminators/S7.3_A3.3_T1.js |  2 +-
 .../language/line-terminators/S7.3_A3.4_T1.js |  2 +-
 test/language/line-terminators/S7.3_A6_T1.js  |  2 +-
 test/language/line-terminators/S7.3_A6_T2.js  |  2 +-
 test/language/line-terminators/S7.3_A6_T3.js  |  2 +-
 test/language/line-terminators/S7.3_A6_T4.js  |  2 +-
 .../literals/bigint/binary-invalid-digit.js   |  2 +-
 .../language/literals/bigint/exponent-part.js |  2 +-
 .../bigint/hexadecimal-invalid-digit.js       |  2 +-
 .../bigint/mv-is-not-integer-dil-dot-dds.js   |  2 +-
 .../bigint/mv-is-not-integer-dot-dds.js       |  2 +-
 .../literals/bigint/octal-invalid-digit.js    |  2 +-
 test/language/literals/numeric/7.8.3-1gs.js   |  2 +-
 test/language/literals/numeric/7.8.3-2gs.js   |  2 +-
 .../literals/numeric/S7.8.3_A6.1_T1.js        |  2 +-
 .../literals/numeric/S7.8.3_A6.1_T2.js        |  2 +-
 .../literals/numeric/S7.8.3_A6.2_T1.js        |  2 +-
 .../literals/numeric/S7.8.3_A6.2_T2.js        |  2 +-
 .../literals/numeric/binary-invalid-digit.js  |  2 +-
 .../numeric/binary-invalid-leading.js         |  2 +-
 .../numeric/binary-invalid-truncated.js       |  2 +-
 .../numeric/binary-invalid-unicode.js         |  2 +-
 .../numeric/legacy-octal-integer-strict.js    |  2 +-
 .../non-octal-decimal-integer-strict.js       |  2 +-
 .../numeric/numeric-followed-by-ident.js      |  2 +-
 ...ric-separator-literal-bil-bd-nsl-bd-err.js |  2 +-
 ...separator-literal-bil-nsl-bd-dunder-err.js |  2 +-
 ...umeric-separator-literal-bil-nsl-bd-err.js |  2 +-
 ...separator-literal-dd-nsl-dds-dunder-err.js |  2 +-
 .../numeric-separator-literal-dd-nsl-err.js   |  2 +-
 ...eparator-literal-dds-nsl-dds-dunder-err.js |  2 +-
 .../numeric-separator-literal-dds-nsl-err.js  |  2 +-
 ...rator-literal-dil-dot-dds-nsl-ep-dd-err.js |  2 +-
 ...ic-separator-literal-dil-dot-nsl-ep-err.js |  2 +-
 ...meric-separator-literal-dil-dot-nsl-err.js |  2 +-
 ...ic-separator-literal-dot-dds-nsl-ep-err.js |  2 +-
 ...umeric-separator-literal-dot-nsl-ep-err.js |  2 +-
 .../numeric-separator-literal-dot-nsl-err.js  |  2 +-
 ...ric-separator-literal-hil-hd-nsl-hd-err.js |  2 +-
 ...separator-literal-hil-nsl-hd-dunder-err.js |  2 +-
 ...umeric-separator-literal-hil-nsl-hd-err.js |  2 +-
 ...eparator-literal-nzd-nsl-dds-dunder-err.js |  2 +-
 ...or-literal-nzd-nsl-dds-leading-zero-err.js |  2 +-
 ...separator-literal-oil-nsl-od-dunder-err.js |  2 +-
 ...umeric-separator-literal-oil-nsl-od-err.js |  2 +-
 ...ric-separator-literal-oil-od-nsl-od-err.js |  2 +-
 .../numeric-separator-literal-unicode-err.js  |  2 +-
 .../literals/numeric/octal-invalid-digit.js   |  2 +-
 .../literals/numeric/octal-invalid-leading.js |  2 +-
 .../numeric/octal-invalid-truncated.js        |  2 +-
 .../literals/numeric/octal-invalid-unicode.js |  2 +-
 .../literals/regexp/S7.8.5_A1.2_T1.js         |  2 +-
 .../literals/regexp/S7.8.5_A1.2_T2.js         |  2 +-
 .../literals/regexp/S7.8.5_A1.2_T3.js         |  2 +-
 .../literals/regexp/S7.8.5_A1.2_T4.js         |  2 +-
 .../literals/regexp/S7.8.5_A1.3_T1.js         |  2 +-
 .../literals/regexp/S7.8.5_A1.3_T3.js         |  2 +-
 .../literals/regexp/S7.8.5_A1.5_T1.js         |  2 +-
 .../literals/regexp/S7.8.5_A1.5_T3.js         |  2 +-
 .../literals/regexp/S7.8.5_A2.2_T1.js         |  2 +-
 .../literals/regexp/S7.8.5_A2.2_T2.js         |  2 +-
 .../literals/regexp/S7.8.5_A2.3_T1.js         |  2 +-
 .../literals/regexp/S7.8.5_A2.3_T3.js         |  2 +-
 .../literals/regexp/S7.8.5_A2.5_T1.js         |  2 +-
 .../literals/regexp/S7.8.5_A2.5_T3.js         |  2 +-
 .../literals/regexp/early-err-bad-flag.js     |  2 +-
 .../literals/regexp/early-err-dup-flag.js     |  2 +-
 .../regexp/early-err-flags-unicode-escape.js  |  2 +-
 .../literals/regexp/early-err-pattern.js      |  2 +-
 .../regexp/invalid-braced-quantifier-exact.js |  2 +-
 .../regexp/invalid-braced-quantifier-lower.js |  2 +-
 .../regexp/invalid-braced-quantifier-range.js |  2 +-
 .../regexp/invalid-optional-lookbehind.js     |  2 +-
 .../invalid-optional-negative-lookbehind.js   |  2 +-
 .../regexp/invalid-range-lookbehind.js        |  2 +-
 .../invalid-range-negative-lookbehind.js      |  2 +-
 .../regexp-first-char-no-line-separator.js    |  2 +-
 ...egexp-first-char-no-paragraph-separator.js |  2 +-
 .../regexp-source-char-no-line-separator.js   |  2 +-
 ...gexp-source-char-no-paragraph-separator.js |  2 +-
 test/language/literals/regexp/u-dec-esc.js    |  2 +-
 .../literals/regexp/u-invalid-class-escape.js |  2 +-
 .../regexp/u-invalid-extended-pattern-char.js |  2 +-
 .../regexp/u-invalid-identity-escape.js       |  2 +-
 .../regexp/u-invalid-legacy-octal-escape.js   |  2 +-
 ...nvalid-non-empty-class-ranges-no-dash-a.js |  2 +-
 ...valid-non-empty-class-ranges-no-dash-ab.js |  2 +-
 ...nvalid-non-empty-class-ranges-no-dash-b.js |  2 +-
 .../u-invalid-non-empty-class-ranges.js       |  2 +-
 .../regexp/u-invalid-oob-decimal-escape.js    |  2 +-
 .../regexp/u-invalid-optional-lookahead.js    |  2 +-
 .../regexp/u-invalid-optional-lookbehind.js   |  2 +-
 .../u-invalid-optional-negative-lookahead.js  |  2 +-
 .../u-invalid-optional-negative-lookbehind.js |  2 +-
 .../regexp/u-invalid-range-lookahead.js       |  2 +-
 .../regexp/u-invalid-range-lookbehind.js      |  2 +-
 .../u-invalid-range-negative-lookahead.js     |  2 +-
 .../u-invalid-range-negative-lookbehind.js    |  2 +-
 .../literals/regexp/u-unicode-esc-bounds.js   |  2 +-
 .../literals/regexp/u-unicode-esc-non-hex.js  |  2 +-
 .../literals/regexp/unicode-escape-nls-err.js |  2 +-
 .../literals/string/S7.8.4_A1.1_T1.js         |  2 +-
 .../literals/string/S7.8.4_A1.1_T2.js         |  2 +-
 .../literals/string/S7.8.4_A1.2_T1.js         |  2 +-
 .../literals/string/S7.8.4_A1.2_T2.js         |  2 +-
 .../literals/string/S7.8.4_A3.1_T1.js         |  2 +-
 .../literals/string/S7.8.4_A3.1_T2.js         |  2 +-
 .../literals/string/S7.8.4_A3.2_T1.js         |  2 +-
 .../literals/string/S7.8.4_A3.2_T2.js         |  2 +-
 .../literals/string/S7.8.4_A4.3_T1.js         |  2 +-
 .../literals/string/S7.8.4_A4.3_T2.js         |  2 +-
 .../literals/string/S7.8.4_A7.1_T4.js         |  2 +-
 .../literals/string/S7.8.4_A7.2_T1.js         |  2 +-
 .../literals/string/S7.8.4_A7.2_T2.js         |  2 +-
 .../literals/string/S7.8.4_A7.2_T3.js         |  2 +-
 .../literals/string/S7.8.4_A7.2_T4.js         |  2 +-
 .../literals/string/S7.8.4_A7.2_T5.js         |  2 +-
 .../literals/string/S7.8.4_A7.2_T6.js         |  2 +-
 ...legacy-non-octal-escape-sequence-strict.js |  2 +-
 ...y-octal-escape-sequence-prologue-strict.js |  2 +-
 .../legacy-octal-escape-sequence-strict.js    |  2 +-
 .../string/unicode-escape-nls-err-double.js   |  2 +-
 .../string/unicode-escape-nls-err-single.js   |  2 +-
 .../comment-multi-line-html-close.js          |  2 +-
 .../comment-single-line-html-close.js         |  2 +-
 .../comment-single-line-html-open.js          |  2 +-
 .../early-dup-export-as-star-as.js            |  2 +-
 .../module-code/early-dup-export-decl.js      |  2 +-
 .../module-code/early-dup-export-dflt-id.js   |  2 +-
 .../module-code/early-dup-export-dflt.js      |  2 +-
 .../module-code/early-dup-export-id-as.js     |  2 +-
 .../module-code/early-dup-export-id.js        |  2 +-
 .../early-dup-export-star-as-dflt.js          |  2 +-
 test/language/module-code/early-dup-lables.js |  2 +-
 test/language/module-code/early-dup-lex.js    |  2 +-
 .../module-code/early-export-global.js        |  2 +-
 .../module-code/early-export-unresolvable.js  |  2 +-
 .../module-code/early-import-arguments.js     |  2 +-
 .../module-code/early-import-as-arguments.js  |  2 +-
 .../module-code/early-import-as-eval.js       |  2 +-
 .../language/module-code/early-import-eval.js |  2 +-
 .../language/module-code/early-lex-and-var.js |  2 +-
 test/language/module-code/early-new-target.js |  2 +-
 .../language/module-code/early-strict-mode.js |  2 +-
 test/language/module-code/early-super.js      |  2 +-
 .../language/module-code/early-undef-break.js |  2 +-
 .../module-code/early-undef-continue.js       |  2 +-
 .../module-code/instn-resolve-empty-export.js |  2 +-
 .../module-code/instn-resolve-empty-import.js |  2 +-
 .../instn-resolve-err-reference.js            |  2 +-
 .../module-code/instn-resolve-err-syntax.js   |  2 +-
 .../module-code/instn-resolve-order-depth.js  |  2 +-
 .../module-code/instn-resolve-order-src.js    |  2 +-
 ...arse-err-decl-pos-export-arrow-function.js |  2 +-
 ...rse-err-decl-pos-export-block-stmt-list.js |  2 +-
 .../parse-err-decl-pos-export-block-stmt.js   |  2 +-
 ...-decl-pos-export-class-decl-meth-static.js |  2 +-
 ...rse-err-decl-pos-export-class-decl-meth.js |  2 +-
 ...pos-export-class-decl-method-gen-static.js |  2 +-
 ...r-decl-pos-export-class-decl-method-gen.js |  2 +-
 ...l-pos-export-class-expr-meth-gen-static.js |  2 +-
 ...err-decl-pos-export-class-expr-meth-gen.js |  2 +-
 ...-decl-pos-export-class-expr-meth-static.js |  2 +-
 ...rse-err-decl-pos-export-class-expr-meth.js |  2 +-
 .../parse-err-decl-pos-export-do-while.js     |  2 +-
 .../parse-err-decl-pos-export-for-const.js    |  2 +-
 .../parse-err-decl-pos-export-for-in-const.js |  2 +-
 .../parse-err-decl-pos-export-for-in-let.js   |  2 +-
 .../parse-err-decl-pos-export-for-in-lhs.js   |  2 +-
 .../parse-err-decl-pos-export-for-in-var.js   |  2 +-
 .../parse-err-decl-pos-export-for-let.js      |  2 +-
 .../parse-err-decl-pos-export-for-lhs.js      |  2 +-
 .../parse-err-decl-pos-export-for-of-const.js |  2 +-
 .../parse-err-decl-pos-export-for-of-let.js   |  2 +-
 .../parse-err-decl-pos-export-for-of-lhs.js   |  2 +-
 .../parse-err-decl-pos-export-for-of-var.js   |  2 +-
 .../parse-err-decl-pos-export-for-var.js      |  2 +-
 ...parse-err-decl-pos-export-function-decl.js |  2 +-
 ...parse-err-decl-pos-export-function-expr.js |  2 +-
 ...arse-err-decl-pos-export-generator-decl.js |  2 +-
 ...arse-err-decl-pos-export-generator-expr.js |  2 +-
 .../parse-err-decl-pos-export-if-else.js      |  2 +-
 .../parse-err-decl-pos-export-if-if.js        |  2 +-
 .../parse-err-decl-pos-export-labeled.js      |  2 +-
 ...e-err-decl-pos-export-object-gen-method.js |  2 +-
 ...parse-err-decl-pos-export-object-getter.js |  2 +-
 ...parse-err-decl-pos-export-object-method.js |  2 +-
 ...parse-err-decl-pos-export-object-setter.js |  2 +-
 ...se-err-decl-pos-export-switch-case-dflt.js |  2 +-
 .../parse-err-decl-pos-export-switch-case.js  |  2 +-
 .../parse-err-decl-pos-export-switch-dftl.js  |  2 +-
 ...e-err-decl-pos-export-try-catch-finally.js |  2 +-
 .../parse-err-decl-pos-export-try-catch.js    |  2 +-
 .../parse-err-decl-pos-export-try-finally.js  |  2 +-
 .../parse-err-decl-pos-export-try-try.js      |  2 +-
 .../parse-err-decl-pos-export-while.js        |  2 +-
 ...arse-err-decl-pos-import-arrow-function.js |  2 +-
 ...rse-err-decl-pos-import-block-stmt-list.js |  2 +-
 .../parse-err-decl-pos-import-block-stmt.js   |  2 +-
 ...-decl-pos-import-class-decl-meth-static.js |  2 +-
 ...rse-err-decl-pos-import-class-decl-meth.js |  2 +-
 ...pos-import-class-decl-method-gen-static.js |  2 +-
 ...r-decl-pos-import-class-decl-method-gen.js |  2 +-
 ...l-pos-import-class-expr-meth-gen-static.js |  2 +-
 ...err-decl-pos-import-class-expr-meth-gen.js |  2 +-
 ...-decl-pos-import-class-expr-meth-static.js |  2 +-
 ...rse-err-decl-pos-import-class-expr-meth.js |  2 +-
 .../parse-err-decl-pos-import-do-while.js     |  2 +-
 .../parse-err-decl-pos-import-for-const.js    |  2 +-
 .../parse-err-decl-pos-import-for-in-const.js |  2 +-
 .../parse-err-decl-pos-import-for-in-let.js   |  2 +-
 .../parse-err-decl-pos-import-for-in-lhs.js   |  2 +-
 .../parse-err-decl-pos-import-for-in-var.js   |  2 +-
 .../parse-err-decl-pos-import-for-let.js      |  2 +-
 .../parse-err-decl-pos-import-for-lhs.js      |  2 +-
 .../parse-err-decl-pos-import-for-of-const.js |  2 +-
 .../parse-err-decl-pos-import-for-of-let.js   |  2 +-
 .../parse-err-decl-pos-import-for-of-lhs.js   |  2 +-
 .../parse-err-decl-pos-import-for-of-var.js   |  2 +-
 .../parse-err-decl-pos-import-for-var.js      |  2 +-
 ...parse-err-decl-pos-import-function-decl.js |  2 +-
 ...parse-err-decl-pos-import-function-expr.js |  2 +-
 ...arse-err-decl-pos-import-generator-decl.js |  2 +-
 ...arse-err-decl-pos-import-generator-expr.js |  2 +-
 .../parse-err-decl-pos-import-if-else.js      |  2 +-
 .../parse-err-decl-pos-import-if-if.js        |  2 +-
 .../parse-err-decl-pos-import-labeled.js      |  2 +-
 ...e-err-decl-pos-import-object-gen-method.js |  2 +-
 ...parse-err-decl-pos-import-object-getter.js |  2 +-
 ...parse-err-decl-pos-import-object-method.js |  2 +-
 ...parse-err-decl-pos-import-object-setter.js |  2 +-
 ...se-err-decl-pos-import-switch-case-dflt.js |  2 +-
 .../parse-err-decl-pos-import-switch-case.js  |  2 +-
 .../parse-err-decl-pos-import-switch-dftl.js  |  2 +-
 ...e-err-decl-pos-import-try-catch-finally.js |  2 +-
 .../parse-err-decl-pos-import-try-catch.js    |  2 +-
 .../parse-err-decl-pos-import-try-finally.js  |  2 +-
 .../parse-err-decl-pos-import-try-try.js      |  2 +-
 .../parse-err-decl-pos-import-while.js        |  2 +-
 .../parse-err-export-dflt-const.js            |  2 +-
 .../module-code/parse-err-export-dflt-expr.js |  2 +-
 .../module-code/parse-err-export-dflt-let.js  |  2 +-
 .../module-code/parse-err-export-dflt-var.js  |  2 +-
 .../module-code/parse-err-hoist-lex-fun.js    |  2 +-
 .../module-code/parse-err-hoist-lex-gen.js    |  2 +-
 .../parse-err-invoke-anon-fun-decl.js         |  2 +-
 .../parse-err-invoke-anon-gen-decl.js         |  2 +-
 .../module-code/parse-err-reference.js        |  2 +-
 test/language/module-code/parse-err-return.js |  2 +-
 .../module-code/parse-err-semi-dflt-expr.js   |  2 +-
 .../module-code/parse-err-semi-export-star.js |  2 +-
 .../parse-err-semi-name-space-export.js       |  2 +-
 .../parse-err-semi-named-export-from.js       |  2 +-
 .../parse-err-semi-named-export.js            |  2 +-
 test/language/module-code/parse-err-syntax.js |  2 +-
 test/language/module-code/parse-err-yield.js  |  2 +-
 ...privatename-not-valid-earlyerr-module-1.js |  2 +-
 ...privatename-not-valid-earlyerr-module-2.js |  2 +-
 ...privatename-not-valid-earlyerr-module-3.js |  2 +-
 ...privatename-not-valid-earlyerr-module-4.js |  2 +-
 ...privatename-not-valid-earlyerr-module-5.js |  2 +-
 ...privatename-not-valid-earlyerr-module-6.js |  2 +-
 ...privatename-not-valid-earlyerr-module-7.js |  2 +-
 ...privatename-not-valid-earlyerr-module-8.js |  2 +-
 test/language/punctuators/S7.7_A2_T1.js       |  2 +-
 test/language/punctuators/S7.7_A2_T10.js      |  2 +-
 test/language/punctuators/S7.7_A2_T2.js       |  2 +-
 test/language/punctuators/S7.7_A2_T3.js       |  2 +-
 test/language/punctuators/S7.7_A2_T4.js       |  2 +-
 test/language/punctuators/S7.7_A2_T5.js       |  2 +-
 test/language/punctuators/S7.7_A2_T6.js       |  2 +-
 test/language/punctuators/S7.7_A2_T7.js       |  2 +-
 test/language/punctuators/S7.7_A2_T8.js       |  2 +-
 test/language/punctuators/S7.7_A2_T9.js       |  2 +-
 test/language/reserved-words/await-module.js  |  2 +-
 .../ident-reference-false-escaped.js          |  2 +-
 .../reserved-words/ident-reference-false.js   |  2 +-
 .../ident-reference-null-escaped.js           |  2 +-
 .../reserved-words/ident-reference-null.js    |  2 +-
 .../ident-reference-true-escaped.js           |  2 +-
 .../reserved-words/ident-reference-true.js    |  2 +-
 .../label-ident-false-escaped.js              |  2 +-
 .../reserved-words/label-ident-false.js       |  2 +-
 .../label-ident-null-escaped.js               |  2 +-
 .../reserved-words/label-ident-null.js        |  2 +-
 .../label-ident-true-escaped.js               |  2 +-
 .../reserved-words/label-ident-true.js        |  2 +-
 .../rest-parameters/position-invalid.js       |  2 +-
 .../await-as-binding-identifier-escaped.js    |  2 +-
 .../await-as-binding-identifier.js            |  2 +-
 .../await-as-identifier-reference-escaped.js  |  2 +-
 .../await-as-identifier-reference.js          |  2 +-
 .../await-as-label-identifier-escaped.js      |  2 +-
 .../await-as-label-identifier.js              |  2 +-
 .../async-function/dflt-params-duplicates.js  |  2 +-
 .../async-function/dflt-params-rest.js        |  2 +-
 .../early-errors-declaration-NSPL-with-USD.js |  2 +-
 ...laration-arguments-in-formal-parameters.js |  2 +-
 ...rs-declaration-await-in-formals-default.js |  2 +-
 ...rly-errors-declaration-await-in-formals.js |  2 +-
 ...eclaration-binding-identifier-arguments.js |  2 +-
 ...ors-declaration-binding-identifier-eval.js |  2 +-
 ...rs-declaration-body-contains-super-call.js |  2 +-
 ...eclaration-body-contains-super-property.js |  2 +-
 ...errors-declaration-duplicate-parameters.js |  2 +-
 ...s-declaration-eval-in-formal-parameters.js |  2 +-
 ...rors-declaration-formals-body-duplicate.js |  2 +-
 ...declaration-formals-contains-super-call.js |  2 +-
 ...aration-formals-contains-super-property.js |  2 +-
 .../async-function/escaped-async.js           |  2 +-
 .../let-newline-await-in-async-function.js    |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 .../await-as-binding-identifier-escaped.js    |  2 +-
 .../await-as-binding-identifier.js            |  2 +-
 .../await-as-identifier-reference-escaped.js  |  2 +-
 .../await-as-identifier-reference.js          |  2 +-
 .../await-as-label-identifier-escaped.js      |  2 +-
 .../await-as-label-identifier.js              |  2 +-
 .../async-generator/dflt-params-duplicates.js |  2 +-
 .../async-generator/dflt-params-rest.js       |  2 +-
 .../dstr-ary-ptrn-rest-init-ary.js            |  2 +-
 .../dstr-ary-ptrn-rest-init-id.js             |  2 +-
 .../dstr-ary-ptrn-rest-init-obj.js            |  2 +-
 .../dstr-ary-ptrn-rest-not-final-ary.js       |  2 +-
 .../dstr-ary-ptrn-rest-not-final-id.js        |  2 +-
 .../dstr-ary-ptrn-rest-not-final-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-ary.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-id.js        |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../async-generator/escaped-async.js          |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 .../yield-as-binding-identifier-escaped.js    |  2 +-
 .../yield-as-binding-identifier.js            |  2 +-
 .../yield-as-identifier-reference-escaped.js  |  2 +-
 .../yield-as-identifier-reference.js          |  2 +-
 .../yield-as-label-identifier-escaped.js      |  2 +-
 .../yield-as-label-identifier.js              |  2 +-
 .../yield-identifier-spread-strict.js         |  2 +-
 .../yield-identifier-strict.js                |  2 +-
 test/language/statements/block/S12.1_A4_T1.js |  2 +-
 test/language/statements/block/S12.1_A4_T2.js |  2 +-
 test/language/statements/break/S12.8_A1_T1.js |  2 +-
 test/language/statements/break/S12.8_A1_T2.js |  2 +-
 test/language/statements/break/S12.8_A1_T3.js |  2 +-
 test/language/statements/break/S12.8_A1_T4.js |  2 +-
 test/language/statements/break/S12.8_A5_T1.js |  2 +-
 test/language/statements/break/S12.8_A5_T2.js |  2 +-
 test/language/statements/break/S12.8_A5_T3.js |  2 +-
 test/language/statements/break/S12.8_A6.js    |  2 +-
 test/language/statements/break/S12.8_A8_T1.js |  2 +-
 test/language/statements/break/S12.8_A8_T2.js |  2 +-
 .../async-gen-meth-dflt-params-duplicates.js  |  2 +-
 .../class/async-gen-meth-dflt-params-rest.js  |  2 +-
 .../class/async-gen-meth-escaped-async.js     |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...-gen-meth-static-dflt-params-duplicates.js |  2 +-
 .../async-gen-meth-static-dflt-params-rest.js |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...hod-await-as-binding-identifier-escaped.js |  2 +-
 ...-gen-method-await-as-binding-identifier.js |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 ...en-method-await-as-identifier-reference.js |  2 +-
 ...ethod-await-as-label-identifier-escaped.js |  2 +-
 ...nc-gen-method-await-as-label-identifier.js |  2 +-
 ...tic-await-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-await-as-binding-identifier.js |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 ...od-static-await-as-identifier-reference.js |  2 +-
 ...tatic-await-as-label-identifier-escaped.js |  2 +-
 ...method-static-await-as-label-identifier.js |  2 +-
 ...tic-yield-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-yield-as-binding-identifier.js |  2 +-
 ...c-yield-as-identifier-reference-escaped.js |  2 +-
 ...od-static-yield-as-identifier-reference.js |  2 +-
 ...tatic-yield-as-label-identifier-escaped.js |  2 +-
 ...method-static-yield-as-label-identifier.js |  2 +-
 ...d-static-yield-identifier-spread-strict.js |  2 +-
 ...n-method-static-yield-identifier-strict.js |  2 +-
 ...hod-yield-as-binding-identifier-escaped.js |  2 +-
 ...-gen-method-yield-as-binding-identifier.js |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 ...en-method-yield-as-identifier-reference.js |  2 +-
 ...ethod-yield-as-label-identifier-escaped.js |  2 +-
 ...nc-gen-method-yield-as-label-identifier.js |  2 +-
 ...n-method-yield-identifier-spread-strict.js |  2 +-
 ...sync-gen-method-yield-identifier-strict.js |  2 +-
 ...hod-await-as-binding-identifier-escaped.js |  2 +-
 ...vate-method-await-as-binding-identifier.js |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 ...te-method-await-as-identifier-reference.js |  2 +-
 ...ethod-await-as-label-identifier-escaped.js |  2 +-
 ...rivate-method-await-as-label-identifier.js |  2 +-
 ...tic-await-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-await-as-binding-identifier.js |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 ...od-static-await-as-identifier-reference.js |  2 +-
 ...tatic-await-as-label-identifier-escaped.js |  2 +-
 ...method-static-await-as-label-identifier.js |  2 +-
 ...tic-yield-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-yield-as-binding-identifier.js |  2 +-
 ...c-yield-as-identifier-reference-escaped.js |  2 +-
 ...od-static-yield-as-identifier-reference.js |  2 +-
 ...tatic-yield-as-label-identifier-escaped.js |  2 +-
 ...method-static-yield-as-label-identifier.js |  2 +-
 ...d-static-yield-identifier-spread-strict.js |  2 +-
 ...e-method-static-yield-identifier-strict.js |  2 +-
 ...hod-yield-as-binding-identifier-escaped.js |  2 +-
 ...vate-method-yield-as-binding-identifier.js |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 ...te-method-yield-as-identifier-reference.js |  2 +-
 ...ethod-yield-as-label-identifier-escaped.js |  2 +-
 ...rivate-method-yield-as-label-identifier.js |  2 +-
 ...e-method-yield-identifier-spread-strict.js |  2 +-
 ...-private-method-yield-identifier-strict.js |  2 +-
 .../async-meth-dflt-params-duplicates.js      |  2 +-
 .../class/async-meth-dflt-params-rest.js      |  2 +-
 .../class/async-meth-escaped-async.js         |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...sync-meth-static-dflt-params-duplicates.js |  2 +-
 .../async-meth-static-dflt-params-rest.js     |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 ...hod-await-as-binding-identifier-escaped.js |  2 +-
 ...sync-method-await-as-binding-identifier.js |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 ...nc-method-await-as-identifier-reference.js |  2 +-
 ...ethod-await-as-label-identifier-escaped.js |  2 +-
 .../async-method-await-as-label-identifier.js |  2 +-
 ...tic-await-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-await-as-binding-identifier.js |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 ...od-static-await-as-identifier-reference.js |  2 +-
 ...tatic-await-as-label-identifier-escaped.js |  2 +-
 ...method-static-await-as-label-identifier.js |  2 +-
 ...hod-await-as-binding-identifier-escaped.js |  2 +-
 ...vate-method-await-as-binding-identifier.js |  2 +-
 ...d-await-as-identifier-reference-escaped.js |  2 +-
 ...te-method-await-as-identifier-reference.js |  2 +-
 ...ethod-await-as-label-identifier-escaped.js |  2 +-
 ...rivate-method-await-as-label-identifier.js |  2 +-
 ...tic-await-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-await-as-binding-identifier.js |  2 +-
 ...c-await-as-identifier-reference-escaped.js |  2 +-
 ...od-static-await-as-identifier-reference.js |  2 +-
 ...tatic-await-as-label-identifier-escaped.js |  2 +-
 ...method-static-await-as-label-identifier.js |  2 +-
 .../class-name-ident-await-escaped-module.js  |  2 +-
 .../class/class-name-ident-await-module.js    |  2 +-
 .../class/class-name-ident-let-escaped.js     |  2 +-
 .../statements/class/class-name-ident-let.js  |  2 +-
 .../class/class-name-ident-static-escaped.js  |  2 +-
 .../class/class-name-ident-static.js          |  2 +-
 .../class/class-name-ident-yield-escaped.js   |  2 +-
 .../class/class-name-ident-yield.js           |  2 +-
 ...early-errors-class-method-NSPL-with-USD.js |  2 +-
 ...s-method-arguments-in-formal-parameters.js |  2 +-
 ...s-class-method-await-in-formals-default.js |  2 +-
 ...ly-errors-class-method-await-in-formals.js |  2 +-
 ...s-class-method-body-contains-super-call.js |  2 +-
 ...rrors-class-method-duplicate-parameters.js |  2 +-
 ...-class-method-eval-in-formal-parameters.js |  2 +-
 ...ors-class-method-formals-body-duplicate.js |  2 +-
 ...lass-method-formals-contains-super-call.js |  2 +-
 ...-function-expression-binding-identifier.js |  2 +-
 ...-yield-as-identifier-in-nested-function.js |  2 +-
 ...hods-gen-yield-as-logical-or-expression.js |  2 +-
 .../methods-gen-yield-as-parameter.js         |  2 +-
 .../methods-gen-yield-star-after-newline.js   |  2 +-
 .../methods-gen-yield-weak-binding.js         |  2 +-
 ...r-async-gen-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...tr-async-gen-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...r-async-gen-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...nc-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...ync-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...nc-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...nc-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...ync-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...nc-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...c-gen-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...private-gen-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...-private-gen-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...private-gen-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...te-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...ate-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...te-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...te-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...ate-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...te-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...e-gen-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-ary.js   |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-id.js    |  2 +-
 .../dstr-gen-meth-ary-ptrn-rest-init-obj.js   |  2 +-
 ...tr-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...str-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...tr-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...tr-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...str-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...tr-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...r-gen-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../class/dstr-meth-ary-ptrn-rest-init-ary.js |  2 +-
 .../class/dstr-meth-ary-ptrn-rest-init-id.js  |  2 +-
 .../class/dstr-meth-ary-ptrn-rest-init-obj.js |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-meth-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-ary.js  |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-id.js   |  2 +-
 .../dstr-meth-dflt-ary-ptrn-rest-init-obj.js  |  2 +-
 ...r-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...tr-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...r-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...dstr-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 .../dstr-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...dstr-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...private-gen-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...-private-gen-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...private-gen-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...te-gen-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...ate-gen-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...te-gen-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...te-gen-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...ate-gen-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...te-gen-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...en-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...n-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...e-gen-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...-gen-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...str-private-meth-ary-ptrn-rest-init-ary.js |  2 +-
 ...dstr-private-meth-ary-ptrn-rest-init-id.js |  2 +-
 ...str-private-meth-ary-ptrn-rest-init-obj.js |  2 +-
 ...rivate-meth-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...private-meth-ary-ptrn-rest-not-final-id.js |  2 +-
 ...rivate-meth-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...rivate-meth-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...private-meth-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...rivate-meth-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...e-meth-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...te-meth-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...e-meth-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...vate-meth-static-ary-ptrn-rest-init-ary.js |  2 +-
 ...ivate-meth-static-ary-ptrn-rest-init-id.js |  2 +-
 ...vate-meth-static-ary-ptrn-rest-init-obj.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-meth-static-ary-ptrn-rest-not-final-id.js |  2 +-
 ...meth-static-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-ary.js |  2 +-
 ...-meth-static-dflt-ary-ptrn-rest-init-id.js |  2 +-
 ...meth-static-dflt-ary-ptrn-rest-init-obj.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-static-dflt-ary-ptrn-rest-not-final-id.js |  2 +-
 ...static-dflt-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...all-expression-private-method-async-gen.js |  2 +-
 ...te-call-expression-private-method-async.js |  2 +-
 ...lete-call-expression-private-method-gen.js |  2 +-
 ...r-delete-call-expression-private-method.js |  2 +-
 ...-err-delete-call-expression-privatename.js |  2 +-
 ...ber-expression-private-method-async-gen.js |  2 +-
 ...-member-expression-private-method-async.js |  2 +-
 ...te-member-expression-private-method-gen.js |  2 +-
 ...delete-member-expression-private-method.js |  2 +-
 ...rr-delete-member-expression-privatename.js |  2 +-
 ...s-arrow-fnc-init-err-contains-arguments.js |  2 +-
 ...ields-arrow-fnc-init-err-contains-super.js |  2 +-
 .../language/statements/class/fields-asi-3.js |  2 +-
 .../language/statements/class/fields-asi-4.js |  2 +-
 ...s-comp-name-init-err-contains-arguments.js |  2 +-
 ...ields-comp-name-init-err-contains-super.js |  2 +-
 .../class/fields-duplicate-privatenames.js    |  2 +-
 ...ds-equality-init-err-contains-arguments.js |  2 +-
 ...fields-equality-init-err-contains-super.js |  2 +-
 ...iteral-name-init-err-contains-arguments.js |  2 +-
 ...ds-literal-name-init-err-contains-super.js |  2 +-
 ...ields-literal-name-propname-constructor.js |  2 +-
 ...iteral-name-static-propname-constructor.js |  2 +-
 ...-literal-name-static-propname-prototype.js |  2 +-
 ...e-arrow-fnc-init-err-contains-arguments.js |  2 +-
 ...ivate-arrow-fnc-init-err-contains-super.js |  2 +-
 ...iteral-name-init-err-contains-arguments.js |  2 +-
 ...te-literal-name-init-err-contains-super.js |  2 +-
 ...ate-ternary-init-err-contains-arguments.js |  2 +-
 ...private-ternary-init-err-contains-super.js |  2 +-
 ...vate-typeof-init-err-contains-arguments.js |  2 +-
 ...-private-typeof-init-err-contains-super.js |  2 +-
 ...c-comp-name-init-err-contains-arguments.js |  2 +-
 ...tatic-comp-name-init-err-contains-super.js |  2 +-
 ...tic-literal-init-err-contains-arguments.js |  2 +-
 ...-static-literal-init-err-contains-super.js |  2 +-
 ...tic-private-init-err-contains-arguments.js |  2 +-
 ...-static-private-init-err-contains-super.js |  2 +-
 ...iteral-name-init-err-contains-arguments.js |  2 +-
 ...ng-literal-name-init-err-contains-super.js |  2 +-
 ...iteral-name-init-err-contains-arguments.js |  2 +-
 ...ng-literal-name-init-err-contains-super.js |  2 +-
 ...fields-string-name-propname-constructor.js |  2 +-
 ...string-name-static-propname-constructor.js |  2 +-
 ...s-string-name-static-propname-prototype.js |  2 +-
 ...lds-ternary-init-err-contains-arguments.js |  2 +-
 .../fields-ternary-init-err-contains-super.js |  2 +-
 ...elds-typeof-init-err-contains-arguments.js |  2 +-
 .../fields-typeof-init-err-contains-super.js  |  2 +-
 .../class/gen-meth-dflt-params-duplicates.js  |  2 +-
 .../class/gen-meth-dflt-params-rest.js        |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../gen-meth-static-dflt-params-duplicates.js |  2 +-
 .../class/gen-meth-static-dflt-params-rest.js |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../class/gen-method-param-dflt-yield.js      |  2 +-
 ...tic-yield-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-yield-as-binding-identifier.js |  2 +-
 ...c-yield-as-identifier-reference-escaped.js |  2 +-
 ...od-static-yield-as-identifier-reference.js |  2 +-
 ...tatic-yield-as-label-identifier-escaped.js |  2 +-
 ...method-static-yield-as-label-identifier.js |  2 +-
 ...d-static-yield-identifier-spread-strict.js |  2 +-
 ...n-method-static-yield-identifier-strict.js |  2 +-
 ...hod-yield-as-binding-identifier-escaped.js |  2 +-
 .../gen-method-yield-as-binding-identifier.js |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 ...en-method-yield-as-identifier-reference.js |  2 +-
 ...ethod-yield-as-label-identifier-escaped.js |  2 +-
 .../gen-method-yield-as-label-identifier.js   |  2 +-
 ...n-method-yield-identifier-spread-strict.js |  2 +-
 .../gen-method-yield-identifier-strict.js     |  2 +-
 ...tic-yield-as-binding-identifier-escaped.js |  2 +-
 ...thod-static-yield-as-binding-identifier.js |  2 +-
 ...c-yield-as-identifier-reference-escaped.js |  2 +-
 ...od-static-yield-as-identifier-reference.js |  2 +-
 ...tatic-yield-as-label-identifier-escaped.js |  2 +-
 ...method-static-yield-as-label-identifier.js |  2 +-
 ...d-static-yield-identifier-spread-strict.js |  2 +-
 ...e-method-static-yield-identifier-strict.js |  2 +-
 ...hod-yield-as-binding-identifier-escaped.js |  2 +-
 ...vate-method-yield-as-binding-identifier.js |  2 +-
 ...d-yield-as-identifier-reference-escaped.js |  2 +-
 ...te-method-yield-as-identifier-reference.js |  2 +-
 ...ethod-yield-as-label-identifier-escaped.js |  2 +-
 ...rivate-method-yield-as-label-identifier.js |  2 +-
 ...e-method-yield-identifier-spread-strict.js |  2 +-
 ...-private-method-yield-identifier-strict.js |  2 +-
 .../statements/class/getter-param-dflt.js     |  2 +-
 .../class/meth-dflt-params-duplicates.js      |  2 +-
 .../statements/class/meth-dflt-params-rest.js |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../meth-static-dflt-params-duplicates.js     |  2 +-
 .../class/meth-static-dflt-params-rest.js     |  2 +-
 ...-rest-params-trailing-comma-early-error.js |  2 +-
 .../statements/class/method-param-yield.js    |  2 +-
 ...privatename-not-valid-earlyerr-script-1.js |  2 +-
 ...privatename-not-valid-earlyerr-script-2.js |  2 +-
 ...privatename-not-valid-earlyerr-script-3.js |  2 +-
 ...privatename-not-valid-earlyerr-script-4.js |  2 +-
 ...privatename-not-valid-earlyerr-script-5.js |  2 +-
 ...privatename-not-valid-earlyerr-script-6.js |  2 +-
 ...privatename-not-valid-earlyerr-script-7.js |  2 +-
 ...privatename-not-valid-earlyerr-script-8.js |  2 +-
 .../static-gen-method-param-dflt-yield.js     |  2 +-
 .../class/static-method-param-yield.js        |  2 +-
 .../statements/class/strict-mode/with.js      |  2 +-
 ...tion-evaluation-block-duplicate-binding.js |  2 +-
 ...evaluation-scriptbody-duplicate-binding.js |  2 +-
 .../grammar-class-body-ctor-duplicate.js      |  2 +-
 .../grammar-ctor-super-no-heritage.js         |  2 +-
 ...mmar-field-identifier-invalid-ues-error.js |  2 +-
 ...mmar-field-identifier-invalid-zwj-error.js |  2 +-
 ...mar-field-identifier-invalid-zwnj-error.js |  2 +-
 .../grammar-fields-same-line-error.js         |  2 +-
 ...grammar-privatemeth-duplicate-get-field.js |  2 +-
 .../grammar-privatemeth-duplicate-get-get.js  |  2 +-
 ...rammar-privatemeth-duplicate-meth-field.js |  2 +-
 .../grammar-privatemeth-duplicate-meth-get.js |  2 +-
 ...grammar-privatemeth-duplicate-meth-meth.js |  2 +-
 .../grammar-privatemeth-duplicate-meth-set.js |  2 +-
 ...-privatemeth-duplicate-meth-staticfield.js |  2 +-
 ...r-privatemeth-duplicate-meth-staticmeth.js |  2 +-
 ...grammar-privatemeth-duplicate-set-field.js |  2 +-
 .../grammar-privatemeth-duplicate-set-set.js  |  2 +-
 .../grammar-privatename-constructor.js        |  2 +-
 .../early-errors/grammar-privatename-error.js |  2 +-
 ...mmar-privatename-identifier-invalid-ues.js |  2 +-
 ...rivatename-identifier-invalid-zwj-error.js |  2 +-
 ...ivatename-identifier-invalid-zwnj-error.js |  2 +-
 ...name-whitespace-error-accessor-get-meth.js |  2 +-
 ...name-whitespace-error-accessor-set-meth.js |  2 +-
 ...atename-whitespace-error-async-gen-meth.js |  2 +-
 ...privatename-whitespace-error-async-meth.js |  2 +-
 ...-privatename-whitespace-error-call-expr.js |  2 +-
 ...privatename-whitespace-error-field-init.js |  2 +-
 ...mmar-privatename-whitespace-error-field.js |  2 +-
 ...r-privatename-whitespace-error-gen-meth.js |  2 +-
 ...rivatename-whitespace-error-member-expr.js |  2 +-
 ...-privatename-whitespace-error-meth.case.js |  2 +-
 ...itespace-error-static-accessor-get-meth.js |  2 +-
 ...itespace-error-static-accessor-set-meth.js |  2 +-
 ...-whitespace-error-static-async-gen-meth.js |  2 +-
 ...name-whitespace-error-static-async-meth.js |  2 +-
 ...name-whitespace-error-static-field-init.js |  2 +-
 ...ivatename-whitespace-error-static-field.js |  2 +-
 ...tename-whitespace-error-static-gen-meth.js |  2 +-
 ...rivatename-whitespace-error-static-meth.js |  2 +-
 .../grammar-privatenames-same-line-error.js   |  2 +-
 ...r-special-meth-contains-super-async-gen.js |  2 +-
 ...ammar-special-meth-contains-super-async.js |  2 +-
 ...grammar-special-meth-contains-super-gen.js |  2 +-
 ...grammar-special-meth-contains-super-get.js |  2 +-
 ...mmar-special-meth-contains-super-method.js |  2 +-
 ...l-meth-contains-super-private-async-gen.js |  2 +-
 ...ecial-meth-contains-super-private-async.js |  2 +-
 ...special-meth-contains-super-private-gen.js |  2 +-
 ...cial-meth-contains-super-private-method.js |  2 +-
 ...grammar-special-meth-contains-super-set.js |  2 +-
 .../grammar-special-meth-ctor-async-gen.js    |  2 +-
 .../grammar-special-meth-ctor-async-meth.js   |  2 +-
 .../grammar-special-meth-ctor-gen.js          |  2 +-
 .../grammar-special-meth-ctor-get.js          |  2 +-
 .../grammar-special-meth-ctor-set.js          |  2 +-
 ...grammar-static-async-gen-meth-prototype.js |  2 +-
 .../grammar-static-async-gen-meth-super.js    |  2 +-
 .../grammar-static-async-meth-prototype.js    |  2 +-
 .../grammar-static-async-meth-super.js        |  2 +-
 .../grammar-static-gen-meth-prototype.js      |  2 +-
 .../grammar-static-gen-meth-super.js          |  2 +-
 .../grammar-static-get-meth-prototype.js      |  2 +-
 .../grammar-static-get-meth-super.js          |  2 +-
 .../grammar-static-meth-prototype.js          |  2 +-
 .../early-errors/grammar-static-meth-super.js |  2 +-
 ...atic-private-async-gen-meth-constructor.js |  2 +-
 ...mar-static-private-async-gen-meth-super.js |  2 +-
 ...r-static-private-async-meth-constructor.js |  2 +-
 ...grammar-static-private-async-meth-super.js |  2 +-
 ...mar-static-private-gen-meth-constructor.js |  2 +-
 .../grammar-static-private-gen-meth-super.js  |  2 +-
 ...grammar-static-private-meth-constructor.js |  2 +-
 .../grammar-static-private-meth-super.js      |  2 +-
 .../grammar-static-privatename-constructor.js |  2 +-
 .../grammar-static-set-meth-prototype.js      |  2 +-
 .../grammar-static-set-meth-super.js          |  2 +-
 .../statements/class/syntax/escaped-static.js |  2 +-
 .../const/dstr-ary-ptrn-rest-init-ary.js      |  2 +-
 .../const/dstr-ary-ptrn-rest-init-id.js       |  2 +-
 .../const/dstr-ary-ptrn-rest-init-obj.js      |  2 +-
 .../const/dstr-ary-ptrn-rest-not-final-ary.js |  2 +-
 .../const/dstr-ary-ptrn-rest-not-final-id.js  |  2 +-
 .../const/dstr-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...-from-within-strict-mode-function-const.js |  2 +-
 ...arations-mixed-with-without-initialiser.js |  2 +-
 ...arations-mixed-without-with-initialiser.js |  2 +-
 ...-const-declarations-without-initialiser.js |  2 +-
 ...st-declaring-let-split-across-two-lines.js |  2 +-
 ...itializer-do-statement-while-expression.js |  2 +-
 .../syntax/with-initializer-for-statement.js  |  2 +-
 ...-if-expression-statement-else-statement.js |  2 +-
 ...ith-initializer-if-expression-statement.js |  2 +-
 .../with-initializer-label-statement.js       |  2 +-
 ...-initializer-while-expression-statement.js |  2 +-
 ...tializer-case-expression-statement-list.js |  2 +-
 ...hout-initializer-default-statement-list.js |  2 +-
 ...itializer-do-statement-while-expression.js |  2 +-
 .../without-initializer-for-statement.js      |  2 +-
 ...-if-expression-statement-else-statement.js |  2 +-
 ...out-initializer-if-expression-statement.js |  2 +-
 .../without-initializer-label-statement.js    |  2 +-
 ...-initializer-while-expression-statement.js |  2 +-
 .../statements/continue/S12.7_A1_T1.js        |  2 +-
 .../statements/continue/S12.7_A1_T2.js        |  2 +-
 .../statements/continue/S12.7_A1_T3.js        |  2 +-
 .../statements/continue/S12.7_A1_T4.js        |  2 +-
 .../statements/continue/S12.7_A5_T1.js        |  2 +-
 .../statements/continue/S12.7_A5_T2.js        |  2 +-
 .../statements/continue/S12.7_A5_T3.js        |  2 +-
 test/language/statements/continue/S12.7_A6.js |  2 +-
 .../statements/continue/S12.7_A8_T1.js        |  2 +-
 .../statements/continue/S12.7_A8_T2.js        |  2 +-
 .../statements/debugger/expression.js         |  2 +-
 .../statements/do-while/S12.6.1_A12.js        |  2 +-
 .../statements/do-while/S12.6.1_A15.js        |  2 +-
 .../statements/do-while/S12.6.1_A6_T1.js      |  2 +-
 .../statements/do-while/S12.6.1_A6_T2.js      |  2 +-
 .../statements/do-while/S12.6.1_A6_T3.js      |  2 +-
 .../statements/do-while/S12.6.1_A6_T4.js      |  2 +-
 .../statements/do-while/S12.6.1_A6_T5.js      |  2 +-
 .../statements/do-while/S12.6.1_A6_T6.js      |  2 +-
 .../statements/do-while/decl-async-fun.js     |  2 +-
 .../statements/do-while/decl-async-gen.js     |  2 +-
 test/language/statements/do-while/decl-cls.js |  2 +-
 .../statements/do-while/decl-const.js         |  2 +-
 test/language/statements/do-while/decl-fun.js |  2 +-
 test/language/statements/do-while/decl-gen.js |  2 +-
 test/language/statements/do-while/decl-let.js |  2 +-
 .../statements/do-while/labelled-fn-stmt.js   |  2 +-
 .../do-while/let-array-with-newline.js        |  2 +-
 .../statements/expression/S12.4_A1.js         |  2 +-
 ...str-array-elem-init-yield-ident-invalid.js |  2 +-
 ...cl-dstr-array-elem-nested-array-invalid.js |  2 +-
 ...y-elem-nested-array-yield-ident-invalid.js |  2 +-
 ...decl-dstr-array-elem-nested-obj-invalid.js |  2 +-
 ...ray-elem-nested-obj-yield-ident-invalid.js |  2 +-
 ...cl-dstr-array-elem-target-simple-strict.js |  2 +-
 ...cl-dstr-array-elem-target-yield-invalid.js |  2 +-
 ...-func-dstr-const-ary-ptrn-rest-init-ary.js |  2 +-
 ...c-func-dstr-const-ary-ptrn-rest-init-id.js |  2 +-
 ...-func-dstr-const-ary-ptrn-rest-init-obj.js |  2 +-
 ...-dstr-const-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...c-dstr-const-ary-ptrn-rest-not-final-id.js |  2 +-
 ...-dstr-const-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...dstr-const-async-ary-ptrn-rest-init-ary.js |  2 +-
 ...-dstr-const-async-ary-ptrn-rest-init-id.js |  2 +-
 ...dstr-const-async-ary-ptrn-rest-init-obj.js |  2 +-
 ...const-async-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-const-async-ary-ptrn-rest-not-final-id.js |  2 +-
 ...const-async-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...nc-func-dstr-let-ary-ptrn-rest-init-ary.js |  2 +-
 ...ync-func-dstr-let-ary-ptrn-rest-init-id.js |  2 +-
 ...nc-func-dstr-let-ary-ptrn-rest-init-obj.js |  2 +-
 ...nc-dstr-let-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...unc-dstr-let-ary-ptrn-rest-not-final-id.js |  2 +-
 ...nc-dstr-let-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...c-dstr-let-async-ary-ptrn-rest-init-ary.js |  2 +-
 ...nc-dstr-let-async-ary-ptrn-rest-init-id.js |  2 +-
 ...c-dstr-let-async-ary-ptrn-rest-init-obj.js |  2 +-
 ...r-let-async-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...tr-let-async-ary-ptrn-rest-not-final-id.js |  2 +-
 ...r-let-async-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...nc-func-dstr-var-ary-ptrn-rest-init-ary.js |  2 +-
 ...ync-func-dstr-var-ary-ptrn-rest-init-id.js |  2 +-
 ...nc-func-dstr-var-ary-ptrn-rest-init-obj.js |  2 +-
 ...nc-dstr-var-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...unc-dstr-var-ary-ptrn-rest-not-final-id.js |  2 +-
 ...nc-dstr-var-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...c-dstr-var-async-ary-ptrn-rest-init-ary.js |  2 +-
 ...nc-dstr-var-async-ary-ptrn-rest-init-id.js |  2 +-
 ...c-dstr-var-async-ary-ptrn-rest-init-obj.js |  2 +-
 ...r-var-async-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...tr-var-async-ary-ptrn-rest-not-final-id.js |  2 +-
 ...r-var-async-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...c-gen-dstr-const-ary-ptrn-rest-init-ary.js |  2 +-
 ...nc-gen-dstr-const-ary-ptrn-rest-init-id.js |  2 +-
 ...c-gen-dstr-const-ary-ptrn-rest-init-obj.js |  2 +-
 ...-dstr-const-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...n-dstr-const-ary-ptrn-rest-not-final-id.js |  2 +-
 ...-dstr-const-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...dstr-const-async-ary-ptrn-rest-init-ary.js |  2 +-
 ...-dstr-const-async-ary-ptrn-rest-init-id.js |  2 +-
 ...dstr-const-async-ary-ptrn-rest-init-obj.js |  2 +-
 ...const-async-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...-const-async-ary-ptrn-rest-not-final-id.js |  2 +-
 ...const-async-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...ync-gen-dstr-let-ary-ptrn-rest-init-ary.js |  2 +-
 ...sync-gen-dstr-let-ary-ptrn-rest-init-id.js |  2 +-
 ...ync-gen-dstr-let-ary-ptrn-rest-init-obj.js |  2 +-
 ...en-dstr-let-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...gen-dstr-let-ary-ptrn-rest-not-final-id.js |  2 +-
 ...en-dstr-let-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...n-dstr-let-async-ary-ptrn-rest-init-ary.js |  2 +-
 ...en-dstr-let-async-ary-ptrn-rest-init-id.js |  2 +-
 ...n-dstr-let-async-ary-ptrn-rest-init-obj.js |  2 +-
 ...r-let-async-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...tr-let-async-ary-ptrn-rest-not-final-id.js |  2 +-
 ...r-let-async-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...ync-gen-dstr-var-ary-ptrn-rest-init-ary.js |  2 +-
 ...sync-gen-dstr-var-ary-ptrn-rest-init-id.js |  2 +-
 ...ync-gen-dstr-var-ary-ptrn-rest-init-obj.js |  2 +-
 ...en-dstr-var-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...gen-dstr-var-ary-ptrn-rest-not-final-id.js |  2 +-
 ...en-dstr-var-ary-ptrn-rest-not-final-obj.js |  2 +-
 ...n-dstr-var-async-ary-ptrn-rest-init-ary.js |  2 +-
 ...en-dstr-var-async-ary-ptrn-rest-init-id.js |  2 +-
 ...n-dstr-var-async-ary-ptrn-rest-init-obj.js |  2 +-
 ...r-var-async-ary-ptrn-rest-not-final-ary.js |  2 +-
 ...tr-var-async-ary-ptrn-rest-not-final-id.js |  2 +-
 ...r-var-async-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../statements/for-await-of/escaped-of.js     |  2 +-
 .../for-await-of/let-array-with-newline.js    |  2 +-
 .../language/statements/for-in/S12.6.4_A15.js |  2 +-
 .../statements/for-in/decl-async-fun.js       |  2 +-
 .../statements/for-in/decl-async-gen.js       |  2 +-
 test/language/statements/for-in/decl-cls.js   |  2 +-
 test/language/statements/for-in/decl-const.js |  2 +-
 test/language/statements/for-in/decl-fun.js   |  2 +-
 test/language/statements/for-in/decl-gen.js   |  2 +-
 test/language/statements/for-in/decl-let.js   |  2 +-
 ...str-array-elem-init-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-nested-array-invalid.js   |  2 +-
 ...y-elem-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-nested-obj-invalid.js     |  2 +-
 ...ray-elem-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-target-simple-strict.js   |  2 +-
 .../dstr-array-elem-target-yield-invalid.js   |  2 +-
 .../for-in/dstr-array-rest-before-element.js  |  2 +-
 .../for-in/dstr-array-rest-before-elision.js  |  2 +-
 .../for-in/dstr-array-rest-before-rest.js     |  2 +-
 .../for-in/dstr-array-rest-elision-invalid.js |  2 +-
 .../statements/for-in/dstr-array-rest-init.js |  2 +-
 .../dstr-array-rest-nested-array-invalid.js   |  2 +-
 ...y-rest-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-array-rest-nested-obj-invalid.js     |  2 +-
 ...ray-rest-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-array-rest-yield-ident-invalid.js    |  2 +-
 .../dstr-obj-id-identifier-yield-expr.js      |  2 +-
 ...r-obj-id-identifier-yield-ident-invalid.js |  2 +-
 .../for-in/dstr-obj-id-init-simple-strict.js  |  2 +-
 .../dstr-obj-id-init-yield-ident-invalid.js   |  2 +-
 .../for-in/dstr-obj-id-simple-strict.js       |  2 +-
 ...-obj-prop-elem-init-yield-ident-invalid.js |  2 +-
 ...bj-prop-elem-target-yield-ident-invalid.js |  2 +-
 .../dstr-obj-prop-nested-array-invalid.js     |  2 +-
 ...j-prop-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-obj-prop-nested-obj-invalid.js       |  2 +-
 ...obj-prop-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-obj-rest-not-last-element-invalid.js |  2 +-
 .../for-in/head-const-bound-names-dup.js      |  2 +-
 .../for-in/head-const-bound-names-in-stmt.js  |  2 +-
 .../for-in/head-const-bound-names-let.js      |  2 +-
 .../for-in/head-let-bound-names-dup.js        |  2 +-
 .../for-in/head-let-bound-names-in-stmt.js    |  2 +-
 .../for-in/head-let-bound-names-let.js        |  2 +-
 .../for-in/head-lhs-cover-non-asnmt-trgt.js   |  2 +-
 .../for-in/head-lhs-invalid-asnmt-ptrn-ary.js |  2 +-
 .../for-in/head-lhs-invalid-asnmt-ptrn-obj.js |  2 +-
 .../for-in/head-lhs-non-asnmt-trgt.js         |  2 +-
 .../for-in/labelled-fn-stmt-const.js          |  2 +-
 .../statements/for-in/labelled-fn-stmt-let.js |  2 +-
 .../statements/for-in/labelled-fn-stmt-lhs.js |  2 +-
 .../statements/for-in/labelled-fn-stmt-var.js |  2 +-
 .../for-in/let-array-with-newline.js          |  2 +-
 .../statements/for-of/decl-async-fun.js       |  2 +-
 .../statements/for-of/decl-async-gen.js       |  2 +-
 test/language/statements/for-of/decl-cls.js   |  2 +-
 test/language/statements/for-of/decl-const.js |  2 +-
 test/language/statements/for-of/decl-fun.js   |  2 +-
 test/language/statements/for-of/decl-gen.js   |  2 +-
 test/language/statements/for-of/decl-let.js   |  2 +-
 ...str-array-elem-init-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-nested-array-invalid.js   |  2 +-
 ...y-elem-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-nested-obj-invalid.js     |  2 +-
 ...ray-elem-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-array-elem-target-simple-strict.js   |  2 +-
 .../dstr-array-elem-target-yield-invalid.js   |  2 +-
 .../for-of/dstr-array-rest-before-element.js  |  2 +-
 .../for-of/dstr-array-rest-before-elision.js  |  2 +-
 .../for-of/dstr-array-rest-before-rest.js     |  2 +-
 .../for-of/dstr-array-rest-elision-invalid.js |  2 +-
 .../statements/for-of/dstr-array-rest-init.js |  2 +-
 .../dstr-array-rest-nested-array-invalid.js   |  2 +-
 ...y-rest-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-array-rest-nested-obj-invalid.js     |  2 +-
 ...ray-rest-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-array-rest-yield-ident-invalid.js    |  2 +-
 .../dstr-const-ary-ptrn-rest-init-ary.js      |  2 +-
 .../dstr-const-ary-ptrn-rest-init-id.js       |  2 +-
 .../dstr-const-ary-ptrn-rest-init-obj.js      |  2 +-
 .../dstr-const-ary-ptrn-rest-not-final-ary.js |  2 +-
 .../dstr-const-ary-ptrn-rest-not-final-id.js  |  2 +-
 .../dstr-const-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../for-of/dstr-let-ary-ptrn-rest-init-ary.js |  2 +-
 .../for-of/dstr-let-ary-ptrn-rest-init-id.js  |  2 +-
 .../for-of/dstr-let-ary-ptrn-rest-init-obj.js |  2 +-
 .../dstr-let-ary-ptrn-rest-not-final-ary.js   |  2 +-
 .../dstr-let-ary-ptrn-rest-not-final-id.js    |  2 +-
 .../dstr-let-ary-ptrn-rest-not-final-obj.js   |  2 +-
 .../dstr-obj-id-identifier-yield-expr.js      |  2 +-
 ...r-obj-id-identifier-yield-ident-invalid.js |  2 +-
 .../for-of/dstr-obj-id-init-simple-strict.js  |  2 +-
 .../dstr-obj-id-init-yield-ident-invalid.js   |  2 +-
 .../for-of/dstr-obj-id-simple-strict.js       |  2 +-
 ...-obj-prop-elem-init-yield-ident-invalid.js |  2 +-
 ...bj-prop-elem-target-yield-ident-invalid.js |  2 +-
 .../dstr-obj-prop-nested-array-invalid.js     |  2 +-
 ...j-prop-nested-array-yield-ident-invalid.js |  2 +-
 .../dstr-obj-prop-nested-obj-invalid.js       |  2 +-
 ...obj-prop-nested-obj-yield-ident-invalid.js |  2 +-
 .../dstr-obj-rest-not-last-element-invalid.js |  2 +-
 .../for-of/dstr-var-ary-ptrn-rest-init-ary.js |  2 +-
 .../for-of/dstr-var-ary-ptrn-rest-init-id.js  |  2 +-
 .../for-of/dstr-var-ary-ptrn-rest-init-obj.js |  2 +-
 .../dstr-var-ary-ptrn-rest-not-final-ary.js   |  2 +-
 .../dstr-var-ary-ptrn-rest-not-final-id.js    |  2 +-
 .../dstr-var-ary-ptrn-rest-not-final-obj.js   |  2 +-
 test/language/statements/for-of/escaped-of.js |  2 +-
 .../for-of/head-const-bound-names-dup.js      |  2 +-
 .../for-of/head-const-bound-names-in-stmt.js  |  2 +-
 .../for-of/head-const-bound-names-let.js      |  2 +-
 .../statements/for-of/head-decl-no-expr.js    |  2 +-
 .../statements/for-of/head-expr-no-expr.js    |  2 +-
 .../for-of/head-let-bound-names-dup.js        |  2 +-
 .../for-of/head-let-bound-names-in-stmt.js    |  2 +-
 .../for-of/head-let-bound-names-let.js        |  2 +-
 .../for-of/head-lhs-cover-non-asnmt-trgt.js   |  2 +-
 .../for-of/head-lhs-invalid-asnmt-ptrn-ary.js |  2 +-
 .../for-of/head-lhs-invalid-asnmt-ptrn-obj.js |  2 +-
 .../statements/for-of/head-lhs-let.js         |  2 +-
 .../for-of/head-lhs-non-asnmt-trgt.js         |  2 +-
 .../statements/for-of/head-var-no-expr.js     |  2 +-
 .../for-of/labelled-fn-stmt-const.js          |  2 +-
 .../statements/for-of/labelled-fn-stmt-let.js |  2 +-
 .../statements/for-of/labelled-fn-stmt-lhs.js |  2 +-
 .../statements/for-of/labelled-fn-stmt-var.js |  2 +-
 .../for-of/let-array-with-newline.js          |  2 +-
 .../statements/for/S12.6.3_A11.1_T3.js        |  2 +-
 .../language/statements/for/S12.6.3_A11_T3.js |  2 +-
 .../statements/for/S12.6.3_A12.1_T3.js        |  2 +-
 .../language/statements/for/S12.6.3_A12_T3.js |  2 +-
 test/language/statements/for/S12.6.3_A4.1.js  |  2 +-
 test/language/statements/for/S12.6.3_A4_T1.js |  2 +-
 test/language/statements/for/S12.6.3_A4_T2.js |  2 +-
 .../statements/for/S12.6.3_A7.1_T1.js         |  2 +-
 .../statements/for/S12.6.3_A7.1_T2.js         |  2 +-
 test/language/statements/for/S12.6.3_A7_T1.js |  2 +-
 test/language/statements/for/S12.6.3_A7_T2.js |  2 +-
 .../statements/for/S12.6.3_A8.1_T1.js         |  2 +-
 .../statements/for/S12.6.3_A8.1_T2.js         |  2 +-
 .../statements/for/S12.6.3_A8.1_T3.js         |  2 +-
 test/language/statements/for/S12.6.3_A8_T1.js |  2 +-
 test/language/statements/for/S12.6.3_A8_T2.js |  2 +-
 test/language/statements/for/S12.6.3_A8_T3.js |  2 +-
 .../language/statements/for/decl-async-fun.js |  2 +-
 .../language/statements/for/decl-async-gen.js |  2 +-
 test/language/statements/for/decl-cls.js      |  2 +-
 test/language/statements/for/decl-const.js    |  2 +-
 test/language/statements/for/decl-fun.js      |  2 +-
 test/language/statements/for/decl-gen.js      |  2 +-
 test/language/statements/for/decl-let.js      |  2 +-
 .../for/dstr-const-ary-ptrn-rest-init-ary.js  |  2 +-
 .../for/dstr-const-ary-ptrn-rest-init-id.js   |  2 +-
 .../for/dstr-const-ary-ptrn-rest-init-obj.js  |  2 +-
 .../dstr-const-ary-ptrn-rest-not-final-ary.js |  2 +-
 .../dstr-const-ary-ptrn-rest-not-final-id.js  |  2 +-
 .../dstr-const-ary-ptrn-rest-not-final-obj.js |  2 +-
 .../for/dstr-let-ary-ptrn-rest-init-ary.js    |  2 +-
 .../for/dstr-let-ary-ptrn-rest-init-id.js     |  2 +-
 .../for/dstr-let-ary-ptrn-rest-init-obj.js    |  2 +-
 .../dstr-let-ary-ptrn-rest-not-final-ary.js   |  2 +-
 .../dstr-let-ary-ptrn-rest-not-final-id.js    |  2 +-
 .../dstr-let-ary-ptrn-rest-not-final-obj.js   |  2 +-
 .../for/dstr-var-ary-ptrn-rest-init-ary.js    |  2 +-
 .../for/dstr-var-ary-ptrn-rest-init-id.js     |  2 +-
 .../for/dstr-var-ary-ptrn-rest-init-obj.js    |  2 +-
 .../dstr-var-ary-ptrn-rest-not-final-ary.js   |  2 +-
 .../dstr-var-ary-ptrn-rest-not-final-id.js    |  2 +-
 .../dstr-var-ary-ptrn-rest-not-final-obj.js   |  2 +-
 .../for/head-const-bound-names-in-stmt.js     |  2 +-
 .../for/head-let-bound-names-in-stmt.js       |  2 +-
 .../statements/for/labelled-fn-stmt-const.js  |  2 +-
 .../statements/for/labelled-fn-stmt-expr.js   |  2 +-
 .../statements/for/labelled-fn-stmt-let.js    |  2 +-
 .../statements/for/labelled-fn-stmt-var.js    |  2 +-
 .../statements/for/let-array-with-newline.js  |  2 +-
 .../statements/function/13.0_4-5gs.js         |  2 +-
 .../language/statements/function/13.1-13gs.js |  2 +-
 test/language/statements/function/13.1-1gs.js |  2 +-
 test/language/statements/function/13.1-4gs.js |  2 +-
 test/language/statements/function/13.1-5gs.js |  2 +-
 test/language/statements/function/13.1-8gs.js |  2 +-
 .../language/statements/function/S13_A7_T3.js |  2 +-
 .../function/dflt-params-duplicates.js        |  2 +-
 .../statements/function/dflt-params-rest.js   |  2 +-
 .../function/dstr-ary-ptrn-rest-init-ary.js   |  2 +-
 .../function/dstr-ary-ptrn-rest-init-id.js    |  2 +-
 .../function/dstr-ary-ptrn-rest-init-obj.js   |  2 +-
 .../dstr-ary-ptrn-rest-not-final-ary.js       |  2 +-
 .../dstr-ary-ptrn-rest-not-final-id.js        |  2 +-
 .../dstr-ary-ptrn-rest-not-final-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-ary.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-id.js        |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../function/early-body-super-call.js         |  2 +-
 .../function/early-body-super-prop.js         |  2 +-
 .../function/early-params-super-call.js       |  2 +-
 .../function/early-params-super-prop.js       |  2 +-
 .../function/enable-strict-via-body.js        |  2 +-
 .../function/enable-strict-via-outer-body.js  |  2 +-
 .../enable-strict-via-outer-script.js         |  2 +-
 .../statements/function/invalid-2-names.js    |  2 +-
 .../statements/function/invalid-3-names.js    |  2 +-
 .../function/invalid-function-body-1.js       |  2 +-
 .../function/invalid-function-body-2.js       |  2 +-
 .../function/invalid-function-body-3.js       |  2 +-
 .../statements/function/invalid-name-dot.js   |  2 +-
 .../function/invalid-name-two-dots.js         |  2 +-
 .../function/name-arguments-strict-body.js    |  2 +-
 .../function/name-arguments-strict.js         |  2 +-
 .../function/name-eval-strict-body.js         |  2 +-
 .../statements/function/name-eval-strict.js   |  2 +-
 .../function/param-arguments-strict-body.js   |  2 +-
 .../function/param-arguments-strict.js        |  2 +-
 .../function/param-dflt-yield-strict.js       |  2 +-
 .../function/param-duplicated-strict-1.js     |  2 +-
 .../function/param-duplicated-strict-2.js     |  2 +-
 .../function/param-duplicated-strict-3.js     |  2 +-
 .../param-duplicated-strict-body-1.js         |  2 +-
 .../param-duplicated-strict-body-2.js         |  2 +-
 .../param-duplicated-strict-body-3.js         |  2 +-
 .../function/param-eval-strict-body.js        |  2 +-
 .../statements/function/param-eval-strict.js  |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 .../use-strict-with-non-simple-param.js       |  2 +-
 .../generators/dflt-params-duplicates.js      |  2 +-
 .../statements/generators/dflt-params-rest.js |  2 +-
 .../generators/dstr-ary-ptrn-rest-init-ary.js |  2 +-
 .../generators/dstr-ary-ptrn-rest-init-id.js  |  2 +-
 .../generators/dstr-ary-ptrn-rest-init-obj.js |  2 +-
 .../dstr-ary-ptrn-rest-not-final-ary.js       |  2 +-
 .../dstr-ary-ptrn-rest-not-final-id.js        |  2 +-
 .../dstr-ary-ptrn-rest-not-final-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-ary.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-id.js        |  2 +-
 .../dstr-dflt-ary-ptrn-rest-init-obj.js       |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-ary.js  |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-id.js   |  2 +-
 .../dstr-dflt-ary-ptrn-rest-not-final-obj.js  |  2 +-
 .../statements/generators/param-dflt-yield.js |  2 +-
 .../rest-params-trailing-comma-early-error.js |  2 +-
 .../use-strict-with-non-simple-param.js       |  2 +-
 .../yield-as-binding-identifier-escaped.js    |  2 +-
 .../generators/yield-as-binding-identifier.js |  2 +-
 .../yield-as-identifier-reference-escaped.js  |  2 +-
 .../yield-as-identifier-reference.js          |  2 +-
 .../yield-as-label-identifier-escaped.js      |  2 +-
 .../generators/yield-as-label-identifier.js   |  2 +-
 .../yield-as-logical-or-expression.js         |  2 +-
 .../generators/yield-as-parameter.js          |  2 +-
 .../yield-identifier-spread-strict.js         |  2 +-
 .../generators/yield-identifier-strict.js     |  2 +-
 .../generators/yield-star-after-newline.js    |  2 +-
 .../generators/yield-weak-binding.js          |  2 +-
 test/language/statements/if/S12.5_A11.js      |  2 +-
 test/language/statements/if/S12.5_A6_T1.js    |  2 +-
 test/language/statements/if/S12.5_A6_T2.js    |  2 +-
 test/language/statements/if/S12.5_A8.js       |  2 +-
 .../if/if-async-fun-else-async-fun.js         |  2 +-
 .../statements/if/if-async-fun-else-stmt.js   |  2 +-
 .../statements/if/if-async-fun-no-else.js     |  2 +-
 .../if/if-async-gen-else-async-gen.js         |  2 +-
 .../statements/if/if-async-gen-else-stmt.js   |  2 +-
 .../statements/if/if-async-gen-no-else.js     |  2 +-
 .../language/statements/if/if-cls-else-cls.js |  2 +-
 .../statements/if/if-cls-else-stmt.js         |  2 +-
 test/language/statements/if/if-cls-no-else.js |  2 +-
 .../statements/if/if-const-else-const.js      |  2 +-
 .../statements/if/if-const-else-stmt.js       |  2 +-
 .../statements/if/if-const-no-else.js         |  2 +-
 .../statements/if/if-decl-else-decl-strict.js |  2 +-
 .../statements/if/if-decl-else-stmt-strict.js |  2 +-
 .../statements/if/if-decl-no-else-strict.js   |  2 +-
 .../statements/if/if-fun-else-fun-strict.js   |  2 +-
 .../statements/if/if-fun-else-stmt-strict.js  |  2 +-
 .../statements/if/if-fun-no-else-strict.js    |  2 +-
 .../language/statements/if/if-gen-else-gen.js |  2 +-
 .../statements/if/if-gen-else-stmt.js         |  2 +-
 test/language/statements/if/if-gen-no-else.js |  2 +-
 .../language/statements/if/if-let-else-let.js |  2 +-
 .../statements/if/if-let-else-stmt.js         |  2 +-
 test/language/statements/if/if-let-no-else.js |  2 +-
 .../statements/if/if-stmt-else-async-fun.js   |  2 +-
 .../statements/if/if-stmt-else-async-gen.js   |  2 +-
 .../statements/if/if-stmt-else-cls.js         |  2 +-
 .../statements/if/if-stmt-else-const.js       |  2 +-
 .../statements/if/if-stmt-else-decl-strict.js |  2 +-
 .../statements/if/if-stmt-else-fun-strict.js  |  2 +-
 .../statements/if/if-stmt-else-gen.js         |  2 +-
 .../statements/if/if-stmt-else-let.js         |  2 +-
 .../statements/if/labelled-fn-stmt-first.js   |  2 +-
 .../statements/if/labelled-fn-stmt-lone.js    |  2 +-
 .../statements/if/labelled-fn-stmt-second.js  |  2 +-
 .../statements/if/let-array-with-newline.js   |  2 +-
 test/language/statements/labeled/continue.js  |  2 +-
 .../statements/labeled/decl-async-function.js |  2 +-
 .../labeled/decl-async-generator.js           |  2 +-
 test/language/statements/labeled/decl-cls.js  |  2 +-
 .../language/statements/labeled/decl-const.js |  2 +-
 .../statements/labeled/decl-fun-strict.js     |  2 +-
 test/language/statements/labeled/decl-gen.js  |  2 +-
 test/language/statements/labeled/decl-let.js  |  2 +-
 .../labeled/let-array-with-newline.js         |  2 +-
 .../labeled/value-await-module-escaped.js     |  2 +-
 .../statements/labeled/value-await-module.js  |  2 +-
 .../labeled/value-yield-strict-escaped.js     |  2 +-
 .../statements/labeled/value-yield-strict.js  |  2 +-
 .../let/dstr-ary-ptrn-rest-init-ary.js        |  2 +-
 .../let/dstr-ary-ptrn-rest-init-id.js         |  2 +-
 .../let/dstr-ary-ptrn-rest-init-obj.js        |  2 +-
 .../let/dstr-ary-ptrn-rest-not-final-ary.js   |  2 +-
 .../let/dstr-ary-ptrn-rest-not-final-id.js    |  2 +-
 .../let/dstr-ary-ptrn-rest-not-final-obj.js   |  2 +-
 ...-error-from-within-strict-mode-function.js |  2 +-
 ...e-let-binding-with-function-declaration.js |  2 +-
 ...tempt-to-redeclare-let-binding-with-var.js |  2 +-
 ...lowed-as-lefthandside-expression-strict.js |  2 +-
 .../identifier-let-disallowed-as-boundname.js |  2 +-
 ...-let-declaration-split-across-two-lines.js |  2 +-
 ...with-initializer-split-across-two-lines.js |  2 +-
 .../let-newline-await-in-normal-function.js   |  2 +-
 ...let-newline-yield-in-generator-function.js |  2 +-
 .../let-newline-yield-in-normal-function.js   |  2 +-
 ...positions-do-statement-while-expression.js |  2 +-
 ...rs-in-statement-positions-for-statement.js |  2 +-
 ...-if-expression-statement-else-statement.js |  2 +-
 ...ement-positions-if-expression-statement.js |  2 +-
 ...-in-statement-positions-label-statement.js |  2 +-
 ...nt-positions-while-expression-statement.js |  2 +-
 ...positions-do-statement-while-expression.js |  2 +-
 ...rs-in-statement-positions-for-statement.js |  2 +-
 ...-if-expression-statement-else-statement.js |  2 +-
 ...ement-positions-if-expression-statement.js |  2 +-
 ...-in-statement-positions-label-statement.js |  2 +-
 ...nt-positions-while-expression-statement.js |  2 +-
 .../language/statements/return/S12.9_A1_T1.js |  2 +-
 .../statements/return/S12.9_A1_T10.js         |  2 +-
 .../language/statements/return/S12.9_A1_T2.js |  2 +-
 .../language/statements/return/S12.9_A1_T3.js |  2 +-
 .../language/statements/return/S12.9_A1_T4.js |  2 +-
 .../language/statements/return/S12.9_A1_T5.js |  2 +-
 .../language/statements/return/S12.9_A1_T6.js |  2 +-
 .../language/statements/return/S12.9_A1_T7.js |  2 +-
 .../language/statements/return/S12.9_A1_T8.js |  2 +-
 .../language/statements/return/S12.9_A1_T9.js |  2 +-
 .../statements/switch/S12.11_A2_T1.js         |  2 +-
 .../statements/switch/S12.11_A3_T1.js         |  2 +-
 .../statements/switch/S12.11_A3_T2.js         |  2 +-
 .../statements/switch/S12.11_A3_T3.js         |  2 +-
 .../statements/switch/S12.11_A3_T4.js         |  2 +-
 .../statements/switch/S12.11_A3_T5.js         |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 ...tempt-to-redeclare-with-var-declaration.js |  2 +-
 ...declare-with-async-function-declaration.js |  2 +-
 ...eclare-with-async-generator-declaration.js |  2 +-
 ...mpt-to-redeclare-with-class-declaration.js |  2 +-
 ...mpt-to-redeclare-with-const-declaration.js |  2 +-
 ...-to-redeclare-with-function-declaration.js |  2 +-
 ...to-redeclare-with-generator-declaration.js |  2 +-
 ...tempt-to-redeclare-with-let-declaration.js |  2 +-
 test/language/statements/try/S12.14_A16_T1.js |  2 +-
 .../language/statements/try/S12.14_A16_T10.js |  2 +-
 .../language/statements/try/S12.14_A16_T11.js |  2 +-
 .../language/statements/try/S12.14_A16_T12.js |  2 +-
 .../language/statements/try/S12.14_A16_T13.js |  2 +-
 .../language/statements/try/S12.14_A16_T14.js |  2 +-
 .../language/statements/try/S12.14_A16_T15.js |  2 +-
 test/language/statements/try/S12.14_A16_T2.js |  2 +-
 test/language/statements/try/S12.14_A16_T3.js |  2 +-
 test/language/statements/try/S12.14_A16_T5.js |  2 +-
 test/language/statements/try/S12.14_A16_T6.js |  2 +-
 test/language/statements/try/S12.14_A16_T7.js |  2 +-
 test/language/statements/try/S12.14_A16_T8.js |  2 +-
 test/language/statements/try/S12.14_A16_T9.js |  2 +-
 ...es-restriction-arguments-negative-early.js |  2 +-
 ...ndnames-restriction-eval-negative-early.js |  2 +-
 .../try/dstr-ary-ptrn-rest-init-ary.js        |  2 +-
 .../try/dstr-ary-ptrn-rest-init-id.js         |  2 +-
 .../try/dstr-ary-ptrn-rest-init-obj.js        |  2 +-
 .../try/dstr-ary-ptrn-rest-not-final-ary.js   |  2 +-
 .../try/dstr-ary-ptrn-rest-not-final-id.js    |  2 +-
 .../try/dstr-ary-ptrn-rest-not-final-obj.js   |  2 +-
 .../statements/try/early-catch-duplicates.js  |  2 +-
 .../statements/try/early-catch-function.js    |  2 +-
 .../statements/try/early-catch-lex.js         |  2 +-
 .../statements/try/early-catch-var.js         |  2 +-
 .../try/optional-catch-binding-parens.js      |  2 +-
 .../statements/variable/12.2.1-1gs.js         |  2 +-
 .../statements/variable/12.2.1-4gs.js         |  2 +-
 .../statements/variable/S12.2_A8_T1.js        |  2 +-
 .../statements/variable/S12.2_A8_T2.js        |  2 +-
 .../statements/variable/S12.2_A8_T3.js        |  2 +-
 .../statements/variable/S12.2_A8_T4.js        |  2 +-
 .../statements/variable/S12.2_A8_T5.js        |  2 +-
 .../statements/variable/S12.2_A8_T6.js        |  2 +-
 .../statements/variable/S12.2_A8_T7.js        |  2 +-
 .../statements/variable/S12.2_A8_T8.js        |  2 +-
 .../variable/dstr-ary-ptrn-rest-init-ary.js   |  2 +-
 .../variable/dstr-ary-ptrn-rest-init-id.js    |  2 +-
 .../variable/dstr-ary-ptrn-rest-init-obj.js   |  2 +-
 .../dstr-ary-ptrn-rest-not-final-ary.js       |  2 +-
 .../dstr-ary-ptrn-rest-not-final-id.js        |  2 +-
 .../dstr-ary-ptrn-rest-not-final-obj.js       |  2 +-
 .../variable/id-arguments-strict.js           |  2 +-
 .../statements/variable/id-eval-strict.js     |  2 +-
 test/language/statements/while/S12.6.2_A15.js |  2 +-
 .../statements/while/S12.6.2_A6_T1.js         |  2 +-
 .../statements/while/S12.6.2_A6_T2.js         |  2 +-
 .../statements/while/S12.6.2_A6_T3.js         |  2 +-
 .../statements/while/S12.6.2_A6_T4.js         |  2 +-
 .../statements/while/S12.6.2_A6_T5.js         |  2 +-
 .../statements/while/S12.6.2_A6_T6.js         |  2 +-
 .../statements/while/decl-async-fun.js        |  2 +-
 .../statements/while/decl-async-gen.js        |  2 +-
 test/language/statements/while/decl-cls.js    |  2 +-
 test/language/statements/while/decl-const.js  |  2 +-
 test/language/statements/while/decl-fun.js    |  2 +-
 test/language/statements/while/decl-gen.js    |  2 +-
 test/language/statements/while/decl-let.js    |  2 +-
 .../statements/while/labelled-fn-stmt.js      |  2 +-
 .../while/let-array-with-newline.js           |  2 +-
 test/language/statements/with/12.10.1-11gs.js |  2 +-
 .../statements/with/decl-async-fun.js         |  2 +-
 .../statements/with/decl-async-gen.js         |  2 +-
 test/language/statements/with/decl-cls.js     |  2 +-
 test/language/statements/with/decl-const.js   |  2 +-
 test/language/statements/with/decl-fun.js     |  2 +-
 test/language/statements/with/decl-gen.js     |  2 +-
 test/language/statements/with/decl-let.js     |  2 +-
 .../statements/with/labelled-fn-stmt.js       |  2 +-
 .../statements/with/let-array-with-newline.js |  2 +-
 test/language/types/boolean/S8.3_A2.1.js      |  2 +-
 test/language/types/boolean/S8.3_A2.2.js      |  2 +-
 test/language/types/null/S8.2_A2.js           |  2 +-
 test/language/types/reference/S8.7.2_A1_T1.js |  2 +-
 test/language/types/reference/S8.7.2_A1_T2.js |  2 +-
 test/language/types/string/S8.4_A13_T1.js     |  2 +-
 test/language/types/string/S8.4_A13_T2.js     |  2 +-
 test/language/types/string/S8.4_A13_T3.js     |  2 +-
 test/language/types/string/S8.4_A14_T1.js     |  2 +-
 test/language/types/string/S8.4_A14_T2.js     |  2 +-
 test/language/types/string/S8.4_A14_T3.js     |  2 +-
 test/language/white-space/S7.2_A5_T1.js       |  2 +-
 test/language/white-space/S7.2_A5_T2.js       |  2 +-
 test/language/white-space/S7.2_A5_T3.js       |  2 +-
 test/language/white-space/S7.2_A5_T4.js       |  2 +-
 test/language/white-space/S7.2_A5_T5.js       |  2 +-
 .../white-space/mongolian-vowel-separator.js  |  2 +-
 tools/lint/lib/checks/negative.py             |  2 +-
 .../test/fixtures/negative_valid_parse.js     |  2 +-
 .../fixtures/negative_valid_resolution.js     |  2 +-
 3074 files changed, 3086 insertions(+), 3085 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c0a11d209e..af94a844f2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -191,18 +191,19 @@ Each test case is run in a fresh JavaScript environment; in a browser, this will
 
 Function | Purpose
 ---------|--------
-Test262Error(message) | constructor for an error object that indicates a test failure
-$DONE(arg) | see Writing Asynchronous Tests, below
-assert(value, message) | throw a new Test262Error instance if the specified value is not strictly equal to the JavaScript `true` value; accepts an optional string message for use in creating the error
-assert.sameValue(actual, expected, message) | throw a new Test262Error instance if the first two arguments are not [the same value](https://tc39.github.io/ecma262/#sec-samevalue); accepts an optional string message for use in creating the error
-assert.notSameValue(actual, unexpected, message) | throw a new Test262Error instance if the first two arguments are [the same value](https://tc39.github.io/ecma262/#sec-samevalue); accepts an optional string message for use in creating the error
-assert.throws(expectedErrorConstructor, fn, message) | throw a new Test262Error instance if the provided function does not throw an error, or if the constructor of the value thrown does not match the provided constructor
-$ERROR(message) | construct a Test262Error object and throw it <br>**DEPRECATED** -- Do not use in new tests. Use `assert`, `assert.*`, or `throw new Test262Error` instead.
+`Test262Error(message)` | constructor for an error object that indicates a test failure
+`$DONE(arg)` | see [Writing Asynchronous Tests](#writing-asynchronous-tests), below
+`assert(value, message)` | throw a new Test262Error instance if the specified value is not strictly equal to the JavaScript `true` value; accepts an optional string message for use in creating the error
+`assert.sameValue(actual, expected, message)` | throw a new Test262Error instance if the first two arguments are not [the same value](https://tc39.github.io/ecma262/#sec-samevalue); accepts an optional string message for use in creating the error
+`assert.notSameValue(actual, unexpected, message)` | throw a new Test262Error instance if the first two arguments are [the same value](https://tc39.github.io/ecma262/#sec-samevalue); accepts an optional string message for use in creating the error
+`assert.throws(expectedErrorConstructor, fn, message)` | throw a new Test262Error instance if the provided function does not throw an error, or if the constructor of the value thrown does not match the provided constructor
+`$DONOTEVALUATE()` | throw an exception if the code gets evaluated. This is useful for [negative test cases for parsing errors](#handling-errors-and-negative-test-cases)
+`$ERROR(message)` | construct a Test262Error object and throw it <br>**DEPRECATED** -- Do not use in new tests. Use `assert`, `assert.*`, or `throw new Test262Error` instead.
 
-```
+```javascript
 /// error class
 function Test262Error(message) {
-//[omitted body]
+  // [omitted body]
 }
 ```
 
@@ -217,7 +218,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var var = var;
 ```
diff --git a/INTERPRETING.md b/INTERPRETING.md
index e2f4490ca2..d7c05e174f 100644
--- a/INTERPRETING.md
+++ b/INTERPRETING.md
@@ -203,7 +203,7 @@ negative:
   phase: parse
   type: ReferenceError
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 'litera'=1;
 ```
 
@@ -213,7 +213,7 @@ negative:
   phase: parse
   type: SyntaxError
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var a\u2E2F;
 ```
 
@@ -225,7 +225,7 @@ negative:
   type: ReferenceError
 flags: [module]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 export {} from './instn-resolve-empty-export_FIXTURE.js';
 // instn-resolve-empty-export_FIXTURE.js contains only:
 // 0++;
diff --git a/harness/sta.js b/harness/sta.js
index f22252a7fc..9083b38f36 100644
--- a/harness/sta.js
+++ b/harness/sta.js
@@ -22,6 +22,6 @@ $ERROR = function $ERROR(message) {
   throw new Test262Error(message);
 };
 
-function failIfCodeGetsEvaluated() {
+function $DONOTEVALUATE() {
   throw "Test262: This statement should not be evaluated.";
 }
diff --git a/src/async-functions/await-as-binding-identifier-escaped.case b/src/async-functions/await-as-binding-identifier-escaped.case
index e56c536052..c9b4ac51f8 100644
--- a/src/async-functions/await-as-binding-identifier-escaped.case
+++ b/src/async-functions/await-as-binding-identifier-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   var \u0061wait;
diff --git a/src/async-functions/await-as-binding-identifier.case b/src/async-functions/await-as-binding-identifier.case
index 0b28f79480..7796d208c5 100644
--- a/src/async-functions/await-as-binding-identifier.case
+++ b/src/async-functions/await-as-binding-identifier.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   var await;
diff --git a/src/async-functions/await-as-identifier-reference-escaped.case b/src/async-functions/await-as-identifier-reference-escaped.case
index aa0cff0f86..eadf0806a6 100644
--- a/src/async-functions/await-as-identifier-reference-escaped.case
+++ b/src/async-functions/await-as-identifier-reference-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   void \u0061wait;
diff --git a/src/async-functions/await-as-identifier-reference.case b/src/async-functions/await-as-identifier-reference.case
index 3c8abdaae3..145288fa54 100644
--- a/src/async-functions/await-as-identifier-reference.case
+++ b/src/async-functions/await-as-identifier-reference.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   void await;
diff --git a/src/async-functions/await-as-label-identifier-escaped.case b/src/async-functions/await-as-label-identifier-escaped.case
index b5e20d06dd..0fc9a928bb 100644
--- a/src/async-functions/await-as-label-identifier-escaped.case
+++ b/src/async-functions/await-as-label-identifier-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   \u0061wait: ;
diff --git a/src/async-functions/await-as-label-identifier.case b/src/async-functions/await-as-label-identifier.case
index d2de284322..8c5d657dae 100644
--- a/src/async-functions/await-as-label-identifier.case
+++ b/src/async-functions/await-as-label-identifier.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   await: ;
diff --git a/src/async-generators/await-as-binding-identifier-escaped.case b/src/async-generators/await-as-binding-identifier-escaped.case
index e56c536052..c9b4ac51f8 100644
--- a/src/async-generators/await-as-binding-identifier-escaped.case
+++ b/src/async-generators/await-as-binding-identifier-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   var \u0061wait;
diff --git a/src/async-generators/await-as-binding-identifier.case b/src/async-generators/await-as-binding-identifier.case
index 0b28f79480..7796d208c5 100644
--- a/src/async-generators/await-as-binding-identifier.case
+++ b/src/async-generators/await-as-binding-identifier.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   var await;
diff --git a/src/async-generators/await-as-identifier-reference-escaped.case b/src/async-generators/await-as-identifier-reference-escaped.case
index aa0cff0f86..eadf0806a6 100644
--- a/src/async-generators/await-as-identifier-reference-escaped.case
+++ b/src/async-generators/await-as-identifier-reference-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   void \u0061wait;
diff --git a/src/async-generators/await-as-identifier-reference.case b/src/async-generators/await-as-identifier-reference.case
index 3c8abdaae3..145288fa54 100644
--- a/src/async-generators/await-as-identifier-reference.case
+++ b/src/async-generators/await-as-identifier-reference.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   void await;
diff --git a/src/async-generators/await-as-label-identifier-escaped.case b/src/async-generators/await-as-label-identifier-escaped.case
index b5e20d06dd..0fc9a928bb 100644
--- a/src/async-generators/await-as-label-identifier-escaped.case
+++ b/src/async-generators/await-as-label-identifier-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   \u0061wait: ;
diff --git a/src/async-generators/await-as-label-identifier.case b/src/async-generators/await-as-label-identifier.case
index d2de284322..8c5d657dae 100644
--- a/src/async-generators/await-as-label-identifier.case
+++ b/src/async-generators/await-as-label-identifier.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   await: ;
diff --git a/src/async-generators/yield-as-binding-identifier-escaped.case b/src/async-generators/yield-as-binding-identifier-escaped.case
index fcf8d75837..1289313e4e 100644
--- a/src/async-generators/yield-as-binding-identifier-escaped.case
+++ b/src/async-generators/yield-as-binding-identifier-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   var yi\u0065ld;
diff --git a/src/async-generators/yield-as-binding-identifier.case b/src/async-generators/yield-as-binding-identifier.case
index 01d695f451..57a48c7010 100644
--- a/src/async-generators/yield-as-binding-identifier.case
+++ b/src/async-generators/yield-as-binding-identifier.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   var yield;
diff --git a/src/async-generators/yield-as-identifier-reference-escaped.case b/src/async-generators/yield-as-identifier-reference-escaped.case
index 8149cc3ffc..e4b369880e 100644
--- a/src/async-generators/yield-as-identifier-reference-escaped.case
+++ b/src/async-generators/yield-as-identifier-reference-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   void yi\u0065ld;
diff --git a/src/async-generators/yield-as-identifier-reference.case b/src/async-generators/yield-as-identifier-reference.case
index dbcf9a8132..5f762172d4 100644
--- a/src/async-generators/yield-as-identifier-reference.case
+++ b/src/async-generators/yield-as-identifier-reference.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   void yield;
diff --git a/src/async-generators/yield-as-label-identifier-escaped.case b/src/async-generators/yield-as-label-identifier-escaped.case
index cff7ca24b4..3a1ec972e7 100644
--- a/src/async-generators/yield-as-label-identifier-escaped.case
+++ b/src/async-generators/yield-as-label-identifier-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   yi\u0065ld: ;
diff --git a/src/async-generators/yield-as-label-identifier.case b/src/async-generators/yield-as-label-identifier.case
index d26bbfa674..5430aa547e 100644
--- a/src/async-generators/yield-as-label-identifier.case
+++ b/src/async-generators/yield-as-label-identifier.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   yield: ;
diff --git a/src/async-generators/yield-identifier-spread-strict.case b/src/async-generators/yield-identifier-spread-strict.case
index 9a5c2f8efb..14e792da15 100644
--- a/src/async-generators/yield-identifier-spread-strict.case
+++ b/src/async-generators/yield-identifier-spread-strict.case
@@ -20,7 +20,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   return {
      ...(function() {
diff --git a/src/async-generators/yield-identifier-strict.case b/src/async-generators/yield-identifier-strict.case
index c0c7b2a8b9..9e3cf5dd1c 100644
--- a/src/async-generators/yield-identifier-strict.case
+++ b/src/async-generators/yield-identifier-strict.case
@@ -13,7 +13,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   (function() {
     var yield;
diff --git a/src/class-elements/delete-error/cls-decl-field-delete-covered.template b/src/class-elements/delete-error/cls-decl-field-delete-covered.template
index aa575ce9b9..726532e0a2 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete-covered.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete-covered.template
@@ -29,7 +29,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template b/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
index 638eaba99a..d51398d67e 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
@@ -29,7 +29,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/src/class-elements/delete-error/cls-decl-field-delete.template b/src/class-elements/delete-error/cls-decl-field-delete.template
index 11c9b2ad74..6658271a76 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete.template
@@ -23,7 +23,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/src/class-elements/delete-error/cls-decl-method-delete-covered.template b/src/class-elements/delete-error/cls-decl-method-delete-covered.template
index 8b1edc8a1e..cff9fb78b1 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete-covered.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete-covered.template
@@ -29,7 +29,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template b/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
index 1915e53411..05167a244d 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
@@ -29,7 +29,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/src/class-elements/delete-error/cls-decl-method-delete.template b/src/class-elements/delete-error/cls-decl-method-delete.template
index d28d3d8275..8ee970beb5 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete.template
@@ -23,7 +23,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/src/class-elements/delete-error/cls-expr-field-delete-covered.template b/src/class-elements/delete-error/cls-expr-field-delete-covered.template
index 4982f62899..2f1ec316d6 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete-covered.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete-covered.template
@@ -29,7 +29,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template b/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
index 1d0123ed2b..8f44539294 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
@@ -29,7 +29,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/src/class-elements/delete-error/cls-expr-field-delete.template b/src/class-elements/delete-error/cls-expr-field-delete.template
index 645023c33d..f88ee89485 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete.template
@@ -23,7 +23,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/src/class-elements/delete-error/cls-expr-method-delete-covered.template b/src/class-elements/delete-error/cls-expr-method-delete-covered.template
index a05e938569..acd884bb85 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete-covered.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete-covered.template
@@ -29,7 +29,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template b/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
index f714bb5547..aa78e14173 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
@@ -29,7 +29,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/src/class-elements/delete-error/cls-expr-method-delete.template b/src/class-elements/delete-error/cls-expr-method-delete.template
index 6427c83465..cf2383a907 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete.template
@@ -23,7 +23,7 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template b/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
index e72d3825ac..4abf8231d3 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
@@ -8,7 +8,7 @@ name: arrow function expression
 features: [arrow-function, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = () => /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-comp-name.template b/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
index 14393dccf3..2ef35e5129 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
@@ -8,7 +8,7 @@ name: computed ClassElementName
 features: [class, class-fields-public, computed-property-names]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 class C {
diff --git a/src/class-elements/initializer-error/cls-decl-fields-equality.template b/src/class-elements/initializer-error/cls-decl-fields-equality.template
index d8a8fcbfe5..e413441c08 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-equality.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-equality.template
@@ -8,7 +8,7 @@ name: equality expression
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = {} == /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
index 6ca0c2080c..bbc65e9be6 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
@@ -8,7 +8,7 @@ name: literal ClassElementName
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template b/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
index d10e15daf1..70ffe83f0a 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
@@ -8,7 +8,7 @@ name: private field, arrow function expression
 features: [class, arrow-function, class-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = () => /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-name.template b/src/class-elements/initializer-error/cls-decl-fields-private-name.template
index 84150493f9..67e610ed1d 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-name.template
@@ -8,7 +8,7 @@ name: ClassElementName PrivateName
 features: [class, class-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template b/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
index 9d6e14e881..407f31bd6a 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
@@ -8,7 +8,7 @@ name: private field, ternary expression
 features: [class, class-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = false ? {} : /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template b/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
index 016cbb326f..6d73c1b5de 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
@@ -8,7 +8,7 @@ name: private field, typeof expression
 features: [class, class-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = typeof /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
index 1c855d6e16..64eac9a1e5 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
@@ -8,7 +8,7 @@ name: static computed ClassElementName
 features: [class, class-static-fields-public, computed-property-names]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 class C {
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
index 9519c02284..4956af30b6 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
@@ -8,7 +8,7 @@ name: static literal ClassElementName
 features: [class, class-static-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static x = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
index b2452b7118..29c3a4880f 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
@@ -8,7 +8,7 @@ name: static PrivateName
 features: [class, class-static-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static #x = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
index 6a2aec3b44..24a57a8b01 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
@@ -8,7 +8,7 @@ name: static string literal ClassElementName
 features: [class, class-static-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static 'x' = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
index bc095f0e04..c0bfb00790 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
@@ -8,7 +8,7 @@ name: string literal ClassElementName
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   'x' = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-ternary.template b/src/class-elements/initializer-error/cls-decl-fields-ternary.template
index e0129b4683..4e4546a2a1 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-ternary.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-ternary.template
@@ -8,7 +8,7 @@ name: ternary expression
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = false ? {} : /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-decl-fields-typeof.template b/src/class-elements/initializer-error/cls-decl-fields-typeof.template
index b923201bb7..febab10679 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-typeof.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-typeof.template
@@ -8,7 +8,7 @@ name: typeof expression
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = typeof /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template b/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
index ed1e549e50..d36582f1c2 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
@@ -8,7 +8,7 @@ name: arrow function expression
 features: [arrow-function, class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = () => /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-comp-name.template b/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
index a323383e3e..700ba1f9eb 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
@@ -8,7 +8,7 @@ name: computed ClassElementName
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 var C = class {
diff --git a/src/class-elements/initializer-error/cls-expr-fields-equality.template b/src/class-elements/initializer-error/cls-expr-fields-equality.template
index 1d79ba8a73..d4398c6f07 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-equality.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-equality.template
@@ -8,7 +8,7 @@ name: equality expression
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = {} == /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
index 17cf3d30ed..2b29049fce 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
@@ -8,7 +8,7 @@ name: literal ClassElementName
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template b/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
index 4a73b67895..912ccb60db 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
@@ -8,7 +8,7 @@ name: private field, arrow function expression
 features: [class, arrow-function, class-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = () => /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-name.template b/src/class-elements/initializer-error/cls-expr-fields-private-name.template
index 04b6fe642f..4f5908535f 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-name.template
@@ -8,7 +8,7 @@ name: ClassElementName PrivateName
 features: [class, class-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template b/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
index 9560a0f44e..d56cc60c76 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
@@ -8,7 +8,7 @@ name: private field, ternary expression
 features: [class, class-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = true ? {} : /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template b/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
index 8b4b31c50f..2a07b59f1c 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
@@ -8,7 +8,7 @@ name: private field, typeof expression
 features: [class, class-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = typeof /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
index e6b9c06521..cd89f6f110 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
@@ -8,7 +8,7 @@ name: static computed ClassElementName
 features: [class, class-static-fields-public, computed-property-names]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 var C = class {
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
index 3e6ff36d2e..5288254768 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
@@ -8,7 +8,7 @@ name: static literal ClassElementName
 features: [class, class-static-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static x = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
index 48f4ca07f1..f78b4b5c4b 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
@@ -8,7 +8,7 @@ name: static PrivateName
 features: [class, class-static-fields-private]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static #x = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
index 61ea0cafae..7485f300aa 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
@@ -8,7 +8,7 @@ name: static string literal ClassElementName
 features: [class, class-static-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static 'x' = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
index eb3eaca642..db5d0949fc 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
@@ -8,7 +8,7 @@ name: string literal ClassElementName
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   'x' = /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-ternary.template b/src/class-elements/initializer-error/cls-expr-fields-ternary.template
index b560669ec9..d603a10478 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-ternary.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-ternary.template
@@ -8,7 +8,7 @@ name: ternary expression
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = true ? {} : /*{ initializer }*/;
diff --git a/src/class-elements/initializer-error/cls-expr-fields-typeof.template b/src/class-elements/initializer-error/cls-expr-fields-typeof.template
index c8c27f8dec..be306265aa 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-typeof.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-typeof.template
@@ -8,7 +8,7 @@ name: typeof expression
 features: [class, class-fields-public]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = typeof /*{ initializer }*/;
diff --git a/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template b/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
index 4da1a10c16..c95e4b9965 100644
--- a/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
+++ b/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C /*{ heritage }*/{
   /*{ elements }*/
diff --git a/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template b/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
index 02c09be7be..271a805bf8 100644
--- a/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
+++ b/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class /*{ heritage }*/{
   /*{ elements }*/
diff --git a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-function-declaration.template b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-function-declaration.template
index 6a2c146c46..01cce3cde6 100644
--- a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-function-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-function-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-generator-declaration.template b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-generator-declaration.template
index 22e80e1e50..04e0105407 100644
--- a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-generator-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-class-declaration.template b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-class-declaration.template
index 3e7f59bd92..7c1d501874 100644
--- a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-class-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-class-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-const-declaration.template b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-const-declaration.template
index 5bdbe6b4f6..3659cdf3b1 100644
--- a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-const-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-const-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-function-declaration.template b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-function-declaration.template
index 5e85656214..3b8f3214be 100644
--- a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-function-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-function-declaration.template
@@ -16,6 +16,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-generator-declaration.template b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-generator-declaration.template
index 380b2c257a..c7b3c4885b 100644
--- a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-generator-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-let-declaration.template b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-let-declaration.template
index 4592f59f2e..8df2d996f6 100644
--- a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-let-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-let-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-var-declaration.template b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-var-declaration.template
index b83c38c026..07cf27f2af 100644
--- a/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-var-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-var-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-function-declaration.template b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-function-declaration.template
index da1205c20b..8ed05813f9 100644
--- a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-function-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-function-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-generator-declaration.template b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-generator-declaration.template
index 0ac211e5b9..074bf5f1d8 100644
--- a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-generator-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-class-declaration.template b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-class-declaration.template
index 4158becdaa..fdeb2a1a96 100644
--- a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-class-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-class-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-const-declaration.template b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-const-declaration.template
index 358eff7a18..22b03ddba2 100644
--- a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-const-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-const-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-function-declaration.template b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-function-declaration.template
index 6a0021fefe..395850e5df 100644
--- a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-function-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-function-declaration.template
@@ -16,6 +16,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-generator-declaration.template b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-generator-declaration.template
index 11e0ac59e7..7773e9a96c 100644
--- a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-generator-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-let-declaration.template b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-let-declaration.template
index 46714cf686..7ea1b96cba 100644
--- a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-let-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-let-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-var-declaration.template b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-var-declaration.template
index c8f838690b..e6e51e2680 100644
--- a/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-var-declaration.template
+++ b/src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-var-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-function-declaration.template b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-function-declaration.template
index c80edf1d26..1757372e65 100644
--- a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-function-declaration.template
+++ b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-function-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-generator-declaration.template b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-generator-declaration.template
index 78e23157ad..b5482ae2c1 100644
--- a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-generator-declaration.template
+++ b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-class-declaration.template b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-class-declaration.template
index d9a4f8cab4..8a8c4d01de 100644
--- a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-class-declaration.template
+++ b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-class-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-const-declaration.template b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-const-declaration.template
index 2249e2de99..4a944c8790 100644
--- a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-const-declaration.template
+++ b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-const-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-function-declaration.template b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-function-declaration.template
index 23d4a8ad40..8c0246a334 100644
--- a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-function-declaration.template
+++ b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-function-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-generator-declaration.template b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-generator-declaration.template
index 53ca07a88d..dfef581c68 100644
--- a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-generator-declaration.template
+++ b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-let-declaration.template b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-let-declaration.template
index 8efb9a2386..205131971f 100644
--- a/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-let-declaration.template
+++ b/src/declarations/redeclare-allow-var/block-attempt-to-redeclare-let-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-function-declaration.template b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-function-declaration.template
index 2eb22e8206..65ca7b63a3 100644
--- a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-function-declaration.template
+++ b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-function-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-generator-declaration.template b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-generator-declaration.template
index 793bd3a33c..b6939c786e 100644
--- a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-generator-declaration.template
+++ b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-class-declaration.template b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-class-declaration.template
index 9c02ef7c82..201b4fa05c 100644
--- a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-class-declaration.template
+++ b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-class-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-const-declaration.template b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-const-declaration.template
index ba19a156d7..58f8dcf132 100644
--- a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-const-declaration.template
+++ b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-const-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-function-declaration.template b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-function-declaration.template
index 76e6257a29..763ffd0c3b 100644
--- a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-function-declaration.template
+++ b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-function-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-generator-declaration.template b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-generator-declaration.template
index 81a8435107..668ca22240 100644
--- a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-generator-declaration.template
+++ b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-let-declaration.template b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-let-declaration.template
index c9b5859b6a..ce161639e4 100644
--- a/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-let-declaration.template
+++ b/src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-let-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: /*{ body }*/ }
diff --git a/src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template b/src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
index 6a2c146c46..01cce3cde6 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template b/src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
index 22e80e1e50..04e0105407 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template b/src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
index 3e7f59bd92..7c1d501874 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} /*{ body }*/ }
diff --git a/src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template b/src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
index 5bdbe6b4f6..3659cdf3b1 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; /*{ body }*/ }
diff --git a/src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template b/src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
index ff6fd7c66f..53a2972ead 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template b/src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
index 380b2c257a..c7b3c4885b 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} /*{ body }*/ }
diff --git a/src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template b/src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
index 4592f59f2e..8df2d996f6 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; /*{ body }*/ }
diff --git a/src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template b/src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
index b83c38c026..07cf27f2af 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; /*{ body }*/ }
diff --git a/src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template b/src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
index da1205c20b..8ed05813f9 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template b/src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
index 0ac211e5b9..074bf5f1d8 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template b/src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
index 4158becdaa..fdeb2a1a96 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template b/src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
index 358eff7a18..22b03ddba2 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: /*{ body }*/ }
diff --git a/src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template b/src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
index 7ae3d5fea2..e5838579f9 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template b/src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
index 11e0ac59e7..7773e9a96c 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
@@ -16,6 +16,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: /*{ body }*/ }
diff --git a/src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template b/src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
index 46714cf686..7ea1b96cba 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: /*{ body }*/ }
diff --git a/src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template b/src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
index c8f838690b..e6e51e2680 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: /*{ body }*/ }
diff --git a/src/dstr-assignment-for-await/array-elem-init-yield-ident-invalid.case b/src/dstr-assignment-for-await/array-elem-init-yield-ident-invalid.case
index df0095325e..516af0645a 100644
--- a/src/dstr-assignment-for-await/array-elem-init-yield-ident-invalid.case
+++ b/src/dstr-assignment-for-await/array-elem-init-yield-ident-invalid.case
@@ -14,7 +14,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [ x = yield ]
 //- vals
diff --git a/src/dstr-assignment-for-await/array-elem-nested-array-invalid.case b/src/dstr-assignment-for-await/array-elem-nested-array-invalid.case
index 133180d672..f8541a2310 100644
--- a/src/dstr-assignment-for-await/array-elem-nested-array-invalid.case
+++ b/src/dstr-assignment-for-await/array-elem-nested-array-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [[(x, y)]]
 //- vals
diff --git a/src/dstr-assignment-for-await/array-elem-nested-array-yield-ident-invalid.case b/src/dstr-assignment-for-await/array-elem-nested-array-yield-ident-invalid.case
index e4db352fc7..f405e76339 100644
--- a/src/dstr-assignment-for-await/array-elem-nested-array-yield-ident-invalid.case
+++ b/src/dstr-assignment-for-await/array-elem-nested-array-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [[x[yield]]]
 //- vals
diff --git a/src/dstr-assignment-for-await/array-elem-nested-obj-invalid.case b/src/dstr-assignment-for-await/array-elem-nested-obj-invalid.case
index d5a649f4a8..45c50e979b 100644
--- a/src/dstr-assignment-for-await/array-elem-nested-obj-invalid.case
+++ b/src/dstr-assignment-for-await/array-elem-nested-obj-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [{ get x() {} }]
 //- vals
diff --git a/src/dstr-assignment-for-await/array-elem-nested-obj-yield-ident-invalid.case b/src/dstr-assignment-for-await/array-elem-nested-obj-yield-ident-invalid.case
index af037957ff..c679999066 100644
--- a/src/dstr-assignment-for-await/array-elem-nested-obj-yield-ident-invalid.case
+++ b/src/dstr-assignment-for-await/array-elem-nested-obj-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [{ x = yield }]
 //- vals
diff --git a/src/dstr-assignment-for-await/array-elem-target-simple-strict.case b/src/dstr-assignment-for-await/array-elem-target-simple-strict.case
index 3dd46fe8c5..681d24103f 100644
--- a/src/dstr-assignment-for-await/array-elem-target-simple-strict.case
+++ b/src/dstr-assignment-for-await/array-elem-target-simple-strict.case
@@ -16,7 +16,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [arguments]
 //- vals
diff --git a/src/dstr-assignment-for-await/array-elem-target-yield-invalid.case b/src/dstr-assignment-for-await/array-elem-target-yield-invalid.case
index a463fd58c3..b1a05214ce 100644
--- a/src/dstr-assignment-for-await/array-elem-target-yield-invalid.case
+++ b/src/dstr-assignment-for-await/array-elem-target-yield-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [ x[yield] ]
 //- vals
diff --git a/src/dstr-assignment/array-elem-init-yield-ident-invalid.case b/src/dstr-assignment/array-elem-init-yield-ident-invalid.case
index 2fd87d5259..73b2c055e2 100644
--- a/src/dstr-assignment/array-elem-init-yield-ident-invalid.case
+++ b/src/dstr-assignment/array-elem-init-yield-ident-invalid.case
@@ -14,7 +14,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [ x = yield ]
 //- vals
diff --git a/src/dstr-assignment/array-elem-nested-array-invalid.case b/src/dstr-assignment/array-elem-nested-array-invalid.case
index 9e3edb5dd7..7d7018ad33 100644
--- a/src/dstr-assignment/array-elem-nested-array-invalid.case
+++ b/src/dstr-assignment/array-elem-nested-array-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [[(x, y)]]
 //- vals
diff --git a/src/dstr-assignment/array-elem-nested-array-yield-ident-invalid.case b/src/dstr-assignment/array-elem-nested-array-yield-ident-invalid.case
index 94d5f1afc3..68c8c8afab 100644
--- a/src/dstr-assignment/array-elem-nested-array-yield-ident-invalid.case
+++ b/src/dstr-assignment/array-elem-nested-array-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [[x[yield]]]
 //- vals
diff --git a/src/dstr-assignment/array-elem-nested-obj-invalid.case b/src/dstr-assignment/array-elem-nested-obj-invalid.case
index d4660aed18..d9cfc3e5d6 100644
--- a/src/dstr-assignment/array-elem-nested-obj-invalid.case
+++ b/src/dstr-assignment/array-elem-nested-obj-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [{ get x() {} }]
 //- vals
diff --git a/src/dstr-assignment/array-elem-nested-obj-yield-ident-invalid.case b/src/dstr-assignment/array-elem-nested-obj-yield-ident-invalid.case
index 9c2a6c2cdf..2983817ddb 100644
--- a/src/dstr-assignment/array-elem-nested-obj-yield-ident-invalid.case
+++ b/src/dstr-assignment/array-elem-nested-obj-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [{ x = yield }]
 //- vals
diff --git a/src/dstr-assignment/array-elem-target-simple-strict.case b/src/dstr-assignment/array-elem-target-simple-strict.case
index 0b5f0cfc66..8dff8225cc 100644
--- a/src/dstr-assignment/array-elem-target-simple-strict.case
+++ b/src/dstr-assignment/array-elem-target-simple-strict.case
@@ -16,7 +16,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [arguments]
 //- vals
diff --git a/src/dstr-assignment/array-elem-target-yield-invalid.case b/src/dstr-assignment/array-elem-target-yield-invalid.case
index 8f2685faf7..a9d2887e63 100644
--- a/src/dstr-assignment/array-elem-target-yield-invalid.case
+++ b/src/dstr-assignment/array-elem-target-yield-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [ x[yield] ]
 //- vals
diff --git a/src/dstr-assignment/array-rest-before-element.case b/src/dstr-assignment/array-rest-before-element.case
index 09bbfbc85a..215265251d 100644
--- a/src/dstr-assignment/array-rest-before-element.case
+++ b/src/dstr-assignment/array-rest-before-element.case
@@ -13,7 +13,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...x, y]
 //- vals
diff --git a/src/dstr-assignment/array-rest-before-elision.case b/src/dstr-assignment/array-rest-before-elision.case
index 45ed5b4156..6e5a31f54f 100644
--- a/src/dstr-assignment/array-rest-before-elision.case
+++ b/src/dstr-assignment/array-rest-before-elision.case
@@ -13,7 +13,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...x,]
 //- vals
diff --git a/src/dstr-assignment/array-rest-before-rest.case b/src/dstr-assignment/array-rest-before-rest.case
index 1a8eaab19d..a6c0903f65 100644
--- a/src/dstr-assignment/array-rest-before-rest.case
+++ b/src/dstr-assignment/array-rest-before-rest.case
@@ -13,7 +13,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...x, ...y]
 //- vals
diff --git a/src/dstr-assignment/array-rest-elision-invalid.case b/src/dstr-assignment/array-rest-elision-invalid.case
index e28de4dd0c..6044036315 100644
--- a/src/dstr-assignment/array-rest-elision-invalid.case
+++ b/src/dstr-assignment/array-rest-elision-invalid.case
@@ -13,7 +13,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...x,]
 //- vals
diff --git a/src/dstr-assignment/array-rest-init.case b/src/dstr-assignment/array-rest-init.case
index 842db64e7c..d856120f4a 100644
--- a/src/dstr-assignment/array-rest-init.case
+++ b/src/dstr-assignment/array-rest-init.case
@@ -12,7 +12,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var x;
 //- elems
 [...x = 1]
diff --git a/src/dstr-assignment/array-rest-nested-array-invalid.case b/src/dstr-assignment/array-rest-nested-array-invalid.case
index 83a59572ff..ba8c8fa797 100644
--- a/src/dstr-assignment/array-rest-nested-array-invalid.case
+++ b/src/dstr-assignment/array-rest-nested-array-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...[(x, y)]]
 //- vals
diff --git a/src/dstr-assignment/array-rest-nested-array-yield-ident-invalid.case b/src/dstr-assignment/array-rest-nested-array-yield-ident-invalid.case
index 54b1e659fc..2033e79aef 100644
--- a/src/dstr-assignment/array-rest-nested-array-yield-ident-invalid.case
+++ b/src/dstr-assignment/array-rest-nested-array-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...[x[yield]]]
 //- vals
diff --git a/src/dstr-assignment/array-rest-nested-obj-invalid.case b/src/dstr-assignment/array-rest-nested-obj-invalid.case
index c2f69f6c49..f8a993aa23 100644
--- a/src/dstr-assignment/array-rest-nested-obj-invalid.case
+++ b/src/dstr-assignment/array-rest-nested-obj-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...{ get x() {} }]
 //- vals
diff --git a/src/dstr-assignment/array-rest-nested-obj-yield-ident-invalid.case b/src/dstr-assignment/array-rest-nested-obj-yield-ident-invalid.case
index 852979e495..335f1f4159 100644
--- a/src/dstr-assignment/array-rest-nested-obj-yield-ident-invalid.case
+++ b/src/dstr-assignment/array-rest-nested-obj-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...{ x = yield }]
 //- vals
diff --git a/src/dstr-assignment/array-rest-yield-ident-invalid.case b/src/dstr-assignment/array-rest-yield-ident-invalid.case
index 3718f6587c..0b127e96c9 100644
--- a/src/dstr-assignment/array-rest-yield-ident-invalid.case
+++ b/src/dstr-assignment/array-rest-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var x = {};
 //- elems
 [...x[yield]]
diff --git a/src/dstr-assignment/obj-id-identifier-yield-expr.case b/src/dstr-assignment/obj-id-identifier-yield-expr.case
index a74eb01040..dd44b5cce8 100644
--- a/src/dstr-assignment/obj-id-identifier-yield-expr.case
+++ b/src/dstr-assignment/obj-id-identifier-yield-expr.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 (function*() {
 //- elems
 { yield }
diff --git a/src/dstr-assignment/obj-id-identifier-yield-ident-invalid.case b/src/dstr-assignment/obj-id-identifier-yield-ident-invalid.case
index 71d7f5c7e9..7e41d7f912 100644
--- a/src/dstr-assignment/obj-id-identifier-yield-ident-invalid.case
+++ b/src/dstr-assignment/obj-id-identifier-yield-ident-invalid.case
@@ -14,7 +14,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { yield }
 //- vals
diff --git a/src/dstr-assignment/obj-id-init-simple-strict.case b/src/dstr-assignment/obj-id-init-simple-strict.case
index dd7240f464..a69972859e 100644
--- a/src/dstr-assignment/obj-id-init-simple-strict.case
+++ b/src/dstr-assignment/obj-id-init-simple-strict.case
@@ -14,7 +14,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { eval = 0 }
 //- vals
diff --git a/src/dstr-assignment/obj-id-init-yield-ident-invalid.case b/src/dstr-assignment/obj-id-init-yield-ident-invalid.case
index 2331c0cff9..dd1dbe1521 100644
--- a/src/dstr-assignment/obj-id-init-yield-ident-invalid.case
+++ b/src/dstr-assignment/obj-id-init-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { x = yield }
 //- vals
diff --git a/src/dstr-assignment/obj-id-simple-strict.case b/src/dstr-assignment/obj-id-simple-strict.case
index 632680655a..420a9e47c6 100644
--- a/src/dstr-assignment/obj-id-simple-strict.case
+++ b/src/dstr-assignment/obj-id-simple-strict.case
@@ -14,7 +14,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { eval }
 //- vals
diff --git a/src/dstr-assignment/obj-prop-elem-init-yield-ident-invalid.case b/src/dstr-assignment/obj-prop-elem-init-yield-ident-invalid.case
index 3a0d1e24c5..c1b8368318 100644
--- a/src/dstr-assignment/obj-prop-elem-init-yield-ident-invalid.case
+++ b/src/dstr-assignment/obj-prop-elem-init-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { x: x = yield }
 //- vals
diff --git a/src/dstr-assignment/obj-prop-elem-target-yield-ident-invalid.case b/src/dstr-assignment/obj-prop-elem-target-yield-ident-invalid.case
index 4e713ff630..c986923d0f 100644
--- a/src/dstr-assignment/obj-prop-elem-target-yield-ident-invalid.case
+++ b/src/dstr-assignment/obj-prop-elem-target-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { x: x[yield] }
 //- vals
diff --git a/src/dstr-assignment/obj-prop-nested-array-invalid.case b/src/dstr-assignment/obj-prop-nested-array-invalid.case
index 08af4d1085..5daf28dcd9 100644
--- a/src/dstr-assignment/obj-prop-nested-array-invalid.case
+++ b/src/dstr-assignment/obj-prop-nested-array-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { x: [(x, y)] }
 //- vals
diff --git a/src/dstr-assignment/obj-prop-nested-array-yield-ident-invalid.case b/src/dstr-assignment/obj-prop-nested-array-yield-ident-invalid.case
index 476d9f57fd..eb62670da0 100644
--- a/src/dstr-assignment/obj-prop-nested-array-yield-ident-invalid.case
+++ b/src/dstr-assignment/obj-prop-nested-array-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { x: [x = yield] }
 //- vals
diff --git a/src/dstr-assignment/obj-prop-nested-obj-invalid.case b/src/dstr-assignment/obj-prop-nested-obj-invalid.case
index 520026bb3a..c300330d90 100644
--- a/src/dstr-assignment/obj-prop-nested-obj-invalid.case
+++ b/src/dstr-assignment/obj-prop-nested-obj-invalid.case
@@ -16,7 +16,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { x: { get x() {} } }
 //- vals
diff --git a/src/dstr-assignment/obj-prop-nested-obj-yield-ident-invalid.case b/src/dstr-assignment/obj-prop-nested-obj-yield-ident-invalid.case
index 8205793334..51948213d3 100644
--- a/src/dstr-assignment/obj-prop-nested-obj-yield-ident-invalid.case
+++ b/src/dstr-assignment/obj-prop-nested-obj-yield-ident-invalid.case
@@ -15,7 +15,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 { x: { x = yield } }
 //- vals
diff --git a/src/dstr-assignment/obj-rest-not-last-element-invalid.case b/src/dstr-assignment/obj-rest-not-last-element-invalid.case
index 7e5680ca49..0d7c883a16 100644
--- a/src/dstr-assignment/obj-rest-not-last-element-invalid.case
+++ b/src/dstr-assignment/obj-rest-not-last-element-invalid.case
@@ -14,7 +14,7 @@ features: [object-rest]
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var rest, b;
 //- elems
 {...rest, b}
diff --git a/src/dstr-binding-for-await/ary-ptrn-rest-init-ary.case b/src/dstr-binding-for-await/ary-ptrn-rest-init-ary.case
index f30dcf5b8f..2d188d91b9 100644
--- a/src/dstr-binding-for-await/ary-ptrn-rest-init-ary.case
+++ b/src/dstr-binding-for-await/ary-ptrn-rest-init-ary.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...[ x ] = []]
 //- vals
diff --git a/src/dstr-binding-for-await/ary-ptrn-rest-init-id.case b/src/dstr-binding-for-await/ary-ptrn-rest-init-id.case
index f0d9cd72f0..1e70ade0a8 100644
--- a/src/dstr-binding-for-await/ary-ptrn-rest-init-id.case
+++ b/src/dstr-binding-for-await/ary-ptrn-rest-init-id.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...x = []]
 //- vals
diff --git a/src/dstr-binding-for-await/ary-ptrn-rest-init-obj.case b/src/dstr-binding-for-await/ary-ptrn-rest-init-obj.case
index 5c0a899081..bb849eafe7 100644
--- a/src/dstr-binding-for-await/ary-ptrn-rest-init-obj.case
+++ b/src/dstr-binding-for-await/ary-ptrn-rest-init-obj.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...{ x } = []]
 //- vals
diff --git a/src/dstr-binding-for-await/ary-ptrn-rest-not-final-ary.case b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-ary.case
index 823d62fe21..467f4dc1da 100644
--- a/src/dstr-binding-for-await/ary-ptrn-rest-not-final-ary.case
+++ b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-ary.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...[x], y]
 //- vals
diff --git a/src/dstr-binding-for-await/ary-ptrn-rest-not-final-id.case b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-id.case
index d78033df69..c5d5429844 100644
--- a/src/dstr-binding-for-await/ary-ptrn-rest-not-final-id.case
+++ b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-id.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...x, y]
 //- vals
diff --git a/src/dstr-binding-for-await/ary-ptrn-rest-not-final-obj.case b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-obj.case
index 27d00ab548..7a7ac6c3df 100644
--- a/src/dstr-binding-for-await/ary-ptrn-rest-not-final-obj.case
+++ b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-obj.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...{ x }, y]
 //- vals
diff --git a/src/dstr-binding/ary-ptrn-rest-init-ary.case b/src/dstr-binding/ary-ptrn-rest-init-ary.case
index 6d2d29b645..9a57a0b34d 100644
--- a/src/dstr-binding/ary-ptrn-rest-init-ary.case
+++ b/src/dstr-binding/ary-ptrn-rest-init-ary.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...[ x ] = []]
 //- vals
diff --git a/src/dstr-binding/ary-ptrn-rest-init-id.case b/src/dstr-binding/ary-ptrn-rest-init-id.case
index 32378b12f8..5a8c720bcf 100644
--- a/src/dstr-binding/ary-ptrn-rest-init-id.case
+++ b/src/dstr-binding/ary-ptrn-rest-init-id.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...x = []]
 //- vals
diff --git a/src/dstr-binding/ary-ptrn-rest-init-obj.case b/src/dstr-binding/ary-ptrn-rest-init-obj.case
index 6084491fbf..39ba328781 100644
--- a/src/dstr-binding/ary-ptrn-rest-init-obj.case
+++ b/src/dstr-binding/ary-ptrn-rest-init-obj.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...{ x } = []]
 //- vals
diff --git a/src/dstr-binding/ary-ptrn-rest-not-final-ary.case b/src/dstr-binding/ary-ptrn-rest-not-final-ary.case
index 1e39d26161..bb42bc8f5d 100644
--- a/src/dstr-binding/ary-ptrn-rest-not-final-ary.case
+++ b/src/dstr-binding/ary-ptrn-rest-not-final-ary.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...[x], y]
 //- vals
diff --git a/src/dstr-binding/ary-ptrn-rest-not-final-id.case b/src/dstr-binding/ary-ptrn-rest-not-final-id.case
index c673d54eef..84ce445dd2 100644
--- a/src/dstr-binding/ary-ptrn-rest-not-final-id.case
+++ b/src/dstr-binding/ary-ptrn-rest-not-final-id.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...x, y]
 //- vals
diff --git a/src/dstr-binding/ary-ptrn-rest-not-final-obj.case b/src/dstr-binding/ary-ptrn-rest-not-final-obj.case
index 47d6896fca..236044376c 100644
--- a/src/dstr-binding/ary-ptrn-rest-not-final-obj.case
+++ b/src/dstr-binding/ary-ptrn-rest-not-final-obj.case
@@ -16,7 +16,7 @@ info: >
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- elems
 [...{ x }, y]
 //- vals
diff --git a/src/function-forms/dflt-params-duplicates.case b/src/function-forms/dflt-params-duplicates.case
index 71ffcaec88..49d05efa88 100644
--- a/src/function-forms/dflt-params-duplicates.case
+++ b/src/function-forms/dflt-params-duplicates.case
@@ -25,6 +25,6 @@ features: [default-parameters]
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- params
 x = 0, x
diff --git a/src/function-forms/dflt-params-rest.case b/src/function-forms/dflt-params-rest.case
index dafd954f1c..d9bdc7b156 100644
--- a/src/function-forms/dflt-params-rest.case
+++ b/src/function-forms/dflt-params-rest.case
@@ -27,6 +27,6 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- params
 ...x = []
diff --git a/src/function-forms/rest-params-trailing-comma-early-error.case b/src/function-forms/rest-params-trailing-comma-early-error.case
index b82cca84d7..a883a8e7b0 100644
--- a/src/function-forms/rest-params-trailing-comma-early-error.case
+++ b/src/function-forms/rest-params-trailing-comma-early-error.case
@@ -21,6 +21,6 @@ info: |
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- params
 ...a,
diff --git a/src/generators/yield-as-binding-identifier-escaped.case b/src/generators/yield-as-binding-identifier-escaped.case
index fcf8d75837..1289313e4e 100644
--- a/src/generators/yield-as-binding-identifier-escaped.case
+++ b/src/generators/yield-as-binding-identifier-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   var yi\u0065ld;
diff --git a/src/generators/yield-as-binding-identifier.case b/src/generators/yield-as-binding-identifier.case
index 01d695f451..57a48c7010 100644
--- a/src/generators/yield-as-binding-identifier.case
+++ b/src/generators/yield-as-binding-identifier.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   var yield;
diff --git a/src/generators/yield-as-identifier-reference-escaped.case b/src/generators/yield-as-identifier-reference-escaped.case
index 8149cc3ffc..e4b369880e 100644
--- a/src/generators/yield-as-identifier-reference-escaped.case
+++ b/src/generators/yield-as-identifier-reference-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   void yi\u0065ld;
diff --git a/src/generators/yield-as-identifier-reference.case b/src/generators/yield-as-identifier-reference.case
index dbcf9a8132..5f762172d4 100644
--- a/src/generators/yield-as-identifier-reference.case
+++ b/src/generators/yield-as-identifier-reference.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   void yield;
diff --git a/src/generators/yield-as-label-identifier-escaped.case b/src/generators/yield-as-label-identifier-escaped.case
index cff7ca24b4..3a1ec972e7 100644
--- a/src/generators/yield-as-label-identifier-escaped.case
+++ b/src/generators/yield-as-label-identifier-escaped.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   yi\u0065ld: ;
diff --git a/src/generators/yield-as-label-identifier.case b/src/generators/yield-as-label-identifier.case
index d26bbfa674..5430aa547e 100644
--- a/src/generators/yield-as-label-identifier.case
+++ b/src/generators/yield-as-label-identifier.case
@@ -18,6 +18,6 @@ template: syntax
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   yield: ;
diff --git a/src/generators/yield-identifier-spread-strict.case b/src/generators/yield-identifier-spread-strict.case
index 9a5c2f8efb..14e792da15 100644
--- a/src/generators/yield-identifier-spread-strict.case
+++ b/src/generators/yield-identifier-spread-strict.case
@@ -20,7 +20,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   return {
      ...(function() {
diff --git a/src/generators/yield-identifier-strict.case b/src/generators/yield-identifier-strict.case
index c0c7b2a8b9..9e3cf5dd1c 100644
--- a/src/generators/yield-identifier-strict.case
+++ b/src/generators/yield-identifier-strict.case
@@ -13,7 +13,7 @@ negative:
 ---*/
 
 //- setup
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 //- body
   (function() {
     var yield;
diff --git a/test/annexB/language/expressions/object/__proto__-duplicate.js b/test/annexB/language/expressions/object/__proto__-duplicate.js
index cdde9b8181..4a169471ce 100644
--- a/test/annexB/language/expressions/object/__proto__-duplicate.js
+++ b/test/annexB/language/expressions/object/__proto__-duplicate.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
   __proto__: null,
diff --git a/test/annexB/language/expressions/template-literal/legacy-octal-escape-sequence-strict.js b/test/annexB/language/expressions/template-literal/legacy-octal-escape-sequence-strict.js
index 833575bc68..30aa313347 100644
--- a/test/annexB/language/expressions/template-literal/legacy-octal-escape-sequence-strict.js
+++ b/test/annexB/language/expressions/template-literal/legacy-octal-escape-sequence-strict.js
@@ -13,6 +13,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `${'\07'}`;
diff --git a/test/annexB/language/statements/for-in/bare-initializer.js b/test/annexB/language/statements/for-in/bare-initializer.js
index 01e228d388..9ff65b270a 100644
--- a/test/annexB/language/statements/for-in/bare-initializer.js
+++ b/test/annexB/language/statements/for-in/bare-initializer.js
@@ -9,7 +9,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var a;
 throw NotEarlyError;
 for (a = 0 in {});
diff --git a/test/annexB/language/statements/for-in/const-initializer.js b/test/annexB/language/statements/for-in/const-initializer.js
index d2e2d1a224..c73605beea 100644
--- a/test/annexB/language/statements/for-in/const-initializer.js
+++ b/test/annexB/language/statements/for-in/const-initializer.js
@@ -9,7 +9,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 throw NotEarlyError;
 for (const a = 0 in {});
 
diff --git a/test/annexB/language/statements/for-in/let-initializer.js b/test/annexB/language/statements/for-in/let-initializer.js
index adf8868eff..06415a7f99 100644
--- a/test/annexB/language/statements/for-in/let-initializer.js
+++ b/test/annexB/language/statements/for-in/let-initializer.js
@@ -9,7 +9,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 throw NotEarlyError;
 for (let a = 0 in {});
 
diff --git a/test/annexB/language/statements/for-in/strict-initializer.js b/test/annexB/language/statements/for-in/strict-initializer.js
index 12377dcf9a..dec0523c57 100644
--- a/test/annexB/language/statements/for-in/strict-initializer.js
+++ b/test/annexB/language/statements/for-in/strict-initializer.js
@@ -10,7 +10,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 throw NotEarlyError;
 for (var a = 0 in {});
 
diff --git a/test/annexB/language/statements/for-in/var-arraybindingpattern-initializer.js b/test/annexB/language/statements/for-in/var-arraybindingpattern-initializer.js
index 9f03152f15..ac5ca2a8a3 100644
--- a/test/annexB/language/statements/for-in/var-arraybindingpattern-initializer.js
+++ b/test/annexB/language/statements/for-in/var-arraybindingpattern-initializer.js
@@ -9,7 +9,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 throw NotEarlyError;
 for (var [a] = 0 in {});
 
diff --git a/test/annexB/language/statements/for-in/var-objectbindingpattern-initializer.js b/test/annexB/language/statements/for-in/var-objectbindingpattern-initializer.js
index b8da16da61..91fd1e78ad 100644
--- a/test/annexB/language/statements/for-in/var-objectbindingpattern-initializer.js
+++ b/test/annexB/language/statements/for-in/var-objectbindingpattern-initializer.js
@@ -9,7 +9,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 throw NotEarlyError;
 for (var {a} = 0 in {});
 
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js
index d282bc12c8..ef51f5fddd 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ASCII=F}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js
index 617ebd6c7c..1d098a2cc4 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ASCII=F}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js
index fcc53463b0..3fe084607f 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ASCII=Invalid}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js
index 801fe9fe9b..b4192a090a 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ASCII=Invalid}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js
index d8a49b3de9..8a78294b18 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ASCII=N}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js
index 41b2d82eeb..387ef8576a 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ASCII=N}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js
index c25bd3f559..d1bd9561d2 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ASCII=No}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js
index bac2657658..7cd7692094 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ASCII=No}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js
index 33526fc6db..83b0f4b704 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ASCII=T}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js
index 4255130581..740bc2ed8d 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ASCII=T}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js
index 4d0b5a409f..96fbf8acff 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ASCII=Y}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js
index fc04c171ed..590a8a00ee 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ASCII=Y}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js
index 9268a72036..98d86d50bb 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ASCII=Yes}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js
index b27f500adc..2eb7dff68b 100644
--- a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ASCII=Yes}/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class-range-end.js b/test/built-ins/RegExp/property-escapes/character-class-range-end.js
index 6a69c4cd86..a7c400be45 100644
--- a/test/built-ins/RegExp/property-escapes/character-class-range-end.js
+++ b/test/built-ins/RegExp/property-escapes/character-class-range-end.js
@@ -15,6 +15,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[--\p{Hex}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js b/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js
index 8d3f2f236a..752dd36048 100644
--- a/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js
+++ b/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js
@@ -15,6 +15,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\uFFFF-\p{Hex}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js b/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js
index 5e72c1cfd9..db25cc8bc5 100644
--- a/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js
+++ b/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js
@@ -15,6 +15,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\p{Hex}-\uFFFF]/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class-range-start.js b/test/built-ins/RegExp/property-escapes/character-class-range-start.js
index 9d8e9f6042..dbe0a9e5ce 100644
--- a/test/built-ins/RegExp/property-escapes/character-class-range-start.js
+++ b/test/built-ins/RegExp/property-escapes/character-class-range-start.js
@@ -15,6 +15,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\p{Hex}--]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js
index 44e84309d4..974f8111f3 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{InAdlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js
index 97538eee51..72397e68cb 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{InAdlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js
index 44e84309d4..974f8111f3 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{InAdlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js
index 97538eee51..72397e68cb 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{InAdlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js
index bd0b7029ed..02ec4892a5 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{InScript=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js
index f3b35b0500..c35fe6e9bb 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{InScript=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js
index 14ce4aefbb..661aa07f43 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{IsScript=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js b/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js
index 429e79342c..41b74da2c6 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{IsScript=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js
index 2a699f4879..662badac6c 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{^General_Category=Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js b/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js
index 5eff51babe..31d5bf9037 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{^General_Category=Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js
index ba50580794..93e38c7bf5 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\p{}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-empty.js b/test/built-ins/RegExp/property-escapes/grammar-extension-empty.js
index 0e38e99a2d..74d4db7164 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-empty.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-empty.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\P{}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js
index 730a8a8804..17236a5678 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\P{invalid}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-invalid.js b/test/built-ins/RegExp/property-escapes/grammar-extension-invalid.js
index 3ceebe5c09..70389b29bb 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-invalid.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-invalid.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\p{invalid}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js
index 40ed96d11b..4a33a1ae94 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js
index 09429d890c..2c3e201721 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\PL/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js
index b5e3d6d6cc..551e237314 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\pL/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces.js b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces.js
index b30a22d54a..054e0a41ea 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js
index 6fb69d7d5f..6d6773ae55 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{=Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js
index 8799ba00d0..0386d03d21 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{=Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js
index b1abde2190..d567be4fd9 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{General_Category:Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js
index 918f7bed14..71530768de 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only.js
index c5dafa9cf6..2bbb08b8e6 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator.js
index 73ce115e6d..b4f0eea244 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-separator.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{General_Category:Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js
index ce749f03a7..6404b1566a 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed.js b/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed.js
index cdbebb9778..9d0fbd8106 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js
index 52e330779e..c8a3d8b397 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-unopened.js b/test/built-ins/RegExp/property-escapes/grammar-extension-unopened.js
index ecf079f841..1bea2dd00d 100644
--- a/test/built-ins/RegExp/property-escapes/grammar-extension-unopened.js
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-unopened.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-01-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-01-negated.js
index 0ad6220fb5..fa270c9d8b 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-01-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-01-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ General_Category=Uppercase_Letter }/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-01.js b/test/built-ins/RegExp/property-escapes/loose-matching-01.js
index 470e8ec0b9..d46e8cdbcd 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-01.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-01.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ General_Category=Uppercase_Letter }/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-02-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-02-negated.js
index 39c3498285..210b7171f5 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-02-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-02-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ Lowercase }/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-02.js b/test/built-ins/RegExp/property-escapes/loose-matching-02.js
index 5412abd87b..2e079c113c 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-02.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-02.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ Lowercase }/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-03-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-03-negated.js
index 0659aaed07..072db718c2 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-03-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-03-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ANY}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-03.js b/test/built-ins/RegExp/property-escapes/loose-matching-03.js
index 2fae61e514..3bca142493 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-03.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-03.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ANY}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-04-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-04-negated.js
index 4027bdc4e3..508bb23dd0 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-04-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-04-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ASSIGNED}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-04.js b/test/built-ins/RegExp/property-escapes/loose-matching-04.js
index 4c10171418..7b32ed24ff 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-04.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-04.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ASSIGNED}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-05-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-05-negated.js
index d02653d81c..85425d890e 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-05-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-05-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Ascii}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-05.js b/test/built-ins/RegExp/property-escapes/loose-matching-05.js
index e40a0fc0db..ad8e0f520f 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-05.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-05.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Ascii}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-06-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-06-negated.js
index 5e08828984..ebd792c378 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-06-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-06-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{General_Category = Uppercase_Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-06.js b/test/built-ins/RegExp/property-escapes/loose-matching-06.js
index f13fa968ed..c17f1b9cd7 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-06.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-06.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{General_Category = Uppercase_Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-07-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-07-negated.js
index a6afb89f2c..e6cb0af423 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-07-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-07-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{_-_lOwEr_C-A_S-E_-_}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-07.js b/test/built-ins/RegExp/property-escapes/loose-matching-07.js
index 40f23a0cf2..ff53f295fa 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-07.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-07.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{_-_lOwEr_C-A_S-E_-_}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-08-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-08-negated.js
index 3ba1cbc5c8..d63de28431 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-08-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-08-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{any}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-08.js b/test/built-ins/RegExp/property-escapes/loose-matching-08.js
index 604ecd0103..265123dce9 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-08.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-08.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{any}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-09-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-09-negated.js
index 8c1b4dda06..01b6461fa5 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-09-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-09-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{ascii}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-09.js b/test/built-ins/RegExp/property-escapes/loose-matching-09.js
index d7f58084db..c6d9dd3a2a 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-09.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-09.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{ascii}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-10-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-10-negated.js
index 0fb8267c8a..5386ab7072 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-10-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-10-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{assigned}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-10.js b/test/built-ins/RegExp/property-escapes/loose-matching-10.js
index 0be9644450..c92922fb64 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-10.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-10.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{assigned}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-11-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-11-negated.js
index 179802af49..94eac81932 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-11-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-11-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{gC=uppercase_letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-11.js b/test/built-ins/RegExp/property-escapes/loose-matching-11.js
index d15c4003f4..f153aae1f0 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-11.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-11.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{gC=uppercase_letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-12-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-12-negated.js
index 82632a7d4b..f942b99fb2 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-12-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-12-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{gc=uppercaseletter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-12.js b/test/built-ins/RegExp/property-escapes/loose-matching-12.js
index 25e452108c..637945520f 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-12.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-12.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{gc=uppercaseletter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-13-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-13-negated.js
index d29dba3d21..45985d222b 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-13-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-13-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-13.js b/test/built-ins/RegExp/property-escapes/loose-matching-13.js
index 1f946bac03..2c1f13497c 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-13.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-13.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-14-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-14-negated.js
index d29dba3d21..45985d222b 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-14-negated.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-14-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-14.js b/test/built-ins/RegExp/property-escapes/loose-matching-14.js
index 1f946bac03..2c1f13497c 100644
--- a/test/built-ins/RegExp/property-escapes/loose-matching-14.js
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-14.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js
index 2577e19169..f8a48d8b28 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{General_Category=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js
index c67ddc7db5..22c8abea25 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{General_Category=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js
index d8a2bd7729..7bb270990c 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{General_Category}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js
index dafefa4062..a7f6bd5685 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{General_Category}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js
index 5d26aebecf..194a451d5b 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Script=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js
index 0268dd8126..d600c26558 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Script=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js
index f8b0167fcd..6b04000d3d 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Script}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js
index ff266152ec..8f5a3ac05f 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Script}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js
index ff0b17c72e..3f57b27702 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Script_Extensions=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js
index 0198106f6c..2d7fe89c9e 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Script_Extensions=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js
index 22fa48e234..6351d4df65 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Script_Extensions}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js
index 64f0db67f0..fb67aa40cb 100644
--- a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Script_Extensions}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js
index 1c8f0a20db..e4863440ff 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{UnknownBinaryProperty}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-binary-property.js b/test/built-ins/RegExp/property-escapes/non-existent-binary-property.js
index 774c2101b3..383dcafe5a 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-binary-property.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-binary-property.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{UnknownBinaryProperty}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js
index cc9d776381..90de6ce86f 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Line_Breakz=WAT}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-and-value.js b/test/built-ins/RegExp/property-escapes/non-existent-property-and-value.js
index 00111eb126..4e62aff7a7 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-and-value.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-and-value.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Line_Breakz=WAT}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js
index 21b62d373d..2346b01736 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Line_Breakz=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value.js b/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value.js
index 338c4606fa..8cf1ae618c 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Line_Breakz=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js
index a50e754e6b..c4e27b8a7d 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\\P{General_Category=WAT}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js
index 5dca3cb97d..f32abaf29e 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\\P{Script=FooBarBazInvalid}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script.js
index 2258f456b1..7aa7a23764 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\\p{Script=FooBarBazInvalid}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js
index cfd5b006b4..fdf635949c 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\\P{Script_Extensions=H_e_h}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js
index 46a9f82573..1576686a05 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\\p{Script_Extensions=H_e_h}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js
index d7dfa4c191..da522272ca 100644
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\\p{General_Category=WAT}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js
index 00533beb7d..fce6713b3e 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Composition_Exclusion}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js
index e3a033d69c..966edc60cd 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Composition_Exclusion}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js
index 765e361c9b..1c2375d47b 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Expands_On_NFC}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js
index d6df2baa96..c75e454d00 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Expands_On_NFC}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js
index 04bc8d5aa7..4a155fecb6 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Expands_On_NFD}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js
index 600823f68f..2cefe3f091 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Expands_On_NFD}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js
index f402aa0910..47aaa24cb4 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Expands_On_NFKC}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js
index 4a8b514e5f..022f42b1b4 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Expands_On_NFKC}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js
index 1ddd3804cf..8b78249cdd 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Expands_On_NFKD}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js
index f926e953b7..0ea050d713 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Expands_On_NFKD}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js
index 45c0f690d5..7280e1128b 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{FC_NFKC_Closure}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js
index 6f4648721e..6a00c6d5a5 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{FC_NFKC_Closure}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js
index 149e8587b0..3b90657dee 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Full_Composition_Exclusion}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js
index 5a0ccba4d6..cf2eed3ecb 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Full_Composition_Exclusion}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js
index 53cb23f269..1caa0041ca 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Grapheme_Link}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js
index 98d63e31c4..5bebfd71a9 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Grapheme_Link}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js
index f837d9bfb4..5de6f5cb6e 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Hyphen}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js
index bde1025d29..4b9dfb767e 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Hyphen}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js
index d8bcefa865..fb547d1a80 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Other_Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js
index 2ede4c94ab..fa1f8857b5 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Other_Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js
index 8563571756..74a741f7ff 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Other_Default_Ignorable_Code_Point}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js
index e6f804be36..e826df175d 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Other_Default_Ignorable_Code_Point}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js
index d1e6885700..2b54fc7701 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Other_Grapheme_Extend}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js
index 475e51e2c5..9eebe00d16 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Other_Grapheme_Extend}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js
index c20f0ccc89..6850867f42 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Other_ID_Continue}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js
index 89853dda24..00df819be2 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Other_ID_Continue}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js
index 9f8529a66a..f33636b757 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Other_ID_Start}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js
index 1a151a8778..8f1497b243 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Other_ID_Start}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js
index ac0be32a9b..33897f7a02 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Other_Lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js
index becbc802b7..ec16940b20 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Other_Lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js
index 0bcb6d636e..55ea1e62fc 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Other_Math}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js
index 7d1fef4ec5..32f4301495 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Other_Math}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js
index c16cd2448d..173e114a99 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Other_Uppercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js
index 023c5128f7..4101f4de4e 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Other_Uppercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js
index 49251cdcbf..8351ef85bb 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Prepended_Concatenation_Mark}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js
index d66e9d02ba..e39927bc0c 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Prepended_Concatenation_Mark}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js
index b867fd8d78..4efc143b89 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Block=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js
index 4552c1b083..efe32f8f66 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Block=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js
index aac13d62b0..c0b38603aa 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{FC_NFKC_Closure}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js b/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js
index 0e2e3be379..7cc1a19bcf 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{FC_NFKC_Closure}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js
index f9b8c7e441..426b17c9b4 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Line_Break=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js
index f9b8c7e441..426b17c9b4 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\P{Line_Break=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js
index 46f97c1311..fa565baf41 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Line_Break=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js
index d4256a7831..500a86c253 100644
--- a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\p{Line_Break}/u;
diff --git a/test/harness/sta.js b/test/harness/sta.js
index 0789090392..72c23e4ff7 100644
--- a/test/harness/sta.js
+++ b/test/harness/sta.js
@@ -11,4 +11,4 @@ description: >
 assert(typeof Test262Error === "function");
 assert(typeof Test262Error.prototype.toString === "function");
 assert(typeof $ERROR === "function");
-assert(typeof failIfCodeGetsEvaluated === "function");
+assert(typeof $DONOTEVALUATE === "function");
diff --git a/test/language/arguments-object/10.5-1gs.js b/test/language/arguments-object/10.5-1gs.js
index 32a666a4ba..ef4554347e 100644
--- a/test/language/arguments-object/10.5-1gs.js
+++ b/test/language/arguments-object/10.5-1gs.js
@@ -10,7 +10,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 function f_10_5_1_gs(){
diff --git a/test/language/asi/S7.9.2_A1_T1.js b/test/language/asi/S7.9.2_A1_T1.js
index 62b45efef7..514c8eb88e 100644
--- a/test/language/asi/S7.9.2_A1_T1.js
+++ b/test/language/asi/S7.9.2_A1_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 { 1 2 } 3
diff --git a/test/language/asi/S7.9.2_A1_T3.js b/test/language/asi/S7.9.2_A1_T3.js
index f2a15fad78..2ed562a7f3 100644
--- a/test/language/asi/S7.9.2_A1_T3.js
+++ b/test/language/asi/S7.9.2_A1_T3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for( a ; b
diff --git a/test/language/asi/S7.9.2_A1_T6.js b/test/language/asi/S7.9.2_A1_T6.js
index 8e15e865c7..4342057ba9 100644
--- a/test/language/asi/S7.9.2_A1_T6.js
+++ b/test/language/asi/S7.9.2_A1_T6.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 var a=1,b=2,c=3,d;
diff --git a/test/language/asi/S7.9_A10_T2.js b/test/language/asi/S7.9_A10_T2.js
index a2dc786a7b..4c84b09088 100644
--- a/test/language/asi/S7.9_A10_T2.js
+++ b/test/language/asi/S7.9_A10_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 {} * 1
diff --git a/test/language/asi/S7.9_A10_T4.js b/test/language/asi/S7.9_A10_T4.js
index d38f03fc43..59e86113f9 100644
--- a/test/language/asi/S7.9_A10_T4.js
+++ b/test/language/asi/S7.9_A10_T4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 ({};) * 1
diff --git a/test/language/asi/S7.9_A10_T6.js b/test/language/asi/S7.9_A10_T6.js
index 051bcf7ba6..3dba58172e 100644
--- a/test/language/asi/S7.9_A10_T6.js
+++ b/test/language/asi/S7.9_A10_T6.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 {}
diff --git a/test/language/asi/S7.9_A10_T8.js b/test/language/asi/S7.9_A10_T8.js
index 86564ec58e..0623d48507 100644
--- a/test/language/asi/S7.9_A10_T8.js
+++ b/test/language/asi/S7.9_A10_T8.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 {1 2} 3
diff --git a/test/language/asi/S7.9_A11_T4.js b/test/language/asi/S7.9_A11_T4.js
index a9139cb6b5..f99f2a6113 100644
--- a/test/language/asi/S7.9_A11_T4.js
+++ b/test/language/asi/S7.9_A11_T4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 var x = 0;
diff --git a/test/language/asi/S7.9_A11_T8.js b/test/language/asi/S7.9_A11_T8.js
index ca6ae88154..f021a018e0 100644
--- a/test/language/asi/S7.9_A11_T8.js
+++ b/test/language/asi/S7.9_A11_T8.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) {};
 else {}
diff --git a/test/language/asi/S7.9_A4.js b/test/language/asi/S7.9_A4.js
index 0ddfd60e58..a4148c6ced 100644
--- a/test/language/asi/S7.9_A4.js
+++ b/test/language/asi/S7.9_A4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 try {
diff --git a/test/language/asi/S7.9_A5.1_T1.js b/test/language/asi/S7.9_A5.1_T1.js
index 143bbe55a9..38f7a6c0cf 100644
--- a/test/language/asi/S7.9_A5.1_T1.js
+++ b/test/language/asi/S7.9_A5.1_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = 0;
 x
diff --git a/test/language/asi/S7.9_A5.3_T1.js b/test/language/asi/S7.9_A5.3_T1.js
index 8ccc7206c3..86665927e4 100644
--- a/test/language/asi/S7.9_A5.3_T1.js
+++ b/test/language/asi/S7.9_A5.3_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 var x = 1;
diff --git a/test/language/asi/S7.9_A5.7_T1.js b/test/language/asi/S7.9_A5.7_T1.js
index d3c248554c..45e52b9527 100644
--- a/test/language/asi/S7.9_A5.7_T1.js
+++ b/test/language/asi/S7.9_A5.7_T1.js
@@ -16,7 +16,7 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x=0, y=0;
 var z=
diff --git a/test/language/asi/S7.9_A6.2_T1.js b/test/language/asi/S7.9_A6.2_T1.js
index db46e31167..38aa9436c6 100644
--- a/test/language/asi/S7.9_A6.2_T1.js
+++ b/test/language/asi/S7.9_A6.2_T1.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(;
diff --git a/test/language/asi/S7.9_A6.2_T10.js b/test/language/asi/S7.9_A6.2_T10.js
index a9948add58..0951c46c59 100644
--- a/test/language/asi/S7.9_A6.2_T10.js
+++ b/test/language/asi/S7.9_A6.2_T10.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.2_T2.js b/test/language/asi/S7.9_A6.2_T2.js
index b2fd03d442..e2cbfac507 100644
--- a/test/language/asi/S7.9_A6.2_T2.js
+++ b/test/language/asi/S7.9_A6.2_T2.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.2_T3.js b/test/language/asi/S7.9_A6.2_T3.js
index 9fe7be594f..21f30a4fc3 100644
--- a/test/language/asi/S7.9_A6.2_T3.js
+++ b/test/language/asi/S7.9_A6.2_T3.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.2_T4.js b/test/language/asi/S7.9_A6.2_T4.js
index 5be83574d7..b3c98ca53d 100644
--- a/test/language/asi/S7.9_A6.2_T4.js
+++ b/test/language/asi/S7.9_A6.2_T4.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.2_T5.js b/test/language/asi/S7.9_A6.2_T5.js
index a8ef488ee3..e70a91ed4b 100644
--- a/test/language/asi/S7.9_A6.2_T5.js
+++ b/test/language/asi/S7.9_A6.2_T5.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(false;false
diff --git a/test/language/asi/S7.9_A6.2_T6.js b/test/language/asi/S7.9_A6.2_T6.js
index d6129bcd3b..7665aeaf10 100644
--- a/test/language/asi/S7.9_A6.2_T6.js
+++ b/test/language/asi/S7.9_A6.2_T6.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(false;
diff --git a/test/language/asi/S7.9_A6.2_T7.js b/test/language/asi/S7.9_A6.2_T7.js
index 90e07986af..0136b60eaa 100644
--- a/test/language/asi/S7.9_A6.2_T7.js
+++ b/test/language/asi/S7.9_A6.2_T7.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(false
diff --git a/test/language/asi/S7.9_A6.2_T8.js b/test/language/asi/S7.9_A6.2_T8.js
index c63d1ddb40..91421ad7fd 100644
--- a/test/language/asi/S7.9_A6.2_T8.js
+++ b/test/language/asi/S7.9_A6.2_T8.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(false
diff --git a/test/language/asi/S7.9_A6.2_T9.js b/test/language/asi/S7.9_A6.2_T9.js
index 5caf89c498..dafeb590ba 100644
--- a/test/language/asi/S7.9_A6.2_T9.js
+++ b/test/language/asi/S7.9_A6.2_T9.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.3_T1.js b/test/language/asi/S7.9_A6.3_T1.js
index 76c7c1b33d..dd6ad4edc5 100644
--- a/test/language/asi/S7.9_A6.3_T1.js
+++ b/test/language/asi/S7.9_A6.3_T1.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.3_T2.js b/test/language/asi/S7.9_A6.3_T2.js
index 121815f5b0..94c53e2421 100644
--- a/test/language/asi/S7.9_A6.3_T2.js
+++ b/test/language/asi/S7.9_A6.3_T2.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.3_T3.js b/test/language/asi/S7.9_A6.3_T3.js
index db3bc0c618..9d37a23116 100644
--- a/test/language/asi/S7.9_A6.3_T3.js
+++ b/test/language/asi/S7.9_A6.3_T3.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.3_T4.js b/test/language/asi/S7.9_A6.3_T4.js
index 8538816bed..a94a45c6df 100644
--- a/test/language/asi/S7.9_A6.3_T4.js
+++ b/test/language/asi/S7.9_A6.3_T4.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.3_T5.js b/test/language/asi/S7.9_A6.3_T5.js
index 2360a8e9a2..3b6bbbb43a 100644
--- a/test/language/asi/S7.9_A6.3_T5.js
+++ b/test/language/asi/S7.9_A6.3_T5.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(false
diff --git a/test/language/asi/S7.9_A6.3_T6.js b/test/language/asi/S7.9_A6.3_T6.js
index b6b06b0889..4bab0d81df 100644
--- a/test/language/asi/S7.9_A6.3_T6.js
+++ b/test/language/asi/S7.9_A6.3_T6.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.3_T7.js b/test/language/asi/S7.9_A6.3_T7.js
index 5c7f5adcac..08cf8babe8 100644
--- a/test/language/asi/S7.9_A6.3_T7.js
+++ b/test/language/asi/S7.9_A6.3_T7.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(
diff --git a/test/language/asi/S7.9_A6.4_T1.js b/test/language/asi/S7.9_A6.4_T1.js
index 28ec4eaca1..4fa465faee 100644
--- a/test/language/asi/S7.9_A6.4_T1.js
+++ b/test/language/asi/S7.9_A6.4_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(false;false;false;) {
diff --git a/test/language/asi/S7.9_A6.4_T2.js b/test/language/asi/S7.9_A6.4_T2.js
index 7072402b72..1bcde233aa 100644
--- a/test/language/asi/S7.9_A6.4_T2.js
+++ b/test/language/asi/S7.9_A6.4_T2.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 for(false;false;;false) {
diff --git a/test/language/asi/S7.9_A9_T6.js b/test/language/asi/S7.9_A9_T6.js
index 8082a7bf7d..198e4e9fb5 100644
--- a/test/language/asi/S7.9_A9_T6.js
+++ b/test/language/asi/S7.9_A9_T6.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 do
diff --git a/test/language/asi/S7.9_A9_T7.js b/test/language/asi/S7.9_A9_T7.js
index d78193d8ad..b49fb8507e 100644
--- a/test/language/asi/S7.9_A9_T7.js
+++ b/test/language/asi/S7.9_A9_T7.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 do
diff --git a/test/language/asi/S7.9_A9_T8.js b/test/language/asi/S7.9_A9_T8.js
index c990c7686c..bd9333f6fe 100644
--- a/test/language/asi/S7.9_A9_T8.js
+++ b/test/language/asi/S7.9_A9_T8.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 do {};
diff --git a/test/language/block-scope/syntax/for-in/disallow-initialization-assignment.js b/test/language/block-scope/syntax/for-in/disallow-initialization-assignment.js
index b262dade74..26aa30a1b1 100644
--- a/test/language/block-scope/syntax/for-in/disallow-initialization-assignment.js
+++ b/test/language/block-scope/syntax/for-in/disallow-initialization-assignment.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (let x = 3 in {}) { }
 
diff --git a/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-with-and-without-initializer.js b/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-with-and-without-initializer.js
index 3b53e18036..60e6085d69 100644
--- a/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-with-and-without-initializer.js
+++ b/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-with-and-without-initializer.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (let x = 3, y in {}) { }
 
diff --git a/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-with-initializer.js b/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-with-initializer.js
index a09d9158f4..8801dab22b 100644
--- a/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-with-initializer.js
+++ b/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-with-initializer.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (let x = 3, y = 4 in {}) { }
 
diff --git a/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-without-and-with-initializer.js b/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-without-and-with-initializer.js
index a23a48e662..7b99b3a960 100644
--- a/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-without-and-with-initializer.js
+++ b/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings-without-and-with-initializer.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (let x, y = 4 in {}) { }
 
diff --git a/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings.js b/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings.js
index 73f0a3c71a..da37179dfe 100644
--- a/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings.js
+++ b/test/language/block-scope/syntax/for-in/disallow-multiple-lexical-bindings.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (let x, y in {}) { }
 
diff --git a/test/language/block-scope/syntax/function-declarations/in-statement-position-do-statement-while-expression.js b/test/language/block-scope/syntax/function-declarations/in-statement-position-do-statement-while-expression.js
index b96b79e6f0..1912694265 100644
--- a/test/language/block-scope/syntax/function-declarations/in-statement-position-do-statement-while-expression.js
+++ b/test/language/block-scope/syntax/function-declarations/in-statement-position-do-statement-while-expression.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 do function g() {} while (false)
 
diff --git a/test/language/block-scope/syntax/function-declarations/in-statement-position-for-statement.js b/test/language/block-scope/syntax/function-declarations/in-statement-position-for-statement.js
index 1760a6e18a..52628c11d4 100644
--- a/test/language/block-scope/syntax/function-declarations/in-statement-position-for-statement.js
+++ b/test/language/block-scope/syntax/function-declarations/in-statement-position-for-statement.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (;false;) function g() {}
 
diff --git a/test/language/block-scope/syntax/function-declarations/in-statement-position-if-expression-statement-else-statement.js b/test/language/block-scope/syntax/function-declarations/in-statement-position-if-expression-statement-else-statement.js
index c0fca8f6c2..4b6f7cc897 100644
--- a/test/language/block-scope/syntax/function-declarations/in-statement-position-if-expression-statement-else-statement.js
+++ b/test/language/block-scope/syntax/function-declarations/in-statement-position-if-expression-statement-else-statement.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) {} else function g() {}
 
diff --git a/test/language/block-scope/syntax/function-declarations/in-statement-position-if-expression-statement.js b/test/language/block-scope/syntax/function-declarations/in-statement-position-if-expression-statement.js
index 5a5f6bed62..7d4538fb3b 100644
--- a/test/language/block-scope/syntax/function-declarations/in-statement-position-if-expression-statement.js
+++ b/test/language/block-scope/syntax/function-declarations/in-statement-position-if-expression-statement.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) function g() {}
 
diff --git a/test/language/block-scope/syntax/function-declarations/in-statement-position-while-expression-statement.js b/test/language/block-scope/syntax/function-declarations/in-statement-position-while-expression-statement.js
index a24b112f33..85d0135301 100644
--- a/test/language/block-scope/syntax/function-declarations/in-statement-position-while-expression-statement.js
+++ b/test/language/block-scope/syntax/function-declarations/in-statement-position-while-expression-statement.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 while (false) function g() {}
 
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 666be0e9a7..50b4648e44 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} async function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 3bad4af013..44431fc5bf 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} async function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
index 99b267690e..b9d883f5c8 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
index c53f57b764..059360f2ca 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
index 3b1801da89..c4d8f05392 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
index 31f4f99fdf..312af3f794 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
index b770030122..5ad2adc297 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
index ed555f501f..d03c5cf34f 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function f() {} var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 76ad27016e..9692820199 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} async function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index d1e50cae50..7e71084a68 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} async function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
index 53505ace77..2c3d5d2249 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
index bd00ba47e7..0f7b46243b 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
index 4d848dc186..3068f8581c 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
index 8115696a03..296e17fb80 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
index 06e4314fe5..7c680f9232 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
index 5101b8cb09..055ae92b60 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { async function* f() {} var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 17b93117ce..2908d5b6ad 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} async function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 723e63c8f2..a1844dbf07 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} async function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
index 83fba10d51..c16b14569b 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
index 6d826173a8..a411858cb0 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
index 2aaedbb7bf..099f6d9695 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
index 7ae9a1a7dc..260c1b00d0 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
index 19ade22a8b..ce3d5d376f 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
index 74c64aed7d..4930ad2f2c 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { class f {} var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 9392d33449..9e029ee136 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; async function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index ea16670ddb..7f4b7c9b80 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; async function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
index f364902dd5..108b912af9 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
index d7546b7d63..bb05fc3e21 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
index 40f25d5fe6..3a1e3aa126 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
index 316b1f4a7e..4bb6eb1723 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
index a6a013d0ac..0c71133aa5 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
index 6841887678..f395e4ff9d 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { const f = 0; var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 9bc10a4e9a..f4590510d0 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} async function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 4dde8c1494..a08e9c90c3 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} async function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
index d6d4bf6fab..0bafed5390 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
index 46e15e6aab..e62c69975c 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
index 08dc122eb9..dd26dfbd5a 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
index cf1ef5c500..3d68bdea5b 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
index e3a75d5b32..ee1f8a78cf 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration-nested-in-function.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration-nested-in-function.js
index 6e3e5a70b5..8963e84527 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration-nested-in-function.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration-nested-in-function.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function g() {
     // Create an outer block-statement.
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
index 2f868b9aac..2a2a1738f2 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function f() {} var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 85d80df3fa..9929143735 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} async function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index b5add63fa8..4c19ed7d9e 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} async function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
index b82d14c22a..1c48927aed 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
index 0b7b36a11a..35b3a51e54 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
index 1d87910d53..cf69c1852b 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
index 4afcc327d4..b6a58ed72f 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
index 58813cbbf8..87d41926c4 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
index 340e32d3dc..bb5569ae3c 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { function* f() {} var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
index c79d625eb0..53cc42b601 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; async function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 43780807da..be65ee63ae 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; async function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
index 2c0c7bad40..91c6af10c7 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
index 7a0d6f8a43..9a93b8f756 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
index 676e15a782..dfed6fe1a1 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
index 800d9bb4a3..4e5946ae12 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
index 6c09a73fe6..c359f11494 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
index d881768472..5c0ac1da15 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { let f; var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 4be6d7b04d..d8b22505fa 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; async function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index a6fc1f2f51..1ca82eb119 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; async function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
index f0c0478fc1..b191619e95 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
index ee964e0743..a0f8dda0cc 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
index 817c53b549..5cf2218320 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; function f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
index 0cecc769bd..27183853ff 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; function* f() {} }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
index 170c8d59d2..f115d5895d 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { var f; let f; }
diff --git a/test/language/comments/S7.4_A2_T2.js b/test/language/comments/S7.4_A2_T2.js
index 4cd1c304c7..1df05201e7 100644
--- a/test/language/comments/S7.4_A2_T2.js
+++ b/test/language/comments/S7.4_A2_T2.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /*CHECK#1/
diff --git a/test/language/comments/S7.4_A3.js b/test/language/comments/S7.4_A3.js
index b9817af9d9..0ebfeb4fcc 100644
--- a/test/language/comments/S7.4_A3.js
+++ b/test/language/comments/S7.4_A3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /*CHECK#1*/
 
diff --git a/test/language/comments/S7.4_A4_T1.js b/test/language/comments/S7.4_A4_T1.js
index bcfe9a8fdd..785bdfa0eb 100644
--- a/test/language/comments/S7.4_A4_T1.js
+++ b/test/language/comments/S7.4_A4_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /*CHECK#1*/
 
diff --git a/test/language/comments/S7.4_A4_T4.js b/test/language/comments/S7.4_A4_T4.js
index cf2bd2c5df..8d5b5cd81d 100644
--- a/test/language/comments/S7.4_A4_T4.js
+++ b/test/language/comments/S7.4_A4_T4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /*CHECK#1*/
 
diff --git a/test/language/comments/multi-line-html-close-extra.js b/test/language/comments/multi-line-html-close-extra.js
index 6bc3cec6c0..8e6de7708b 100644
--- a/test/language/comments/multi-line-html-close-extra.js
+++ b/test/language/comments/multi-line-html-close-extra.js
@@ -19,7 +19,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /*
 */ the comment should not include these characters, regardless of AnnexB extensions -->
diff --git a/test/language/comments/single-line-html-close-without-lt.js b/test/language/comments/single-line-html-close-without-lt.js
index 681eae280d..0b0f0316de 100644
--- a/test/language/comments/single-line-html-close-without-lt.js
+++ b/test/language/comments/single-line-html-close-without-lt.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ;-->
diff --git a/test/language/export/escaped-as-export-specifier.js b/test/language/export/escaped-as-export-specifier.js
index 9d2735fcf6..392c69a30d 100644
--- a/test/language/export/escaped-as-export-specifier.js
+++ b/test/language/export/escaped-as-export-specifier.js
@@ -19,7 +19,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export var a = 0;
 export {a \u0061s b} from "./escaped-as-export-specifier.js";
diff --git a/test/language/export/escaped-default.js b/test/language/export/escaped-default.js
index 35c624f1c3..a98dfd7c58 100644
--- a/test/language/export/escaped-default.js
+++ b/test/language/export/escaped-default.js
@@ -19,6 +19,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export d\u0065fault 0;
diff --git a/test/language/export/escaped-from.js b/test/language/export/escaped-from.js
index 1642755e00..3ab3d407c4 100644
--- a/test/language/export/escaped-from.js
+++ b/test/language/export/escaped-from.js
@@ -19,6 +19,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export {} \u0066rom "./escaped-from.js";
diff --git a/test/language/expressions/arrow-function/dflt-params-duplicates.js b/test/language/expressions/arrow-function/dflt-params-duplicates.js
index 666cebebca..8ac9c4a504 100644
--- a/test/language/expressions/arrow-function/dflt-params-duplicates.js
+++ b/test/language/expressions/arrow-function/dflt-params-duplicates.js
@@ -53,7 +53,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, (x = 0, x) => {
   
diff --git a/test/language/expressions/arrow-function/dflt-params-rest.js b/test/language/expressions/arrow-function/dflt-params-rest.js
index 95d927e726..8c2ca36d4a 100644
--- a/test/language/expressions/arrow-function/dflt-params-rest.js
+++ b/test/language/expressions/arrow-function/dflt-params-rest.js
@@ -57,7 +57,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, (...x = []) => {
   
diff --git a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-ary.js b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-ary.js
index d33aa7c244..1717dfd81d 100644
--- a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-ary.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-id.js b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-id.js
index 2bd5c92091..e8feaed82f 100644
--- a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-id.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-obj.js b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-obj.js
index de28f684d5..b1c10bb119 100644
--- a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-init-obj.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-ary.js
index 2ad5974c96..afd86edd25 100644
--- a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-ary.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-id.js b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-id.js
index c938bb32fa..f37e7abe6e 100644
--- a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-id.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-obj.js
index 8323e2a522..e3e1a0b84d 100644
--- a/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/arrow-function/dstr-ary-ptrn-rest-not-final-obj.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-ary.js
index 1b87e631f4..6c070dd097 100644
--- a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-ary.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-id.js
index 430788ff3e..7f1eda6aa6 100644
--- a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-id.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-obj.js
index 6740b0f2e8..1f924210a3 100644
--- a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-init-obj.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
index 32521a3cea..c069f1b0e9 100644
--- a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-id.js
index 897342da7e..99cd95c761 100644
--- a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-id.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
index ea7891ca44..41721356b4 100644
--- a/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/arrow-function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
@@ -46,7 +46,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/arrow-function/param-dflt-yield-expr.js b/test/language/expressions/arrow-function/param-dflt-yield-expr.js
index dceb641c0e..55f17d50e8 100644
--- a/test/language/expressions/arrow-function/param-dflt-yield-expr.js
+++ b/test/language/expressions/arrow-function/param-dflt-yield-expr.js
@@ -21,7 +21,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *g() {
   (x = yield) => {};
diff --git a/test/language/expressions/arrow-function/param-dflt-yield-id-strict.js b/test/language/expressions/arrow-function/param-dflt-yield-id-strict.js
index a95797179e..3503621b21 100644
--- a/test/language/expressions/arrow-function/param-dflt-yield-id-strict.js
+++ b/test/language/expressions/arrow-function/param-dflt-yield-id-strict.js
@@ -16,6 +16,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (x = yield) => {};
diff --git a/test/language/expressions/arrow-function/rest-params-trailing-comma-early-error.js b/test/language/expressions/arrow-function/rest-params-trailing-comma-early-error.js
index f76338406e..9a7293a73b 100644
--- a/test/language/expressions/arrow-function/rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/arrow-function/rest-params-trailing-comma-early-error.js
@@ -49,7 +49,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, (...a,) => {
   
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier-futurereservedword.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier-futurereservedword.js
index 11e417d771..ca60471aa6 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier-futurereservedword.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier-futurereservedword.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = enum => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier-strict-futurereservedword.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier-strict-futurereservedword.js
index a1742d9cef..c4ac74f92c 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier-strict-futurereservedword.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier-strict-futurereservedword.js
@@ -23,5 +23,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = package => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier.js
index 4aa7b03bce..a2014de369 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-identifier.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = switch => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-arguments.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-arguments.js
index 8900c74076..e55afd234a 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-arguments.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-arguments.js
@@ -15,5 +15,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = arguments => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-eval.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-eval.js
index bbe7dba7e2..ee991a5630 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-eval.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-eval.js
@@ -16,5 +16,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = eval => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-yield.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-yield.js
index e57593b471..e8ad72a749 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-yield.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-no-yield.js
@@ -16,5 +16,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = yield => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-rest.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-rest.js
index d3cddbea66..bf980f45a3 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-rest.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-bindingidentifier-rest.js
@@ -12,5 +12,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = ...x => x;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-arguments.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-arguments.js
index 5e5a10a7f9..ca95b215f2 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-arguments.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-arguments.js
@@ -20,5 +20,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = (arguments) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-1.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-1.js
index 9d84828df5..de2ae67861 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-1.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-1.js
@@ -21,5 +21,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = (x, [x]) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-2.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-2.js
index 5ebaa8fae7..ff429de6bc 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-2.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-2.js
@@ -21,5 +21,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = ([x, x]) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-3.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-3.js
index f57202fa6d..c7282d82ae 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-3.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-array-3.js
@@ -23,5 +23,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = ([x], ...x) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-1.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-1.js
index c8df98a1b4..242c59b457 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-1.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-1.js
@@ -21,5 +21,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = (x, {x}) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-2.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-2.js
index f911be37d3..f79b71f4fc 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-2.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-2.js
@@ -23,5 +23,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = (x, {y: x}) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-3.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-3.js
index 8fdc8c5eee..2485761cd6 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-3.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-3.js
@@ -23,5 +23,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = ({x}, {y: x}) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-4.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-4.js
index c5a3a219a6..3d25c86101 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-4.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-4.js
@@ -25,5 +25,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = ({x}, ...x) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-5.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-5.js
index 4b2bf9abd4..a1993a4894 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-5.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-5.js
@@ -25,5 +25,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = ({y: x}, ...x) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-6.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-6.js
index 9d9d111bfe..bc6c47d864 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-6.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-binding-object-6.js
@@ -23,5 +23,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = ({y: x, x}) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-rest.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-rest.js
index 7fec71c26c..bdd315c247 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-rest.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates-rest.js
@@ -19,5 +19,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = (x, ...x) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates.js
index d1ff08a834..11990e825b 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-duplicates.js
@@ -19,5 +19,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = (x, x) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-eval.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-eval.js
index 39c62e18e8..19ac3d310e 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-eval.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-eval.js
@@ -20,5 +20,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = (eval) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-yield.js b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-yield.js
index 8d5d10b172..6c9ce9543d 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-yield.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/arrowparameters-cover-no-yield.js
@@ -15,5 +15,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = (yield) => 1;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid-parenless-parameters-expression-body.js b/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid-parenless-parameters-expression-body.js
index d7a8010a81..c1533356d4 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid-parenless-parameters-expression-body.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid-parenless-parameters-expression-body.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = x
 => x;
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid-parenless-parameters.js b/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid-parenless-parameters.js
index 6ed5735815..0409c47fd4 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid-parenless-parameters.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid-parenless-parameters.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = x
 => {};
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid.js b/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid.js
index daae129386..60c8891f0f 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/asi-restriction-invalid.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var af = ()
 => {};
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js b/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
index 41b95912ce..0bd9bdcff4 100644
--- a/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var f = (a = 0) => {
   "use strict";
diff --git a/test/language/expressions/assignment/dstr-array-elem-init-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-array-elem-init-yield-ident-invalid.js
index d4b93deac5..295e7d1d5e 100644
--- a/test/language/expressions/assignment/dstr-array-elem-init-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-elem-init-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [ x = yield ] = [];
diff --git a/test/language/expressions/assignment/dstr-array-elem-nested-array-invalid.js b/test/language/expressions/assignment/dstr-array-elem-nested-array-invalid.js
index 466312f630..b87e6a8e41 100644
--- a/test/language/expressions/assignment/dstr-array-elem-nested-array-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-elem-nested-array-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [[(x, y)]] = [[]];
diff --git a/test/language/expressions/assignment/dstr-array-elem-nested-array-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-array-elem-nested-array-yield-ident-invalid.js
index 27f1207350..cec871b71d 100644
--- a/test/language/expressions/assignment/dstr-array-elem-nested-array-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-elem-nested-array-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [[x[yield]]] = [[]];
diff --git a/test/language/expressions/assignment/dstr-array-elem-nested-obj-invalid.js b/test/language/expressions/assignment/dstr-array-elem-nested-obj-invalid.js
index 3077fd61a0..82d583858b 100644
--- a/test/language/expressions/assignment/dstr-array-elem-nested-obj-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-elem-nested-obj-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [{ get x() {} }] = [{}];
diff --git a/test/language/expressions/assignment/dstr-array-elem-nested-obj-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-array-elem-nested-obj-yield-ident-invalid.js
index 32f987dec7..bc82895b16 100644
--- a/test/language/expressions/assignment/dstr-array-elem-nested-obj-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-elem-nested-obj-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [{ x = yield }] = [{}];
diff --git a/test/language/expressions/assignment/dstr-array-elem-target-simple-strict.js b/test/language/expressions/assignment/dstr-array-elem-target-simple-strict.js
index a38d2d1a08..1bb8c516b0 100644
--- a/test/language/expressions/assignment/dstr-array-elem-target-simple-strict.js
+++ b/test/language/expressions/assignment/dstr-array-elem-target-simple-strict.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [arguments] = [];
diff --git a/test/language/expressions/assignment/dstr-array-elem-target-yield-invalid.js b/test/language/expressions/assignment/dstr-array-elem-target-yield-invalid.js
index 294cb058fc..14392e8610 100644
--- a/test/language/expressions/assignment/dstr-array-elem-target-yield-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-elem-target-yield-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [ x[yield] ] = [];
diff --git a/test/language/expressions/assignment/dstr-array-rest-before-element.js b/test/language/expressions/assignment/dstr-array-rest-before-element.js
index 459ae94b06..9d1c466aac 100644
--- a/test/language/expressions/assignment/dstr-array-rest-before-element.js
+++ b/test/language/expressions/assignment/dstr-array-rest-before-element.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [...x, y] = [];
diff --git a/test/language/expressions/assignment/dstr-array-rest-before-elision.js b/test/language/expressions/assignment/dstr-array-rest-before-elision.js
index dc3b9ddfde..dc6e706b1b 100644
--- a/test/language/expressions/assignment/dstr-array-rest-before-elision.js
+++ b/test/language/expressions/assignment/dstr-array-rest-before-elision.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [...x,] = [];
diff --git a/test/language/expressions/assignment/dstr-array-rest-before-rest.js b/test/language/expressions/assignment/dstr-array-rest-before-rest.js
index af42490f75..021b9bb22b 100644
--- a/test/language/expressions/assignment/dstr-array-rest-before-rest.js
+++ b/test/language/expressions/assignment/dstr-array-rest-before-rest.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [...x, ...y] = [];
diff --git a/test/language/expressions/assignment/dstr-array-rest-elision-invalid.js b/test/language/expressions/assignment/dstr-array-rest-elision-invalid.js
index 6d371adee8..80f9f9ad54 100644
--- a/test/language/expressions/assignment/dstr-array-rest-elision-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-rest-elision-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [...x,] = [];
diff --git a/test/language/expressions/assignment/dstr-array-rest-init.js b/test/language/expressions/assignment/dstr-array-rest-init.js
index 6ed9a0e298..0abe0e9c5e 100644
--- a/test/language/expressions/assignment/dstr-array-rest-init.js
+++ b/test/language/expressions/assignment/dstr-array-rest-init.js
@@ -19,7 +19,7 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var x;
 
 0, [...x = 1] = [];
diff --git a/test/language/expressions/assignment/dstr-array-rest-nested-array-invalid.js b/test/language/expressions/assignment/dstr-array-rest-nested-array-invalid.js
index d79a565696..b1da76740d 100644
--- a/test/language/expressions/assignment/dstr-array-rest-nested-array-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-rest-nested-array-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [...[(x, y)]] = [[]];
diff --git a/test/language/expressions/assignment/dstr-array-rest-nested-array-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-array-rest-nested-array-yield-ident-invalid.js
index 8467b867ae..7c02875a03 100644
--- a/test/language/expressions/assignment/dstr-array-rest-nested-array-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-rest-nested-array-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [...[x[yield]]] = [];
diff --git a/test/language/expressions/assignment/dstr-array-rest-nested-obj-invalid.js b/test/language/expressions/assignment/dstr-array-rest-nested-obj-invalid.js
index 1b78a643b7..055a034aa8 100644
--- a/test/language/expressions/assignment/dstr-array-rest-nested-obj-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-rest-nested-obj-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [...{ get x() {} }] = [[]];
diff --git a/test/language/expressions/assignment/dstr-array-rest-nested-obj-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-array-rest-nested-obj-yield-ident-invalid.js
index 52442281c9..16327d9c37 100644
--- a/test/language/expressions/assignment/dstr-array-rest-nested-obj-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-rest-nested-obj-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, [...{ x = yield }] = [{}];
diff --git a/test/language/expressions/assignment/dstr-array-rest-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-array-rest-yield-ident-invalid.js
index 7a12345110..bc8aaa83da 100644
--- a/test/language/expressions/assignment/dstr-array-rest-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-array-rest-yield-ident-invalid.js
@@ -19,7 +19,7 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var x = {};
 
 0, [...x[yield]] = [];
diff --git a/test/language/expressions/assignment/dstr-obj-id-identifier-yield-expr.js b/test/language/expressions/assignment/dstr-obj-id-identifier-yield-expr.js
index 9761cb6ea0..65ae6f32c8 100644
--- a/test/language/expressions/assignment/dstr-obj-id-identifier-yield-expr.js
+++ b/test/language/expressions/assignment/dstr-obj-id-identifier-yield-expr.js
@@ -19,7 +19,7 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 (function*() {
 
 0, { yield } = {};
diff --git a/test/language/expressions/assignment/dstr-obj-id-identifier-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-obj-id-identifier-yield-ident-invalid.js
index 72dd41d633..6a03a9ada6 100644
--- a/test/language/expressions/assignment/dstr-obj-id-identifier-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-id-identifier-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { yield } = {};
diff --git a/test/language/expressions/assignment/dstr-obj-id-init-simple-strict.js b/test/language/expressions/assignment/dstr-obj-id-init-simple-strict.js
index aadcb8b740..b6cba9869f 100644
--- a/test/language/expressions/assignment/dstr-obj-id-init-simple-strict.js
+++ b/test/language/expressions/assignment/dstr-obj-id-init-simple-strict.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { eval = 0 } = {};
diff --git a/test/language/expressions/assignment/dstr-obj-id-init-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-obj-id-init-yield-ident-invalid.js
index ca4ea9122d..87c81cba63 100644
--- a/test/language/expressions/assignment/dstr-obj-id-init-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-id-init-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { x = yield } = {};
diff --git a/test/language/expressions/assignment/dstr-obj-id-simple-strict.js b/test/language/expressions/assignment/dstr-obj-id-simple-strict.js
index 5d083b1825..836c6f3eb1 100644
--- a/test/language/expressions/assignment/dstr-obj-id-simple-strict.js
+++ b/test/language/expressions/assignment/dstr-obj-id-simple-strict.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { eval } = {};
diff --git a/test/language/expressions/assignment/dstr-obj-prop-elem-init-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-obj-prop-elem-init-yield-ident-invalid.js
index 292db594ec..797b1bf0c1 100644
--- a/test/language/expressions/assignment/dstr-obj-prop-elem-init-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-prop-elem-init-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { x: x = yield } = {};
diff --git a/test/language/expressions/assignment/dstr-obj-prop-elem-target-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-obj-prop-elem-target-yield-ident-invalid.js
index dfe3476753..b774c80ece 100644
--- a/test/language/expressions/assignment/dstr-obj-prop-elem-target-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-prop-elem-target-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { x: x[yield] } = {};
diff --git a/test/language/expressions/assignment/dstr-obj-prop-nested-array-invalid.js b/test/language/expressions/assignment/dstr-obj-prop-nested-array-invalid.js
index dba975e1aa..a706092950 100644
--- a/test/language/expressions/assignment/dstr-obj-prop-nested-array-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-prop-nested-array-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { x: [(x, y)] } = { x: [] };
diff --git a/test/language/expressions/assignment/dstr-obj-prop-nested-array-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-obj-prop-nested-array-yield-ident-invalid.js
index d158bf3355..25dad8173f 100644
--- a/test/language/expressions/assignment/dstr-obj-prop-nested-array-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-prop-nested-array-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { x: [x = yield] } = { x: [] };
diff --git a/test/language/expressions/assignment/dstr-obj-prop-nested-obj-invalid.js b/test/language/expressions/assignment/dstr-obj-prop-nested-obj-invalid.js
index c8cf3cdc87..9f227c52bb 100644
--- a/test/language/expressions/assignment/dstr-obj-prop-nested-obj-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-prop-nested-obj-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { x: { get x() {} } } = { x: {} };
diff --git a/test/language/expressions/assignment/dstr-obj-prop-nested-obj-yield-ident-invalid.js b/test/language/expressions/assignment/dstr-obj-prop-nested-obj-yield-ident-invalid.js
index 081d27b207..ba38b80b53 100644
--- a/test/language/expressions/assignment/dstr-obj-prop-nested-obj-yield-ident-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-prop-nested-obj-yield-ident-invalid.js
@@ -19,6 +19,6 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { x: { x = yield } } = { x: {} };
diff --git a/test/language/expressions/assignment/dstr-obj-rest-not-last-element-invalid.js b/test/language/expressions/assignment/dstr-obj-rest-not-last-element-invalid.js
index 39a84313ec..a3e103fefe 100644
--- a/test/language/expressions/assignment/dstr-obj-rest-not-last-element-invalid.js
+++ b/test/language/expressions/assignment/dstr-obj-rest-not-last-element-invalid.js
@@ -19,7 +19,7 @@ info: |
     4. Return the result of performing BindingInitialization for
        BindingPattern passing rval and undefined as arguments.
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var rest, b;
 
 0, {...rest, b} = {}
diff --git a/test/language/expressions/assignment/id-arguments-strict.js b/test/language/expressions/assignment/id-arguments-strict.js
index d07eebf7de..200408aec3 100644
--- a/test/language/expressions/assignment/id-arguments-strict.js
+++ b/test/language/expressions/assignment/id-arguments-strict.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (arguments) = 20;
diff --git a/test/language/expressions/assignment/id-eval-strict.js b/test/language/expressions/assignment/id-eval-strict.js
index 2c5940dc7b..e95b10c29c 100644
--- a/test/language/expressions/assignment/id-eval-strict.js
+++ b/test/language/expressions/assignment/id-eval-strict.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (eval) = 20;
diff --git a/test/language/expressions/assignment/non-simple-target.js b/test/language/expressions/assignment/non-simple-target.js
index 3389a7917f..15ff257097 100644
--- a/test/language/expressions/assignment/non-simple-target.js
+++ b/test/language/expressions/assignment/non-simple-target.js
@@ -13,6 +13,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 = 1;
diff --git a/test/language/expressions/assignment/target-boolean.js b/test/language/expressions/assignment/target-boolean.js
index 241da1fc0a..aeff77631b 100644
--- a/test/language/expressions/assignment/target-boolean.js
+++ b/test/language/expressions/assignment/target-boolean.js
@@ -18,6 +18,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 true = 42;
diff --git a/test/language/expressions/assignment/target-cover-newtarget.js b/test/language/expressions/assignment/target-cover-newtarget.js
index dfebb7b644..fbf00915a7 100644
--- a/test/language/expressions/assignment/target-cover-newtarget.js
+++ b/test/language/expressions/assignment/target-cover-newtarget.js
@@ -24,7 +24,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   (new.target) = 1;
diff --git a/test/language/expressions/assignment/target-cover-yieldexpr.js b/test/language/expressions/assignment/target-cover-yieldexpr.js
index 1001db1a7d..6776026aca 100644
--- a/test/language/expressions/assignment/target-cover-yieldexpr.js
+++ b/test/language/expressions/assignment/target-cover-yieldexpr.js
@@ -26,7 +26,7 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   (yield) = 1;
diff --git a/test/language/expressions/assignment/target-newtarget.js b/test/language/expressions/assignment/target-newtarget.js
index f6dc7c854a..30deed8c79 100644
--- a/test/language/expressions/assignment/target-newtarget.js
+++ b/test/language/expressions/assignment/target-newtarget.js
@@ -24,7 +24,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   new.target = 1;
diff --git a/test/language/expressions/assignment/target-null.js b/test/language/expressions/assignment/target-null.js
index 3bf1797550..572b38aba3 100644
--- a/test/language/expressions/assignment/target-null.js
+++ b/test/language/expressions/assignment/target-null.js
@@ -18,6 +18,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 null = 42;
diff --git a/test/language/expressions/assignment/target-number.js b/test/language/expressions/assignment/target-number.js
index a529528ce6..3ee507bef9 100644
--- a/test/language/expressions/assignment/target-number.js
+++ b/test/language/expressions/assignment/target-number.js
@@ -18,6 +18,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 42 = 42;
diff --git a/test/language/expressions/assignment/target-string.js b/test/language/expressions/assignment/target-string.js
index fe71b23d7c..9467f36011 100644
--- a/test/language/expressions/assignment/target-string.js
+++ b/test/language/expressions/assignment/target-string.js
@@ -18,6 +18,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 'x' = 42;
diff --git a/test/language/expressions/async-arrow-function/await-as-binding-identifier-escaped.js b/test/language/expressions/async-arrow-function/await-as-binding-identifier-escaped.js
index f2a5314287..d404b571b4 100644
--- a/test/language/expressions/async-arrow-function/await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/async-arrow-function/await-as-binding-identifier-escaped.js
@@ -26,7 +26,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async() => {
diff --git a/test/language/expressions/async-arrow-function/await-as-binding-identifier.js b/test/language/expressions/async-arrow-function/await-as-binding-identifier.js
index 7d9c3adeed..e4aff829ce 100644
--- a/test/language/expressions/async-arrow-function/await-as-binding-identifier.js
+++ b/test/language/expressions/async-arrow-function/await-as-binding-identifier.js
@@ -26,7 +26,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async() => {
diff --git a/test/language/expressions/async-arrow-function/await-as-identifier-reference-escaped.js b/test/language/expressions/async-arrow-function/await-as-identifier-reference-escaped.js
index ed8b9f276c..b99e0ff823 100644
--- a/test/language/expressions/async-arrow-function/await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/async-arrow-function/await-as-identifier-reference-escaped.js
@@ -26,7 +26,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async() => {
diff --git a/test/language/expressions/async-arrow-function/await-as-identifier-reference.js b/test/language/expressions/async-arrow-function/await-as-identifier-reference.js
index 44942cdfdc..ff0a2b590a 100644
--- a/test/language/expressions/async-arrow-function/await-as-identifier-reference.js
+++ b/test/language/expressions/async-arrow-function/await-as-identifier-reference.js
@@ -26,7 +26,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async() => {
diff --git a/test/language/expressions/async-arrow-function/await-as-label-identifier-escaped.js b/test/language/expressions/async-arrow-function/await-as-label-identifier-escaped.js
index 8f03c7b941..892f3a8401 100644
--- a/test/language/expressions/async-arrow-function/await-as-label-identifier-escaped.js
+++ b/test/language/expressions/async-arrow-function/await-as-label-identifier-escaped.js
@@ -26,7 +26,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async() => {
diff --git a/test/language/expressions/async-arrow-function/await-as-label-identifier.js b/test/language/expressions/async-arrow-function/await-as-label-identifier.js
index 20cfa203f6..0285081f99 100644
--- a/test/language/expressions/async-arrow-function/await-as-label-identifier.js
+++ b/test/language/expressions/async-arrow-function/await-as-label-identifier.js
@@ -26,7 +26,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async() => {
diff --git a/test/language/expressions/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js b/test/language/expressions/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js
index 4ae4f3f2bc..ace0fee5a4 100644
--- a/test/language/expressions/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js
+++ b/test/language/expressions/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(a = await => {}) => {};
diff --git a/test/language/expressions/async-arrow-function/await-as-param-nested-arrow-body-position.js b/test/language/expressions/async-arrow-function/await-as-param-nested-arrow-body-position.js
index 5739f7d2af..61880e92be 100644
--- a/test/language/expressions/async-arrow-function/await-as-param-nested-arrow-body-position.js
+++ b/test/language/expressions/async-arrow-function/await-as-param-nested-arrow-body-position.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async() => { (a = await/r/g) => {} };
diff --git a/test/language/expressions/async-arrow-function/await-as-param-nested-arrow-parameter-position.js b/test/language/expressions/async-arrow-function/await-as-param-nested-arrow-parameter-position.js
index ebbc8eda49..c9e750fe5d 100644
--- a/test/language/expressions/async-arrow-function/await-as-param-nested-arrow-parameter-position.js
+++ b/test/language/expressions/async-arrow-function/await-as-param-nested-arrow-parameter-position.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(a = (await) => {}) => {};
diff --git a/test/language/expressions/async-arrow-function/await-as-param-rest-nested-arrow-parameter-position.js b/test/language/expressions/async-arrow-function/await-as-param-rest-nested-arrow-parameter-position.js
index 395a92c5ff..9373e6efa5 100644
--- a/test/language/expressions/async-arrow-function/await-as-param-rest-nested-arrow-parameter-position.js
+++ b/test/language/expressions/async-arrow-function/await-as-param-rest-nested-arrow-parameter-position.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(a = (...await) => {}) => {};
diff --git a/test/language/expressions/async-arrow-function/dflt-params-duplicates.js b/test/language/expressions/async-arrow-function/dflt-params-duplicates.js
index 213b728b39..cf9c279a75 100644
--- a/test/language/expressions/async-arrow-function/dflt-params-duplicates.js
+++ b/test/language/expressions/async-arrow-function/dflt-params-duplicates.js
@@ -44,7 +44,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async (x = 0, x) => {
diff --git a/test/language/expressions/async-arrow-function/dflt-params-rest.js b/test/language/expressions/async-arrow-function/dflt-params-rest.js
index 77b7798717..0c1476cc80 100644
--- a/test/language/expressions/async-arrow-function/dflt-params-rest.js
+++ b/test/language/expressions/async-arrow-function/dflt-params-rest.js
@@ -48,7 +48,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async (...x = []) => {
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-NSPL-with-USD.js b/test/language/expressions/async-arrow-function/early-errors-arrow-NSPL-with-USD.js
index 5693b08ab3..8d3e5af18a 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-NSPL-with-USD.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-NSPL-with-USD.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async (x = 1) => {"use strict"}
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-arguments-in-formal-parameters.js b/test/language/expressions/async-arrow-function/early-errors-arrow-arguments-in-formal-parameters.js
index 379547bd91..2128deff65 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-arguments-in-formal-parameters.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-arguments-in-formal-parameters.js
@@ -11,7 +11,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(arguments) => {  }
 
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-await-in-formals-default.js b/test/language/expressions/async-arrow-function/early-errors-arrow-await-in-formals-default.js
index 18723b591e..aa8a71d15b 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-await-in-formals-default.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-await-in-formals-default.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 async(x = await) => {  }
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-await-in-formals.js b/test/language/expressions/async-arrow-function/early-errors-arrow-await-in-formals.js
index b9eeacdba1..8432729069 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-await-in-formals.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-await-in-formals.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 async(await) => {  }
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-body-contains-super-call.js b/test/language/expressions/async-arrow-function/early-errors-arrow-body-contains-super-call.js
index 77c567c067..9001b5ee70 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-body-contains-super-call.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-body-contains-super-call.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(foo) => { super() };
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-body-contains-super-property.js b/test/language/expressions/async-arrow-function/early-errors-arrow-body-contains-super-property.js
index f932b84a84..7e2c032ebc 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-body-contains-super-property.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-body-contains-super-property.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(foo) => { super.prop };
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-duplicate-parameters.js b/test/language/expressions/async-arrow-function/early-errors-arrow-duplicate-parameters.js
index 53a7b19cc5..b0be62af49 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-duplicate-parameters.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-duplicate-parameters.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(a, a) => { }
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-eval-in-formal-parameters.js b/test/language/expressions/async-arrow-function/early-errors-arrow-eval-in-formal-parameters.js
index 0d5a621c1e..26886e0384 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-eval-in-formal-parameters.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-eval-in-formal-parameters.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(eval) => {  }
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-formals-body-duplicate.js b/test/language/expressions/async-arrow-function/early-errors-arrow-formals-body-duplicate.js
index ed8beaacd1..d469dc86d3 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-formals-body-duplicate.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-formals-body-duplicate.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(bar) => { let bar; }
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-formals-contains-super-call.js b/test/language/expressions/async-arrow-function/early-errors-arrow-formals-contains-super-call.js
index f61bf23ac7..ec3111f347 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-formals-contains-super-call.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-formals-contains-super-call.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async(foo = super()) => {}
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-formals-contains-super-property.js b/test/language/expressions/async-arrow-function/early-errors-arrow-formals-contains-super-property.js
index 69659ce0be..be0dd9ef25 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-formals-contains-super-property.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-formals-contains-super-property.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async (foo = super.foo) => { }
diff --git a/test/language/expressions/async-arrow-function/early-errors-arrow-formals-lineterminator.js b/test/language/expressions/async-arrow-function/early-errors-arrow-formals-lineterminator.js
index ffde0167bf..3267b38650 100644
--- a/test/language/expressions/async-arrow-function/early-errors-arrow-formals-lineterminator.js
+++ b/test/language/expressions/async-arrow-function/early-errors-arrow-formals-lineterminator.js
@@ -27,7 +27,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async
 (foo) => { }
diff --git a/test/language/expressions/async-arrow-function/escaped-async.js b/test/language/expressions/async-arrow-function/escaped-async.js
index 0c2ca31388..c983f97a61 100644
--- a/test/language/expressions/async-arrow-function/escaped-async.js
+++ b/test/language/expressions/async-arrow-function/escaped-async.js
@@ -19,6 +19,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 \u0061sync () => {}
diff --git a/test/language/expressions/async-arrow-function/rest-params-trailing-comma-early-error.js b/test/language/expressions/async-arrow-function/rest-params-trailing-comma-early-error.js
index e181efc7d5..7dd44158cc 100644
--- a/test/language/expressions/async-arrow-function/rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/async-arrow-function/rest-params-trailing-comma-early-error.js
@@ -40,7 +40,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async (...a,) => {
diff --git a/test/language/expressions/async-function/await-as-binding-identifier-escaped.js b/test/language/expressions/async-function/await-as-binding-identifier-escaped.js
index a433696062..dc8db80267 100644
--- a/test/language/expressions/async-function/await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/async-function/await-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function () {
diff --git a/test/language/expressions/async-function/await-as-binding-identifier.js b/test/language/expressions/async-function/await-as-binding-identifier.js
index 550ba38596..a166450ea8 100644
--- a/test/language/expressions/async-function/await-as-binding-identifier.js
+++ b/test/language/expressions/async-function/await-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function () {
diff --git a/test/language/expressions/async-function/await-as-identifier-reference-escaped.js b/test/language/expressions/async-function/await-as-identifier-reference-escaped.js
index 4b2592cd8d..9c2c413207 100644
--- a/test/language/expressions/async-function/await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/async-function/await-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function () {
diff --git a/test/language/expressions/async-function/await-as-identifier-reference.js b/test/language/expressions/async-function/await-as-identifier-reference.js
index 3dcfd75bde..21a968a42b 100644
--- a/test/language/expressions/async-function/await-as-identifier-reference.js
+++ b/test/language/expressions/async-function/await-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function () {
diff --git a/test/language/expressions/async-function/await-as-label-identifier-escaped.js b/test/language/expressions/async-function/await-as-label-identifier-escaped.js
index 3948a33dbb..f2ce63756e 100644
--- a/test/language/expressions/async-function/await-as-label-identifier-escaped.js
+++ b/test/language/expressions/async-function/await-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function () {
diff --git a/test/language/expressions/async-function/await-as-label-identifier.js b/test/language/expressions/async-function/await-as-label-identifier.js
index d0b2dac398..2c10c96d91 100644
--- a/test/language/expressions/async-function/await-as-label-identifier.js
+++ b/test/language/expressions/async-function/await-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function () {
diff --git a/test/language/expressions/async-function/early-errors-expression-NSPL-with-USD.js b/test/language/expressions/async-function/early-errors-expression-NSPL-with-USD.js
index 25bb9eb55d..09592f8bd6 100644
--- a/test/language/expressions/async-function/early-errors-expression-NSPL-with-USD.js
+++ b/test/language/expressions/async-function/early-errors-expression-NSPL-with-USD.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function (x = 1) {"use strict"})
diff --git a/test/language/expressions/async-function/early-errors-expression-binding-identifier-arguments.js b/test/language/expressions/async-function/early-errors-expression-binding-identifier-arguments.js
index 1f0c9e971b..5703a8b559 100644
--- a/test/language/expressions/async-function/early-errors-expression-binding-identifier-arguments.js
+++ b/test/language/expressions/async-function/early-errors-expression-binding-identifier-arguments.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 (async function arguments () {  })
 
diff --git a/test/language/expressions/async-function/early-errors-expression-binding-identifier-eval.js b/test/language/expressions/async-function/early-errors-expression-binding-identifier-eval.js
index 5d6a3a6057..dc49dcf7fb 100644
--- a/test/language/expressions/async-function/early-errors-expression-binding-identifier-eval.js
+++ b/test/language/expressions/async-function/early-errors-expression-binding-identifier-eval.js
@@ -12,5 +12,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 (async function eval () { })
diff --git a/test/language/expressions/async-function/early-errors-expression-body-contains-super-call.js b/test/language/expressions/async-function/early-errors-expression-body-contains-super-call.js
index f00f351984..e30328e92b 100644
--- a/test/language/expressions/async-function/early-errors-expression-body-contains-super-call.js
+++ b/test/language/expressions/async-function/early-errors-expression-body-contains-super-call.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function foo (foo) { super() })
diff --git a/test/language/expressions/async-function/early-errors-expression-body-contains-super-property.js b/test/language/expressions/async-function/early-errors-expression-body-contains-super-property.js
index 718ddfb515..ce7162c3f9 100644
--- a/test/language/expressions/async-function/early-errors-expression-body-contains-super-property.js
+++ b/test/language/expressions/async-function/early-errors-expression-body-contains-super-property.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function foo (foo) { super.prop });
 
diff --git a/test/language/expressions/async-function/early-errors-expression-eval-in-formal-parameters.js b/test/language/expressions/async-function/early-errors-expression-eval-in-formal-parameters.js
index fcb622c09c..f6fcb7c318 100644
--- a/test/language/expressions/async-function/early-errors-expression-eval-in-formal-parameters.js
+++ b/test/language/expressions/async-function/early-errors-expression-eval-in-formal-parameters.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function foo (eval) {  })
diff --git a/test/language/expressions/async-function/early-errors-expression-formals-body-duplicate.js b/test/language/expressions/async-function/early-errors-expression-formals-body-duplicate.js
index 46d6d345ed..50bffdeec6 100644
--- a/test/language/expressions/async-function/early-errors-expression-formals-body-duplicate.js
+++ b/test/language/expressions/async-function/early-errors-expression-formals-body-duplicate.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function foo (bar) { let bar; });
diff --git a/test/language/expressions/async-function/early-errors-expression-formals-contains-super-call.js b/test/language/expressions/async-function/early-errors-expression-formals-contains-super-call.js
index 9b830f26b0..1d8f3fdc9a 100644
--- a/test/language/expressions/async-function/early-errors-expression-formals-contains-super-call.js
+++ b/test/language/expressions/async-function/early-errors-expression-formals-contains-super-call.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function foo (foo = super()) { var bar; });
diff --git a/test/language/expressions/async-function/early-errors-expression-formals-contains-super-property.js b/test/language/expressions/async-function/early-errors-expression-formals-contains-super-property.js
index ee3fc71018..bec91bf3b4 100644
--- a/test/language/expressions/async-function/early-errors-expression-formals-contains-super-property.js
+++ b/test/language/expressions/async-function/early-errors-expression-formals-contains-super-property.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function foo (foo = super.foo) { var bar; });
diff --git a/test/language/expressions/async-function/early-errors-expression-not-simple-assignment-target.js b/test/language/expressions/async-function/early-errors-expression-not-simple-assignment-target.js
index 2149dd6e03..f5127c3181 100644
--- a/test/language/expressions/async-function/early-errors-expression-not-simple-assignment-target.js
+++ b/test/language/expressions/async-function/early-errors-expression-not-simple-assignment-target.js
@@ -11,6 +11,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function foo() { } = 1)
diff --git a/test/language/expressions/async-function/escaped-async.js b/test/language/expressions/async-function/escaped-async.js
index 33c1992dda..dade9efa8d 100644
--- a/test/language/expressions/async-function/escaped-async.js
+++ b/test/language/expressions/async-function/escaped-async.js
@@ -19,6 +19,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void \u0061sync function f(){}
diff --git a/test/language/expressions/async-function/named-await-as-binding-identifier-escaped.js b/test/language/expressions/async-function/named-await-as-binding-identifier-escaped.js
index d3e62a70a7..8a180d5350 100644
--- a/test/language/expressions/async-function/named-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/async-function/named-await-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function fn() {
diff --git a/test/language/expressions/async-function/named-await-as-binding-identifier.js b/test/language/expressions/async-function/named-await-as-binding-identifier.js
index c9d150c086..08b9daf545 100644
--- a/test/language/expressions/async-function/named-await-as-binding-identifier.js
+++ b/test/language/expressions/async-function/named-await-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function fn() {
diff --git a/test/language/expressions/async-function/named-await-as-identifier-reference-escaped.js b/test/language/expressions/async-function/named-await-as-identifier-reference-escaped.js
index ae2db3eaca..b9aa4a3df9 100644
--- a/test/language/expressions/async-function/named-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/async-function/named-await-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function fn() {
diff --git a/test/language/expressions/async-function/named-await-as-identifier-reference.js b/test/language/expressions/async-function/named-await-as-identifier-reference.js
index 9a028c3ced..5989b27b50 100644
--- a/test/language/expressions/async-function/named-await-as-identifier-reference.js
+++ b/test/language/expressions/async-function/named-await-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function fn() {
diff --git a/test/language/expressions/async-function/named-await-as-label-identifier-escaped.js b/test/language/expressions/async-function/named-await-as-label-identifier-escaped.js
index a38c08f016..2903368f09 100644
--- a/test/language/expressions/async-function/named-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/async-function/named-await-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function fn() {
diff --git a/test/language/expressions/async-function/named-await-as-label-identifier.js b/test/language/expressions/async-function/named-await-as-label-identifier.js
index ab2dd3105c..5ed1525fdb 100644
--- a/test/language/expressions/async-function/named-await-as-label-identifier.js
+++ b/test/language/expressions/async-function/named-await-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var fn = async function fn() {
diff --git a/test/language/expressions/async-function/named-dflt-params-duplicates.js b/test/language/expressions/async-function/named-dflt-params-duplicates.js
index 798c8ca9f6..6449eb2b25 100644
--- a/test/language/expressions/async-function/named-dflt-params-duplicates.js
+++ b/test/language/expressions/async-function/named-dflt-params-duplicates.js
@@ -30,7 +30,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async function f(x = 0, x) {
diff --git a/test/language/expressions/async-function/named-dflt-params-rest.js b/test/language/expressions/async-function/named-dflt-params-rest.js
index 01ff74b8db..69960bb7f8 100644
--- a/test/language/expressions/async-function/named-dflt-params-rest.js
+++ b/test/language/expressions/async-function/named-dflt-params-rest.js
@@ -34,7 +34,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async function f(...x = []) {
diff --git a/test/language/expressions/async-function/named-rest-params-trailing-comma-early-error.js b/test/language/expressions/async-function/named-rest-params-trailing-comma-early-error.js
index 940e262266..c26b11219a 100644
--- a/test/language/expressions/async-function/named-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/async-function/named-rest-params-trailing-comma-early-error.js
@@ -27,7 +27,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async function f(...a,) {
diff --git a/test/language/expressions/async-function/nameless-dflt-params-duplicates.js b/test/language/expressions/async-function/nameless-dflt-params-duplicates.js
index df1c030e15..8ec5eb7d8f 100644
--- a/test/language/expressions/async-function/nameless-dflt-params-duplicates.js
+++ b/test/language/expressions/async-function/nameless-dflt-params-duplicates.js
@@ -30,7 +30,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async function(x = 0, x) {
diff --git a/test/language/expressions/async-function/nameless-dflt-params-rest.js b/test/language/expressions/async-function/nameless-dflt-params-rest.js
index c2f76e62ce..805fca8e4c 100644
--- a/test/language/expressions/async-function/nameless-dflt-params-rest.js
+++ b/test/language/expressions/async-function/nameless-dflt-params-rest.js
@@ -34,7 +34,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async function(...x = []) {
diff --git a/test/language/expressions/async-function/nameless-rest-params-trailing-comma-early-error.js b/test/language/expressions/async-function/nameless-rest-params-trailing-comma-early-error.js
index 1c2f863ee2..b9c8ec05f5 100644
--- a/test/language/expressions/async-function/nameless-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/async-function/nameless-rest-params-trailing-comma-early-error.js
@@ -27,7 +27,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 (async function(...a,) {
diff --git a/test/language/expressions/async-generator/await-as-binding-identifier-escaped.js b/test/language/expressions/async-generator/await-as-binding-identifier-escaped.js
index 73f60f9335..038271a408 100644
--- a/test/language/expressions/async-generator/await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/async-generator/await-as-binding-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/await-as-binding-identifier.js b/test/language/expressions/async-generator/await-as-binding-identifier.js
index 0af2aa7882..af4987861a 100644
--- a/test/language/expressions/async-generator/await-as-binding-identifier.js
+++ b/test/language/expressions/async-generator/await-as-binding-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/await-as-identifier-reference-escaped.js b/test/language/expressions/async-generator/await-as-identifier-reference-escaped.js
index 52eabc0c3d..e1712a87ad 100644
--- a/test/language/expressions/async-generator/await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/async-generator/await-as-identifier-reference-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/await-as-identifier-reference.js b/test/language/expressions/async-generator/await-as-identifier-reference.js
index acc91d097b..932158dafe 100644
--- a/test/language/expressions/async-generator/await-as-identifier-reference.js
+++ b/test/language/expressions/async-generator/await-as-identifier-reference.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/await-as-label-identifier-escaped.js b/test/language/expressions/async-generator/await-as-label-identifier-escaped.js
index c5e600a364..99007ca3a8 100644
--- a/test/language/expressions/async-generator/await-as-label-identifier-escaped.js
+++ b/test/language/expressions/async-generator/await-as-label-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/await-as-label-identifier.js b/test/language/expressions/async-generator/await-as-label-identifier.js
index 572865e61a..09b1030d3b 100644
--- a/test/language/expressions/async-generator/await-as-label-identifier.js
+++ b/test/language/expressions/async-generator/await-as-label-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/dflt-params-duplicates.js b/test/language/expressions/async-generator/dflt-params-duplicates.js
index e1b58f2b5f..ec3299c485 100644
--- a/test/language/expressions/async-generator/dflt-params-duplicates.js
+++ b/test/language/expressions/async-generator/dflt-params-duplicates.js
@@ -33,7 +33,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 0, async function*(x = 0, x) {
diff --git a/test/language/expressions/async-generator/dflt-params-rest.js b/test/language/expressions/async-generator/dflt-params-rest.js
index 5d017c4103..db46a380b3 100644
--- a/test/language/expressions/async-generator/dflt-params-rest.js
+++ b/test/language/expressions/async-generator/dflt-params-rest.js
@@ -37,7 +37,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 0, async function*(...x = []) {
diff --git a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-ary.js b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-ary.js
index 4b4d2e6cfc..1c85072dda 100644
--- a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-id.js b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-id.js
index 0911fbed2a..239b394835 100644
--- a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-obj.js b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-obj.js
index b0b67e5575..667d0ec45b 100644
--- a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-init-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-ary.js
index 444931d9e1..aca89e1807 100644
--- a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-id.js b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-id.js
index 00764e7fcb..0859ea2ddf 100644
--- a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-obj.js
index 93fe89a3da..1461ac3ea6 100644
--- a/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/async-generator/dstr-ary-ptrn-rest-not-final-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-ary.js
index 0aab7f0f40..0e88f4bda5 100644
--- a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-id.js
index 4439206e7a..f98c579f52 100644
--- a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-obj.js
index d83ec76619..4990efcde4 100644
--- a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-init-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-ary.js
index 623c6720b5..75f9c2594a 100644
--- a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-id.js
index 20a5dc65b0..79fb96db05 100644
--- a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-obj.js
index 3cde6b44a3..2c9058b160 100644
--- a/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/async-generator/dstr-dflt-ary-ptrn-rest-not-final-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-ary.js b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-ary.js
index ae0c5a1b1c..dafd821eff 100644
--- a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-id.js b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-id.js
index bd503077ff..fd88449706 100644
--- a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-obj.js b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-obj.js
index 78c4534843..155f8660c7 100644
--- a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-init-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-ary.js
index 5da0cd00b6..4343b42295 100644
--- a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-id.js b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-id.js
index 4f20ba0a15..2652fbbd33 100644
--- a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-obj.js
index 7de11feba3..bf673364c2 100644
--- a/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/async-generator/dstr-named-ary-ptrn-rest-not-final-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-ary.js
index 7e013d3b98..231b8a5416 100644
--- a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-id.js
index 89037a9643..ac6c910abd 100644
--- a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-obj.js
index 4e8314e92e..dbf6bf66ac 100644
--- a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-init-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-ary.js
index 6e6061682c..e35b08dcf4 100644
--- a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-id.js
index 320f6d5820..c3ca6e6c14 100644
--- a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-obj.js
index 979df62abb..16a43d786b 100644
--- a/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/async-generator/dstr-named-dflt-ary-ptrn-rest-not-final-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/early-errors-expression-NSPL-with-USD.js b/test/language/expressions/async-generator/early-errors-expression-NSPL-with-USD.js
index 6ab4d0ed86..caf0fb9962 100644
--- a/test/language/expressions/async-generator/early-errors-expression-NSPL-with-USD.js
+++ b/test/language/expressions/async-generator/early-errors-expression-NSPL-with-USD.js
@@ -13,6 +13,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(x = 1) {"use strict"});
diff --git a/test/language/expressions/async-generator/early-errors-expression-arguments-in-formal-parameters.js b/test/language/expressions/async-generator/early-errors-expression-arguments-in-formal-parameters.js
index 8633dd491c..877a4085fc 100644
--- a/test/language/expressions/async-generator/early-errors-expression-arguments-in-formal-parameters.js
+++ b/test/language/expressions/async-generator/early-errors-expression-arguments-in-formal-parameters.js
@@ -13,6 +13,6 @@ flags: [onlyStrict]
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(arguments) { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js b/test/language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js
index a51d95a266..2d409092f2 100644
--- a/test/language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js
+++ b/test/language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function* await() { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-binding-identifier-arguments.js b/test/language/expressions/async-generator/early-errors-expression-binding-identifier-arguments.js
index ee384e2164..d565550a27 100644
--- a/test/language/expressions/async-generator/early-errors-expression-binding-identifier-arguments.js
+++ b/test/language/expressions/async-generator/early-errors-expression-binding-identifier-arguments.js
@@ -14,6 +14,6 @@ flags: [onlyStrict]
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function* arguments() { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-binding-identifier-eval.js b/test/language/expressions/async-generator/early-errors-expression-binding-identifier-eval.js
index b86445c4b4..e65ed06819 100644
--- a/test/language/expressions/async-generator/early-errors-expression-binding-identifier-eval.js
+++ b/test/language/expressions/async-generator/early-errors-expression-binding-identifier-eval.js
@@ -14,6 +14,6 @@ flags: [onlyStrict]
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function* eval() { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-body-contains-super-call.js b/test/language/expressions/async-generator/early-errors-expression-body-contains-super-call.js
index 4c35b5b234..41811a1808 100644
--- a/test/language/expressions/async-generator/early-errors-expression-body-contains-super-call.js
+++ b/test/language/expressions/async-generator/early-errors-expression-body-contains-super-call.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*() { super(); });
diff --git a/test/language/expressions/async-generator/early-errors-expression-body-contains-super-property.js b/test/language/expressions/async-generator/early-errors-expression-body-contains-super-property.js
index 88c8c70179..98666f4865 100644
--- a/test/language/expressions/async-generator/early-errors-expression-body-contains-super-property.js
+++ b/test/language/expressions/async-generator/early-errors-expression-body-contains-super-property.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*() { super.prop; });
diff --git a/test/language/expressions/async-generator/early-errors-expression-eval-in-formal-parameters.js b/test/language/expressions/async-generator/early-errors-expression-eval-in-formal-parameters.js
index d70cb186a9..5d8192db6d 100644
--- a/test/language/expressions/async-generator/early-errors-expression-eval-in-formal-parameters.js
+++ b/test/language/expressions/async-generator/early-errors-expression-eval-in-formal-parameters.js
@@ -13,6 +13,6 @@ flags: [onlyStrict]
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(eval) { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-body-duplicate-const.js b/test/language/expressions/async-generator/early-errors-expression-formals-body-duplicate-const.js
index c5a936de3b..64f65269f4 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-body-duplicate-const.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-body-duplicate-const.js
@@ -16,6 +16,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(a) { const a = 0; });
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-body-duplicate-let.js b/test/language/expressions/async-generator/early-errors-expression-formals-body-duplicate-let.js
index e4737dd3d3..5571e7956b 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-body-duplicate-let.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-body-duplicate-let.js
@@ -13,6 +13,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(a) { let a; });
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-contains-await-expr.js b/test/language/expressions/async-generator/early-errors-expression-formals-contains-await-expr.js
index d89024c013..32d64984f6 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-contains-await-expr.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-contains-await-expr.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(x = await 1) { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-contains-await.js b/test/language/expressions/async-generator/early-errors-expression-formals-contains-await.js
index 6ba4c21f3b..f1831c99ad 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-contains-await.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-contains-await.js
@@ -13,6 +13,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(await) { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-contains-super-call.js b/test/language/expressions/async-generator/early-errors-expression-formals-contains-super-call.js
index bd8f71238b..816329952d 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-contains-super-call.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-contains-super-call.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(a = super()) { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-contains-super-property.js b/test/language/expressions/async-generator/early-errors-expression-formals-contains-super-property.js
index e8fd3f111a..906945bd3c 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-contains-super-property.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-contains-super-property.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(a = super.prop) { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield-expr.js b/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield-expr.js
index 2873a2a3e6..60add8636d 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield-expr.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield-expr.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(x = yield) { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield.js b/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield.js
index a0aee6cb08..6eb132382c 100644
--- a/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield.js
+++ b/test/language/expressions/async-generator/early-errors-expression-formals-contains-yield.js
@@ -13,6 +13,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*(yield) { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-label-name-await.js b/test/language/expressions/async-generator/early-errors-expression-label-name-await.js
index f503e9332a..6b74945cec 100644
--- a/test/language/expressions/async-generator/early-errors-expression-label-name-await.js
+++ b/test/language/expressions/async-generator/early-errors-expression-label-name-await.js
@@ -17,7 +17,7 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*() {
   await: 1;
diff --git a/test/language/expressions/async-generator/early-errors-expression-label-name-yield.js b/test/language/expressions/async-generator/early-errors-expression-label-name-yield.js
index 2308826b49..bc79529c71 100644
--- a/test/language/expressions/async-generator/early-errors-expression-label-name-yield.js
+++ b/test/language/expressions/async-generator/early-errors-expression-label-name-yield.js
@@ -19,7 +19,7 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*() {
   yield: 1;
diff --git a/test/language/expressions/async-generator/early-errors-expression-not-simple-assignment-target.js b/test/language/expressions/async-generator/early-errors-expression-not-simple-assignment-target.js
index cb44f8606a..1e9b3563dc 100644
--- a/test/language/expressions/async-generator/early-errors-expression-not-simple-assignment-target.js
+++ b/test/language/expressions/async-generator/early-errors-expression-not-simple-assignment-target.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*() { } = 1);
diff --git a/test/language/expressions/async-generator/early-errors-expression-yield-as-function-binding-identifier.js b/test/language/expressions/async-generator/early-errors-expression-yield-as-function-binding-identifier.js
index 6cb888cceb..3101d8f0dc 100644
--- a/test/language/expressions/async-generator/early-errors-expression-yield-as-function-binding-identifier.js
+++ b/test/language/expressions/async-generator/early-errors-expression-yield-as-function-binding-identifier.js
@@ -12,6 +12,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function* yield() { });
diff --git a/test/language/expressions/async-generator/early-errors-expression-yield-star-after-newline.js b/test/language/expressions/async-generator/early-errors-expression-yield-star-after-newline.js
index 30578a598a..54fe753af9 100644
--- a/test/language/expressions/async-generator/early-errors-expression-yield-star-after-newline.js
+++ b/test/language/expressions/async-generator/early-errors-expression-yield-star-after-newline.js
@@ -12,7 +12,7 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (async function*() {
   yield
diff --git a/test/language/expressions/async-generator/escaped-async.js b/test/language/expressions/async-generator/escaped-async.js
index 1860e93a65..40b79f4372 100644
--- a/test/language/expressions/async-generator/escaped-async.js
+++ b/test/language/expressions/async-generator/escaped-async.js
@@ -19,6 +19,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void \u0061sync function* f(){};
diff --git a/test/language/expressions/async-generator/named-await-as-binding-identifier-escaped.js b/test/language/expressions/async-generator/named-await-as-binding-identifier-escaped.js
index 3cb5df3255..c33c564c72 100644
--- a/test/language/expressions/async-generator/named-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/async-generator/named-await-as-binding-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-await-as-binding-identifier.js b/test/language/expressions/async-generator/named-await-as-binding-identifier.js
index 7719a0315f..cf6bc24efe 100644
--- a/test/language/expressions/async-generator/named-await-as-binding-identifier.js
+++ b/test/language/expressions/async-generator/named-await-as-binding-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-await-as-identifier-reference-escaped.js b/test/language/expressions/async-generator/named-await-as-identifier-reference-escaped.js
index 050ae2b31e..9519f37ff6 100644
--- a/test/language/expressions/async-generator/named-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/async-generator/named-await-as-identifier-reference-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-await-as-identifier-reference.js b/test/language/expressions/async-generator/named-await-as-identifier-reference.js
index 7c5385bd6c..189b8156d0 100644
--- a/test/language/expressions/async-generator/named-await-as-identifier-reference.js
+++ b/test/language/expressions/async-generator/named-await-as-identifier-reference.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-await-as-label-identifier-escaped.js b/test/language/expressions/async-generator/named-await-as-label-identifier-escaped.js
index 5d57240f85..6baafd782f 100644
--- a/test/language/expressions/async-generator/named-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/async-generator/named-await-as-label-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-await-as-label-identifier.js b/test/language/expressions/async-generator/named-await-as-label-identifier.js
index 0c51ff132d..a5474582ab 100644
--- a/test/language/expressions/async-generator/named-await-as-label-identifier.js
+++ b/test/language/expressions/async-generator/named-await-as-label-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-dflt-params-duplicates.js b/test/language/expressions/async-generator/named-dflt-params-duplicates.js
index 80b742aa5d..eeb00f6416 100644
--- a/test/language/expressions/async-generator/named-dflt-params-duplicates.js
+++ b/test/language/expressions/async-generator/named-dflt-params-duplicates.js
@@ -33,7 +33,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 0, async function* g(x = 0, x) {
diff --git a/test/language/expressions/async-generator/named-dflt-params-rest.js b/test/language/expressions/async-generator/named-dflt-params-rest.js
index 10dea453d9..f4993d67b2 100644
--- a/test/language/expressions/async-generator/named-dflt-params-rest.js
+++ b/test/language/expressions/async-generator/named-dflt-params-rest.js
@@ -37,7 +37,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 0, async function* g(...x = []) {
diff --git a/test/language/expressions/async-generator/named-rest-params-trailing-comma-early-error.js b/test/language/expressions/async-generator/named-rest-params-trailing-comma-early-error.js
index aa13c02aac..49a9d85dff 100644
--- a/test/language/expressions/async-generator/named-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/async-generator/named-rest-params-trailing-comma-early-error.js
@@ -30,7 +30,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 0, async function* g(...a,) {
diff --git a/test/language/expressions/async-generator/named-yield-as-binding-identifier-escaped.js b/test/language/expressions/async-generator/named-yield-as-binding-identifier-escaped.js
index 676ff9dc63..87984b9438 100644
--- a/test/language/expressions/async-generator/named-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/async-generator/named-yield-as-binding-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-yield-as-binding-identifier.js b/test/language/expressions/async-generator/named-yield-as-binding-identifier.js
index 62196595ce..457a8354a1 100644
--- a/test/language/expressions/async-generator/named-yield-as-binding-identifier.js
+++ b/test/language/expressions/async-generator/named-yield-as-binding-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-yield-as-identifier-reference-escaped.js b/test/language/expressions/async-generator/named-yield-as-identifier-reference-escaped.js
index dd715dbe6f..b7770f1e56 100644
--- a/test/language/expressions/async-generator/named-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/async-generator/named-yield-as-identifier-reference-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-yield-as-identifier-reference.js b/test/language/expressions/async-generator/named-yield-as-identifier-reference.js
index e9e942ed25..507b355665 100644
--- a/test/language/expressions/async-generator/named-yield-as-identifier-reference.js
+++ b/test/language/expressions/async-generator/named-yield-as-identifier-reference.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-yield-as-label-identifier-escaped.js b/test/language/expressions/async-generator/named-yield-as-label-identifier-escaped.js
index d629755267..777dad4b5a 100644
--- a/test/language/expressions/async-generator/named-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/async-generator/named-yield-as-label-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-yield-as-label-identifier.js b/test/language/expressions/async-generator/named-yield-as-label-identifier.js
index 2769c40401..9ac7003916 100644
--- a/test/language/expressions/async-generator/named-yield-as-label-identifier.js
+++ b/test/language/expressions/async-generator/named-yield-as-label-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *g() {
diff --git a/test/language/expressions/async-generator/named-yield-identifier-spread-strict.js b/test/language/expressions/async-generator/named-yield-identifier-spread-strict.js
index d35d29849e..9d256450a8 100644
--- a/test/language/expressions/async-generator/named-yield-identifier-spread-strict.js
+++ b/test/language/expressions/async-generator/named-yield-identifier-spread-strict.js
@@ -24,7 +24,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/named-yield-identifier-strict.js b/test/language/expressions/async-generator/named-yield-identifier-strict.js
index 83e2f0c725..87910c143f 100644
--- a/test/language/expressions/async-generator/named-yield-identifier-strict.js
+++ b/test/language/expressions/async-generator/named-yield-identifier-strict.js
@@ -17,7 +17,7 @@ info: |
         AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/rest-params-trailing-comma-early-error.js b/test/language/expressions/async-generator/rest-params-trailing-comma-early-error.js
index e8ca5ab253..77cb356e14 100644
--- a/test/language/expressions/async-generator/rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/async-generator/rest-params-trailing-comma-early-error.js
@@ -30,7 +30,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 0, async function*(...a,) {
diff --git a/test/language/expressions/async-generator/yield-as-binding-identifier-escaped.js b/test/language/expressions/async-generator/yield-as-binding-identifier-escaped.js
index 57be61d6b8..4395fba79b 100644
--- a/test/language/expressions/async-generator/yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/async-generator/yield-as-binding-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/yield-as-binding-identifier.js b/test/language/expressions/async-generator/yield-as-binding-identifier.js
index 5a19adbc81..2625bea6f5 100644
--- a/test/language/expressions/async-generator/yield-as-binding-identifier.js
+++ b/test/language/expressions/async-generator/yield-as-binding-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/yield-as-identifier-reference-escaped.js b/test/language/expressions/async-generator/yield-as-identifier-reference-escaped.js
index 24f8afcf09..63415920ef 100644
--- a/test/language/expressions/async-generator/yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/async-generator/yield-as-identifier-reference-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/yield-as-identifier-reference.js b/test/language/expressions/async-generator/yield-as-identifier-reference.js
index e474f3d4e8..06f2ee351e 100644
--- a/test/language/expressions/async-generator/yield-as-identifier-reference.js
+++ b/test/language/expressions/async-generator/yield-as-identifier-reference.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/yield-as-label-identifier-escaped.js b/test/language/expressions/async-generator/yield-as-label-identifier-escaped.js
index 6445560ee0..ebff741923 100644
--- a/test/language/expressions/async-generator/yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/async-generator/yield-as-label-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/yield-as-label-identifier.js b/test/language/expressions/async-generator/yield-as-label-identifier.js
index 2263a2b815..d44ea5a298 100644
--- a/test/language/expressions/async-generator/yield-as-label-identifier.js
+++ b/test/language/expressions/async-generator/yield-as-label-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var gen = async function *() {
diff --git a/test/language/expressions/async-generator/yield-identifier-spread-strict.js b/test/language/expressions/async-generator/yield-identifier-spread-strict.js
index 9e22688b57..dfd6f5db1f 100644
--- a/test/language/expressions/async-generator/yield-identifier-spread-strict.js
+++ b/test/language/expressions/async-generator/yield-identifier-spread-strict.js
@@ -24,7 +24,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/async-generator/yield-identifier-strict.js b/test/language/expressions/async-generator/yield-identifier-strict.js
index 4d58a85f2d..9654357dcb 100644
--- a/test/language/expressions/async-generator/yield-identifier-strict.js
+++ b/test/language/expressions/async-generator/yield-identifier-strict.js
@@ -17,7 +17,7 @@ info: |
         AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/await/await-BindingIdentifier-nested.js b/test/language/expressions/await/await-BindingIdentifier-nested.js
index a93ad462a9..c04b7a70d9 100644
--- a/test/language/expressions/await/await-BindingIdentifier-nested.js
+++ b/test/language/expressions/await/await-BindingIdentifier-nested.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo() {
   function await() {
diff --git a/test/language/expressions/await/early-errors-await-not-simple-assignment-target.js b/test/language/expressions/await/early-errors-await-not-simple-assignment-target.js
index 9d5790b2c8..7a6545e51c 100644
--- a/test/language/expressions/await/early-errors-await-not-simple-assignment-target.js
+++ b/test/language/expressions/await/early-errors-await-not-simple-assignment-target.js
@@ -11,7 +11,7 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo() {
   (await 1) = 1;
diff --git a/test/language/expressions/await/no-operand.js b/test/language/expressions/await/no-operand.js
index 557362c957..b08339a0d8 100644
--- a/test/language/expressions/await/no-operand.js
+++ b/test/language/expressions/await/no-operand.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo() {
   await;
diff --git a/test/language/expressions/call/S11.2.4_A1.3_T1.js b/test/language/expressions/call/S11.2.4_A1.3_T1.js
index 9c37a6c8b5..3f385d793d 100644
--- a/test/language/expressions/call/S11.2.4_A1.3_T1.js
+++ b/test/language/expressions/call/S11.2.4_A1.3_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f_arg() {
 }
diff --git a/test/language/expressions/class/async-gen-meth-dflt-params-duplicates.js b/test/language/expressions/class/async-gen-meth-dflt-params-duplicates.js
index 24514ece21..e67b9a9d1b 100644
--- a/test/language/expressions/class/async-gen-meth-dflt-params-duplicates.js
+++ b/test/language/expressions/class/async-gen-meth-dflt-params-duplicates.js
@@ -57,7 +57,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   async *method(x = 0, x) {
diff --git a/test/language/expressions/class/async-gen-meth-dflt-params-rest.js b/test/language/expressions/class/async-gen-meth-dflt-params-rest.js
index 63029754de..df1df48f07 100644
--- a/test/language/expressions/class/async-gen-meth-dflt-params-rest.js
+++ b/test/language/expressions/class/async-gen-meth-dflt-params-rest.js
@@ -61,7 +61,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   async *method(...x = []) {
diff --git a/test/language/expressions/class/async-gen-meth-rest-params-trailing-comma-early-error.js b/test/language/expressions/class/async-gen-meth-rest-params-trailing-comma-early-error.js
index 6a6f794426..34e57024f2 100644
--- a/test/language/expressions/class/async-gen-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/class/async-gen-meth-rest-params-trailing-comma-early-error.js
@@ -54,7 +54,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   async *method(...a,) {
diff --git a/test/language/expressions/class/async-gen-meth-static-dflt-params-duplicates.js b/test/language/expressions/class/async-gen-meth-static-dflt-params-duplicates.js
index 2c0542fd16..911e304d96 100644
--- a/test/language/expressions/class/async-gen-meth-static-dflt-params-duplicates.js
+++ b/test/language/expressions/class/async-gen-meth-static-dflt-params-duplicates.js
@@ -57,7 +57,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static async *method(x = 0, x) {
diff --git a/test/language/expressions/class/async-gen-meth-static-dflt-params-rest.js b/test/language/expressions/class/async-gen-meth-static-dflt-params-rest.js
index 7f51a76ee0..7d9c26c6bc 100644
--- a/test/language/expressions/class/async-gen-meth-static-dflt-params-rest.js
+++ b/test/language/expressions/class/async-gen-meth-static-dflt-params-rest.js
@@ -61,7 +61,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static async *method(...x = []) {
diff --git a/test/language/expressions/class/async-gen-meth-static-rest-params-trailing-comma-early-error.js b/test/language/expressions/class/async-gen-meth-static-rest-params-trailing-comma-early-error.js
index 05e5a07c67..b065ee9d9b 100644
--- a/test/language/expressions/class/async-gen-meth-static-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/class/async-gen-meth-static-rest-params-trailing-comma-early-error.js
@@ -54,7 +54,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static async *method(...a,) {
diff --git a/test/language/expressions/class/async-gen-method-await-as-binding-identifier-escaped.js b/test/language/expressions/class/async-gen-method-await-as-binding-identifier-escaped.js
index cbc3052bca..4ba5257f1f 100644
--- a/test/language/expressions/class/async-gen-method-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-method-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-await-as-binding-identifier.js b/test/language/expressions/class/async-gen-method-await-as-binding-identifier.js
index 8caa65787e..1d55d965fd 100644
--- a/test/language/expressions/class/async-gen-method-await-as-binding-identifier.js
+++ b/test/language/expressions/class/async-gen-method-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-await-as-identifier-reference-escaped.js b/test/language/expressions/class/async-gen-method-await-as-identifier-reference-escaped.js
index 072cc9770e..5e8112eabf 100644
--- a/test/language/expressions/class/async-gen-method-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-gen-method-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-await-as-identifier-reference.js b/test/language/expressions/class/async-gen-method-await-as-identifier-reference.js
index a15caa751f..cad0e83341 100644
--- a/test/language/expressions/class/async-gen-method-await-as-identifier-reference.js
+++ b/test/language/expressions/class/async-gen-method-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-await-as-label-identifier-escaped.js b/test/language/expressions/class/async-gen-method-await-as-label-identifier-escaped.js
index b79d980ff4..4820e91173 100644
--- a/test/language/expressions/class/async-gen-method-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-method-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-await-as-label-identifier.js b/test/language/expressions/class/async-gen-method-await-as-label-identifier.js
index f1c85d4f3f..d72782255d 100644
--- a/test/language/expressions/class/async-gen-method-await-as-label-identifier.js
+++ b/test/language/expressions/class/async-gen-method-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-await-as-binding-identifier-escaped.js b/test/language/expressions/class/async-gen-method-static-await-as-binding-identifier-escaped.js
index d6f7b67df7..95dd9b9a0c 100644
--- a/test/language/expressions/class/async-gen-method-static-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-method-static-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-await-as-binding-identifier.js b/test/language/expressions/class/async-gen-method-static-await-as-binding-identifier.js
index e100f5c46f..3dab50c615 100644
--- a/test/language/expressions/class/async-gen-method-static-await-as-binding-identifier.js
+++ b/test/language/expressions/class/async-gen-method-static-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-await-as-identifier-reference-escaped.js b/test/language/expressions/class/async-gen-method-static-await-as-identifier-reference-escaped.js
index fdbe1ddd6f..b07a4d8a8d 100644
--- a/test/language/expressions/class/async-gen-method-static-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-gen-method-static-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-await-as-identifier-reference.js b/test/language/expressions/class/async-gen-method-static-await-as-identifier-reference.js
index c7021b2910..309c184c70 100644
--- a/test/language/expressions/class/async-gen-method-static-await-as-identifier-reference.js
+++ b/test/language/expressions/class/async-gen-method-static-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-await-as-label-identifier-escaped.js b/test/language/expressions/class/async-gen-method-static-await-as-label-identifier-escaped.js
index 0f16c74041..4bffedd4e8 100644
--- a/test/language/expressions/class/async-gen-method-static-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-method-static-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-await-as-label-identifier.js b/test/language/expressions/class/async-gen-method-static-await-as-label-identifier.js
index 833f4ce2ca..ae8173afab 100644
--- a/test/language/expressions/class/async-gen-method-static-await-as-label-identifier.js
+++ b/test/language/expressions/class/async-gen-method-static-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-yield-as-binding-identifier-escaped.js b/test/language/expressions/class/async-gen-method-static-yield-as-binding-identifier-escaped.js
index 61f680a071..1dc57c85bb 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-yield-as-binding-identifier.js b/test/language/expressions/class/async-gen-method-static-yield-as-binding-identifier.js
index b2389169b5..80239d7cd7 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-as-binding-identifier.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-yield-as-identifier-reference-escaped.js b/test/language/expressions/class/async-gen-method-static-yield-as-identifier-reference-escaped.js
index 2d59c75e08..69a4ed10c9 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-yield-as-identifier-reference.js b/test/language/expressions/class/async-gen-method-static-yield-as-identifier-reference.js
index 5535c69318..5d119dbea9 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-as-identifier-reference.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-yield-as-label-identifier-escaped.js b/test/language/expressions/class/async-gen-method-static-yield-as-label-identifier-escaped.js
index b43d92d836..ed32e0fcb3 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-yield-as-label-identifier.js b/test/language/expressions/class/async-gen-method-static-yield-as-label-identifier.js
index 6e812829fe..f60a637fe7 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-as-label-identifier.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-static-yield-identifier-spread-strict.js b/test/language/expressions/class/async-gen-method-static-yield-identifier-spread-strict.js
index 5081edd3e1..d3332fb533 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-identifier-spread-strict.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/async-gen-method-static-yield-identifier-strict.js b/test/language/expressions/class/async-gen-method-static-yield-identifier-strict.js
index 6dd8cd3164..c84b09e28e 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-identifier-strict.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/async-gen-method-yield-as-binding-identifier-escaped.js b/test/language/expressions/class/async-gen-method-yield-as-binding-identifier-escaped.js
index bd30b48c85..89a90d57e4 100644
--- a/test/language/expressions/class/async-gen-method-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-method-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-yield-as-binding-identifier.js b/test/language/expressions/class/async-gen-method-yield-as-binding-identifier.js
index 094d6d0c4a..8c3142e1b7 100644
--- a/test/language/expressions/class/async-gen-method-yield-as-binding-identifier.js
+++ b/test/language/expressions/class/async-gen-method-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-yield-as-identifier-reference-escaped.js b/test/language/expressions/class/async-gen-method-yield-as-identifier-reference-escaped.js
index 5162e1b693..1eab3163ce 100644
--- a/test/language/expressions/class/async-gen-method-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-gen-method-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-yield-as-identifier-reference.js b/test/language/expressions/class/async-gen-method-yield-as-identifier-reference.js
index c3a3c31afd..6672e86a37 100644
--- a/test/language/expressions/class/async-gen-method-yield-as-identifier-reference.js
+++ b/test/language/expressions/class/async-gen-method-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-yield-as-label-identifier-escaped.js b/test/language/expressions/class/async-gen-method-yield-as-label-identifier-escaped.js
index 3be6a39101..0d0a196a50 100644
--- a/test/language/expressions/class/async-gen-method-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-method-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-yield-as-label-identifier.js b/test/language/expressions/class/async-gen-method-yield-as-label-identifier.js
index 83e70e823d..75358b1fa4 100644
--- a/test/language/expressions/class/async-gen-method-yield-as-label-identifier.js
+++ b/test/language/expressions/class/async-gen-method-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *gen() {
diff --git a/test/language/expressions/class/async-gen-method-yield-identifier-spread-strict.js b/test/language/expressions/class/async-gen-method-yield-identifier-spread-strict.js
index 4085da25e4..2ccd86d323 100644
--- a/test/language/expressions/class/async-gen-method-yield-identifier-spread-strict.js
+++ b/test/language/expressions/class/async-gen-method-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/async-gen-method-yield-identifier-strict.js b/test/language/expressions/class/async-gen-method-yield-identifier-strict.js
index 144493d759..2f832d6ca3 100644
--- a/test/language/expressions/class/async-gen-method-yield-identifier-strict.js
+++ b/test/language/expressions/class/async-gen-method-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/async-gen-private-method-await-as-binding-identifier-escaped.js b/test/language/expressions/class/async-gen-private-method-await-as-binding-identifier-escaped.js
index 0627836715..b299f40bde 100644
--- a/test/language/expressions/class/async-gen-private-method-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-await-as-binding-identifier.js b/test/language/expressions/class/async-gen-private-method-await-as-binding-identifier.js
index dc3ac1b5fb..ab797d2b4e 100644
--- a/test/language/expressions/class/async-gen-private-method-await-as-binding-identifier.js
+++ b/test/language/expressions/class/async-gen-private-method-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-await-as-identifier-reference-escaped.js b/test/language/expressions/class/async-gen-private-method-await-as-identifier-reference-escaped.js
index e890d3df75..c1eb496813 100644
--- a/test/language/expressions/class/async-gen-private-method-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-await-as-identifier-reference.js b/test/language/expressions/class/async-gen-private-method-await-as-identifier-reference.js
index 847382806e..afe2e50d53 100644
--- a/test/language/expressions/class/async-gen-private-method-await-as-identifier-reference.js
+++ b/test/language/expressions/class/async-gen-private-method-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-await-as-label-identifier-escaped.js b/test/language/expressions/class/async-gen-private-method-await-as-label-identifier-escaped.js
index b509fdf8d1..a6e6008db6 100644
--- a/test/language/expressions/class/async-gen-private-method-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-await-as-label-identifier.js b/test/language/expressions/class/async-gen-private-method-await-as-label-identifier.js
index 4cd5ca67b1..4dada7b8dd 100644
--- a/test/language/expressions/class/async-gen-private-method-await-as-label-identifier.js
+++ b/test/language/expressions/class/async-gen-private-method-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-await-as-binding-identifier-escaped.js b/test/language/expressions/class/async-gen-private-method-static-await-as-binding-identifier-escaped.js
index bb6200d908..63abc8dde8 100644
--- a/test/language/expressions/class/async-gen-private-method-static-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-static-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-await-as-binding-identifier.js b/test/language/expressions/class/async-gen-private-method-static-await-as-binding-identifier.js
index bcefe2ef6e..6685dcb0c6 100644
--- a/test/language/expressions/class/async-gen-private-method-static-await-as-binding-identifier.js
+++ b/test/language/expressions/class/async-gen-private-method-static-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-await-as-identifier-reference-escaped.js b/test/language/expressions/class/async-gen-private-method-static-await-as-identifier-reference-escaped.js
index e8a9d6fe79..1848905aa2 100644
--- a/test/language/expressions/class/async-gen-private-method-static-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-static-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-await-as-identifier-reference.js b/test/language/expressions/class/async-gen-private-method-static-await-as-identifier-reference.js
index 52da5ed32a..9f6f2cdd3e 100644
--- a/test/language/expressions/class/async-gen-private-method-static-await-as-identifier-reference.js
+++ b/test/language/expressions/class/async-gen-private-method-static-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-await-as-label-identifier-escaped.js b/test/language/expressions/class/async-gen-private-method-static-await-as-label-identifier-escaped.js
index 00e2b00c50..4a28c449cf 100644
--- a/test/language/expressions/class/async-gen-private-method-static-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-static-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-await-as-label-identifier.js b/test/language/expressions/class/async-gen-private-method-static-await-as-label-identifier.js
index 9fe8cb0a74..c6e2c464c1 100644
--- a/test/language/expressions/class/async-gen-private-method-static-await-as-label-identifier.js
+++ b/test/language/expressions/class/async-gen-private-method-static-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-yield-as-binding-identifier-escaped.js b/test/language/expressions/class/async-gen-private-method-static-yield-as-binding-identifier-escaped.js
index 6bb9741c3b..79a4bb4a27 100644
--- a/test/language/expressions/class/async-gen-private-method-static-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-static-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-yield-as-binding-identifier.js b/test/language/expressions/class/async-gen-private-method-static-yield-as-binding-identifier.js
index 2672cd1a38..9fc5a2cf29 100644
--- a/test/language/expressions/class/async-gen-private-method-static-yield-as-binding-identifier.js
+++ b/test/language/expressions/class/async-gen-private-method-static-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-yield-as-identifier-reference-escaped.js b/test/language/expressions/class/async-gen-private-method-static-yield-as-identifier-reference-escaped.js
index 5d78d819ae..ff7b420559 100644
--- a/test/language/expressions/class/async-gen-private-method-static-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-static-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-yield-as-identifier-reference.js b/test/language/expressions/class/async-gen-private-method-static-yield-as-identifier-reference.js
index 24c36c5bc6..210d386ee0 100644
--- a/test/language/expressions/class/async-gen-private-method-static-yield-as-identifier-reference.js
+++ b/test/language/expressions/class/async-gen-private-method-static-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-yield-as-label-identifier-escaped.js b/test/language/expressions/class/async-gen-private-method-static-yield-as-label-identifier-escaped.js
index 2034179f78..03bf5ac33d 100644
--- a/test/language/expressions/class/async-gen-private-method-static-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-static-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-yield-as-label-identifier.js b/test/language/expressions/class/async-gen-private-method-static-yield-as-label-identifier.js
index 650944dde8..0cc58a12b7 100644
--- a/test/language/expressions/class/async-gen-private-method-static-yield-as-label-identifier.js
+++ b/test/language/expressions/class/async-gen-private-method-static-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-static-yield-identifier-spread-strict.js b/test/language/expressions/class/async-gen-private-method-static-yield-identifier-spread-strict.js
index 3bce3f7f54..dc8fae5a57 100644
--- a/test/language/expressions/class/async-gen-private-method-static-yield-identifier-spread-strict.js
+++ b/test/language/expressions/class/async-gen-private-method-static-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/async-gen-private-method-static-yield-identifier-strict.js b/test/language/expressions/class/async-gen-private-method-static-yield-identifier-strict.js
index 3d0971c0be..8ce058c1c6 100644
--- a/test/language/expressions/class/async-gen-private-method-static-yield-identifier-strict.js
+++ b/test/language/expressions/class/async-gen-private-method-static-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/async-gen-private-method-yield-as-binding-identifier-escaped.js b/test/language/expressions/class/async-gen-private-method-yield-as-binding-identifier-escaped.js
index 84fe9765c7..d7c45f0d59 100644
--- a/test/language/expressions/class/async-gen-private-method-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-yield-as-binding-identifier.js b/test/language/expressions/class/async-gen-private-method-yield-as-binding-identifier.js
index f217c81c44..bad19a0ffd 100644
--- a/test/language/expressions/class/async-gen-private-method-yield-as-binding-identifier.js
+++ b/test/language/expressions/class/async-gen-private-method-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-yield-as-identifier-reference-escaped.js b/test/language/expressions/class/async-gen-private-method-yield-as-identifier-reference-escaped.js
index ba7cc6c1d5..6d7120d34e 100644
--- a/test/language/expressions/class/async-gen-private-method-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-yield-as-identifier-reference.js b/test/language/expressions/class/async-gen-private-method-yield-as-identifier-reference.js
index 4c41862602..6054334122 100644
--- a/test/language/expressions/class/async-gen-private-method-yield-as-identifier-reference.js
+++ b/test/language/expressions/class/async-gen-private-method-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-yield-as-label-identifier-escaped.js b/test/language/expressions/class/async-gen-private-method-yield-as-label-identifier-escaped.js
index a8c2208dbe..8277416352 100644
--- a/test/language/expressions/class/async-gen-private-method-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-gen-private-method-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-yield-as-label-identifier.js b/test/language/expressions/class/async-gen-private-method-yield-as-label-identifier.js
index 373e7090ba..c946482a85 100644
--- a/test/language/expressions/class/async-gen-private-method-yield-as-label-identifier.js
+++ b/test/language/expressions/class/async-gen-private-method-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async *#gen() {
diff --git a/test/language/expressions/class/async-gen-private-method-yield-identifier-spread-strict.js b/test/language/expressions/class/async-gen-private-method-yield-identifier-spread-strict.js
index 4e60917ea0..47f6e850cf 100644
--- a/test/language/expressions/class/async-gen-private-method-yield-identifier-spread-strict.js
+++ b/test/language/expressions/class/async-gen-private-method-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/async-gen-private-method-yield-identifier-strict.js b/test/language/expressions/class/async-gen-private-method-yield-identifier-strict.js
index e7e8ca8fb5..0776625453 100644
--- a/test/language/expressions/class/async-gen-private-method-yield-identifier-strict.js
+++ b/test/language/expressions/class/async-gen-private-method-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/async-meth-dflt-params-duplicates.js b/test/language/expressions/class/async-meth-dflt-params-duplicates.js
index 9e104289d3..8ef4b5f348 100644
--- a/test/language/expressions/class/async-meth-dflt-params-duplicates.js
+++ b/test/language/expressions/class/async-meth-dflt-params-duplicates.js
@@ -55,7 +55,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async method(x = 0, x) {
diff --git a/test/language/expressions/class/async-meth-dflt-params-rest.js b/test/language/expressions/class/async-meth-dflt-params-rest.js
index 10b9d61d51..72955d115b 100644
--- a/test/language/expressions/class/async-meth-dflt-params-rest.js
+++ b/test/language/expressions/class/async-meth-dflt-params-rest.js
@@ -59,7 +59,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async method(...x = []) {
diff --git a/test/language/expressions/class/async-meth-rest-params-trailing-comma-early-error.js b/test/language/expressions/class/async-meth-rest-params-trailing-comma-early-error.js
index cb5d9470fb..9af9a04725 100644
--- a/test/language/expressions/class/async-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/class/async-meth-rest-params-trailing-comma-early-error.js
@@ -51,7 +51,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async method(...a,) {
diff --git a/test/language/expressions/class/async-meth-static-dflt-params-duplicates.js b/test/language/expressions/class/async-meth-static-dflt-params-duplicates.js
index 167dba8375..949fe1d963 100644
--- a/test/language/expressions/class/async-meth-static-dflt-params-duplicates.js
+++ b/test/language/expressions/class/async-meth-static-dflt-params-duplicates.js
@@ -55,7 +55,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async method(x = 0, x) {
diff --git a/test/language/expressions/class/async-meth-static-dflt-params-rest.js b/test/language/expressions/class/async-meth-static-dflt-params-rest.js
index 1b1cc8db54..0af3c1c0bb 100644
--- a/test/language/expressions/class/async-meth-static-dflt-params-rest.js
+++ b/test/language/expressions/class/async-meth-static-dflt-params-rest.js
@@ -59,7 +59,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async method(...x = []) {
diff --git a/test/language/expressions/class/async-meth-static-rest-params-trailing-comma-early-error.js b/test/language/expressions/class/async-meth-static-rest-params-trailing-comma-early-error.js
index e6404a5486..bba144c84c 100644
--- a/test/language/expressions/class/async-meth-static-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/class/async-meth-static-rest-params-trailing-comma-early-error.js
@@ -51,7 +51,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async method(...a,) {
diff --git a/test/language/expressions/class/async-method-await-as-binding-identifier-escaped.js b/test/language/expressions/class/async-method-await-as-binding-identifier-escaped.js
index 9907dcf3a0..6c29946656 100644
--- a/test/language/expressions/class/async-method-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-method-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async method() {
diff --git a/test/language/expressions/class/async-method-await-as-binding-identifier.js b/test/language/expressions/class/async-method-await-as-binding-identifier.js
index 380e9ef45d..6c1c0125dd 100644
--- a/test/language/expressions/class/async-method-await-as-binding-identifier.js
+++ b/test/language/expressions/class/async-method-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async method() {
diff --git a/test/language/expressions/class/async-method-await-as-identifier-reference-escaped.js b/test/language/expressions/class/async-method-await-as-identifier-reference-escaped.js
index c6b73a2c99..45e4517fb6 100644
--- a/test/language/expressions/class/async-method-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-method-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async method() {
diff --git a/test/language/expressions/class/async-method-await-as-identifier-reference.js b/test/language/expressions/class/async-method-await-as-identifier-reference.js
index 5e0e9468fc..c29efb2b96 100644
--- a/test/language/expressions/class/async-method-await-as-identifier-reference.js
+++ b/test/language/expressions/class/async-method-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async method() {
diff --git a/test/language/expressions/class/async-method-await-as-label-identifier-escaped.js b/test/language/expressions/class/async-method-await-as-label-identifier-escaped.js
index cdaeb03f8b..92ef97e80f 100644
--- a/test/language/expressions/class/async-method-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-method-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async method() {
diff --git a/test/language/expressions/class/async-method-await-as-label-identifier.js b/test/language/expressions/class/async-method-await-as-label-identifier.js
index e32e336225..f735d3af53 100644
--- a/test/language/expressions/class/async-method-await-as-label-identifier.js
+++ b/test/language/expressions/class/async-method-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async method() {
diff --git a/test/language/expressions/class/async-method-static-await-as-binding-identifier-escaped.js b/test/language/expressions/class/async-method-static-await-as-binding-identifier-escaped.js
index c9179c0208..c158e1b16e 100644
--- a/test/language/expressions/class/async-method-static-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-method-static-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async method() {
diff --git a/test/language/expressions/class/async-method-static-await-as-binding-identifier.js b/test/language/expressions/class/async-method-static-await-as-binding-identifier.js
index add6e7ec58..daa3dcc83d 100644
--- a/test/language/expressions/class/async-method-static-await-as-binding-identifier.js
+++ b/test/language/expressions/class/async-method-static-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async method() {
diff --git a/test/language/expressions/class/async-method-static-await-as-identifier-reference-escaped.js b/test/language/expressions/class/async-method-static-await-as-identifier-reference-escaped.js
index b9bb3557a8..fc28075a98 100644
--- a/test/language/expressions/class/async-method-static-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-method-static-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async method() {
diff --git a/test/language/expressions/class/async-method-static-await-as-identifier-reference.js b/test/language/expressions/class/async-method-static-await-as-identifier-reference.js
index 69cfced9ce..c80ec2b4c7 100644
--- a/test/language/expressions/class/async-method-static-await-as-identifier-reference.js
+++ b/test/language/expressions/class/async-method-static-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async method() {
diff --git a/test/language/expressions/class/async-method-static-await-as-label-identifier-escaped.js b/test/language/expressions/class/async-method-static-await-as-label-identifier-escaped.js
index d284e0fe2d..34fbe9590b 100644
--- a/test/language/expressions/class/async-method-static-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-method-static-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async method() {
diff --git a/test/language/expressions/class/async-method-static-await-as-label-identifier.js b/test/language/expressions/class/async-method-static-await-as-label-identifier.js
index 645d7b974e..1096c7d54a 100644
--- a/test/language/expressions/class/async-method-static-await-as-label-identifier.js
+++ b/test/language/expressions/class/async-method-static-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async method() {
diff --git a/test/language/expressions/class/async-private-method-await-as-binding-identifier-escaped.js b/test/language/expressions/class/async-private-method-await-as-binding-identifier-escaped.js
index 681b4fbcfa..edffb6b291 100644
--- a/test/language/expressions/class/async-private-method-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-private-method-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async #method() {
diff --git a/test/language/expressions/class/async-private-method-await-as-binding-identifier.js b/test/language/expressions/class/async-private-method-await-as-binding-identifier.js
index a0f33bb349..d26dc98cf2 100644
--- a/test/language/expressions/class/async-private-method-await-as-binding-identifier.js
+++ b/test/language/expressions/class/async-private-method-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async #method() {
diff --git a/test/language/expressions/class/async-private-method-await-as-identifier-reference-escaped.js b/test/language/expressions/class/async-private-method-await-as-identifier-reference-escaped.js
index 69b18fc73e..14d3ff6eef 100644
--- a/test/language/expressions/class/async-private-method-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-private-method-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async #method() {
diff --git a/test/language/expressions/class/async-private-method-await-as-identifier-reference.js b/test/language/expressions/class/async-private-method-await-as-identifier-reference.js
index bbd2185838..71cb27c925 100644
--- a/test/language/expressions/class/async-private-method-await-as-identifier-reference.js
+++ b/test/language/expressions/class/async-private-method-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async #method() {
diff --git a/test/language/expressions/class/async-private-method-await-as-label-identifier-escaped.js b/test/language/expressions/class/async-private-method-await-as-label-identifier-escaped.js
index 0ea1779345..af2f38bfd7 100644
--- a/test/language/expressions/class/async-private-method-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-private-method-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async #method() {
diff --git a/test/language/expressions/class/async-private-method-await-as-label-identifier.js b/test/language/expressions/class/async-private-method-await-as-label-identifier.js
index 2bfca2039f..09c7ac9eb7 100644
--- a/test/language/expressions/class/async-private-method-await-as-label-identifier.js
+++ b/test/language/expressions/class/async-private-method-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { async #method() {
diff --git a/test/language/expressions/class/async-private-method-static-await-as-binding-identifier-escaped.js b/test/language/expressions/class/async-private-method-static-await-as-binding-identifier-escaped.js
index 6897c6807f..496c9e1591 100644
--- a/test/language/expressions/class/async-private-method-static-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/async-private-method-static-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async #method() {
diff --git a/test/language/expressions/class/async-private-method-static-await-as-binding-identifier.js b/test/language/expressions/class/async-private-method-static-await-as-binding-identifier.js
index c5082e83d9..e97ea5e2bd 100644
--- a/test/language/expressions/class/async-private-method-static-await-as-binding-identifier.js
+++ b/test/language/expressions/class/async-private-method-static-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async #method() {
diff --git a/test/language/expressions/class/async-private-method-static-await-as-identifier-reference-escaped.js b/test/language/expressions/class/async-private-method-static-await-as-identifier-reference-escaped.js
index b3e368330c..17e9d523e5 100644
--- a/test/language/expressions/class/async-private-method-static-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/async-private-method-static-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async #method() {
diff --git a/test/language/expressions/class/async-private-method-static-await-as-identifier-reference.js b/test/language/expressions/class/async-private-method-static-await-as-identifier-reference.js
index 5a3e950a6b..cabbce3981 100644
--- a/test/language/expressions/class/async-private-method-static-await-as-identifier-reference.js
+++ b/test/language/expressions/class/async-private-method-static-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async #method() {
diff --git a/test/language/expressions/class/async-private-method-static-await-as-label-identifier-escaped.js b/test/language/expressions/class/async-private-method-static-await-as-label-identifier-escaped.js
index 6090307f2e..f122fd89d1 100644
--- a/test/language/expressions/class/async-private-method-static-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/async-private-method-static-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async #method() {
diff --git a/test/language/expressions/class/async-private-method-static-await-as-label-identifier.js b/test/language/expressions/class/async-private-method-static-await-as-label-identifier.js
index 6edb6a3db4..d20121c7ad 100644
--- a/test/language/expressions/class/async-private-method-static-await-as-label-identifier.js
+++ b/test/language/expressions/class/async-private-method-static-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var C = class { static async #method() {
diff --git a/test/language/expressions/class/class-name-ident-await-escaped-module.js b/test/language/expressions/class/class-name-ident-await-escaped-module.js
index d52158d9d7..2801e9a6bc 100644
--- a/test/language/expressions/class/class-name-ident-await-escaped-module.js
+++ b/test/language/expressions/class/class-name-ident-await-escaped-module.js
@@ -18,6 +18,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class aw\u0061it {};
diff --git a/test/language/expressions/class/class-name-ident-await-module.js b/test/language/expressions/class/class-name-ident-await-module.js
index 591f660978..ea58d64bc5 100644
--- a/test/language/expressions/class/class-name-ident-await-module.js
+++ b/test/language/expressions/class/class-name-ident-await-module.js
@@ -17,6 +17,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class await {};
diff --git a/test/language/expressions/class/class-name-ident-let-escaped.js b/test/language/expressions/class/class-name-ident-let-escaped.js
index 8af02417ee..300e8edc26 100644
--- a/test/language/expressions/class/class-name-ident-let-escaped.js
+++ b/test/language/expressions/class/class-name-ident-let-escaped.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class l\u0065t {};
diff --git a/test/language/expressions/class/class-name-ident-let.js b/test/language/expressions/class/class-name-ident-let.js
index 9906a4c7fd..b2665fdc3a 100644
--- a/test/language/expressions/class/class-name-ident-let.js
+++ b/test/language/expressions/class/class-name-ident-let.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class let {};
diff --git a/test/language/expressions/class/class-name-ident-static-escaped.js b/test/language/expressions/class/class-name-ident-static-escaped.js
index 2f45dd6309..e740d54ac7 100644
--- a/test/language/expressions/class/class-name-ident-static-escaped.js
+++ b/test/language/expressions/class/class-name-ident-static-escaped.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class st\u0061tic {};
diff --git a/test/language/expressions/class/class-name-ident-static.js b/test/language/expressions/class/class-name-ident-static.js
index 517ec643ed..3929c10f0f 100644
--- a/test/language/expressions/class/class-name-ident-static.js
+++ b/test/language/expressions/class/class-name-ident-static.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class static {};
diff --git a/test/language/expressions/class/class-name-ident-yield-escaped.js b/test/language/expressions/class/class-name-ident-yield-escaped.js
index b23a32afc6..f4d7a8d37b 100644
--- a/test/language/expressions/class/class-name-ident-yield-escaped.js
+++ b/test/language/expressions/class/class-name-ident-yield-escaped.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class yi\u0065ld {};
diff --git a/test/language/expressions/class/class-name-ident-yield.js b/test/language/expressions/class/class-name-ident-yield.js
index e525786c5a..93e245a6e0 100644
--- a/test/language/expressions/class/class-name-ident-yield.js
+++ b/test/language/expressions/class/class-name-ident-yield.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class yield {};
diff --git a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
index d1f8410b7c..593f537a48 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
index 7d93db6be6..5a51a47da7 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
index e6b37c98d7..b7ed3b7967 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
index ac0a8f75c1..0a0159ab17 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
index 5f431ba002..e989a24055 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
index e388d32700..4ba9015f06 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index 48aa3f32a5..f44304e271 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
index 8504a7653b..8f45aa3601 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index f8e3cfc4b2..6f9173e03c 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 6660f3628f..4780dc2b49 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index 442ee4a5c5..31c9ae2ef7 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index c453a2de79..b26fb34ffb 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-ary.js
index 8477fbba2f..6f9ad32135 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-id.js
index 966d3eebae..ba9609f33f 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-obj.js
index 6fb2071689..9c5c16cbcf 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-ary.js
index 1e6079b46b..1f6237bece 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-id.js
index 09fdc89deb..c0a176cd53 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-obj.js
index f169740fa5..37044d0485 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
index 2e9a5d0882..e17b0bf091 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
index 9fd4fccb5d..a88c97dac8 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
index ca92149dc3..a558a9d165 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index 03d1df9c63..d0b55999c9 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index 5596ad2bf1..86476ab620 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index 9362e3eefb..8fab023d5f 100644
--- a/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-ary.js
index 6f83bfadfb..6dd430c078 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-id.js
index 79efef9e7f..dca8134313 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-obj.js
index c919c9bbc1..31eefc2ee5 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-ary.js
index 338b6b7adf..50aa63a5bb 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-id.js
index 7f9fb22ac9..a78d800d7c 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-obj.js
index 79e1f54349..5d6852a18f 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index 926b8a9db6..6f247837e4 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
index 1a022f0be0..4c09e5b19e 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index 0e35b534f6..bc4c4c4784 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 2c51a1e338..9d4467f94f 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index eed831ca70..8b96bbde22 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 827cdb78a1..82d994a533 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-ary.js
index 78183e4280..5c4d909264 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-id.js
index 09f0cc5ff0..9e8f5d408b 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-obj.js
index 8aef500c87..671ff25803 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
index caab6db998..cfaaa811ce 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
index c15739c8cb..693fd3cd8d 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
index adc6ef4bb0..4f3114991b 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
index 06a7f204f7..eb6437a760 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
index 2c9d44509e..d089860c34 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
index aea9dced3d..fc045e420f 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index b6990df995..eae7f93d41 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index ea97287130..ce7cc5e71b 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index 72d3e79673..431ff94f5a 100644
--- a/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-ary.js
index 01d3aacfa6..1fffbb10c8 100644
--- a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-ary.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-id.js
index 7fbd1bd4ba..2bcad8525d 100644
--- a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-id.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-obj.js
index 69949848b3..b2c44da270 100644
--- a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-init-obj.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
index 6d876ff386..2ea6585429 100644
--- a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
index 8f33bc1be8..2f02996f80 100644
--- a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
index 3635e4f1df..9c06a9eb5e 100644
--- a/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index 8075f1af6e..8562af7d35 100644
--- a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
index 8d5a2190e2..9567c48fe5 100644
--- a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index c5cf562cc7..0ee150e67c 100644
--- a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 769e385bbb..ef4e988e22 100644
--- a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index baa8ddba35..8a630d35b8 100644
--- a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 0c06fdec90..9675db3118 100644
--- a/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-ary.js
index 51ae05913f..082b40a522 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-ary.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-id.js
index 0b0e1157be..3af6cc47b3 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-id.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-obj.js
index 21b49d581a..1a0c573374 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-init-obj.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-ary.js
index 59ee7c7887..c4acb535fe 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-id.js
index c1c866c90f..edd22175f3 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-id.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-obj.js
index 32653444ee..5f156cad05 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
index ac831baa4c..e36168f972 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
index 4be5aed469..2d177dd879 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
index c0cc369ed0..1d3749a2ab 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index e40f4197a8..fad90da921 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index 769207a37f..a18a24724f 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index db8366de90..c734474aa4 100644
--- a/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -70,7 +70,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-ary.js
index 9ccf5478c4..ac2cfdc5dd 100644
--- a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-id.js
index 6df71822be..d003520190 100644
--- a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-obj.js
index a101544982..56d80d5ac1 100644
--- a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-init-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-ary.js
index 27095eadda..d1e5cd14aa 100644
--- a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-id.js
index 074db76a20..b210081391 100644
--- a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-obj.js
index 7167e5b0e7..3b9dd51a37 100644
--- a/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-meth-ary-ptrn-rest-not-final-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
index 9760fb63ed..92e7a980fe 100644
--- a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-id.js
index fa8fa20cb6..26c4ede900 100644
--- a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
index a38c18a27b..4567b048df 100644
--- a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 21ca988eac..14d6502dcb 100644
--- a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
index 759bebba24..78ad378278 100644
--- a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
index b2e62fdf62..a651470b72 100644
--- a/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-ary.js
index 55887d0b10..fd2fb05369 100644
--- a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-id.js
index 31f68b5a1a..3bdb8eea35 100644
--- a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-obj.js
index a061e60964..cbcfb4db15 100644
--- a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-init-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-ary.js
index 9ebbfda4e6..c0a34b4099 100644
--- a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-id.js
index 902706aa20..e8dd1316cc 100644
--- a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-obj.js
index dbf7b24ab3..4bacf4aec3 100644
--- a/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-ary.js
index 900b7d9d3f..ca300db704 100644
--- a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-id.js
index 79d4067968..2ed8b753da 100644
--- a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-obj.js
index 545cbe9122..774f8c30e8 100644
--- a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index c9b613382e..61d5e86fc5 100644
--- a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index 19c394b996..16aceb0f44 100644
--- a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index c308c9aca3..e5bc5da9ca 100644
--- a/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-ary.js
index 3712ec760a..4b204f580a 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-ary.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-id.js
index bfe7bd7e3f..90c76b384b 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-id.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-obj.js
index ba50c13570..73978a1551 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-init-obj.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-ary.js
index b93511d852..08c8e14727 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-id.js
index 146110e119..7536c82f14 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-obj.js
index 8b0f242e8c..e51e073355 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index 06912f13dc..1dcc913b4e 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
index 0359081c92..86b7ae6eaf 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index a49f0b9b54..38d0962137 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index ccaa12225b..98b9e434b4 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index 28d024037a..d914911560 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index a3460e442d..9fb7bdddc3 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-ary.js
index a2c9ea0a0c..684bd2f703 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-ary.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-id.js
index a0c94030d2..27c9c660ee 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-id.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-obj.js
index e17656c1f3..5932f8ed4b 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-obj.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
index 0a7072a2e4..6fd790b353 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
index 7bcd50294f..634267415d 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
index 47374fcbb2..ce2e51ce1b 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
index 4dc1ff8bb9..4296aee588 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
index 57c7512ca7..ea91823b2c 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
index 5eb6818ea4..1c3ed4ca22 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index ef41320300..8356029a72 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index a2bf2cac3b..4936dbbe66 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index 765b595510..725dc52e27 100644
--- a/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -69,7 +69,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-ary.js
index ee859d066c..42b553f534 100644
--- a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-id.js
index 0930b3f417..c8592fb7da 100644
--- a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-obj.js
index 5c583faa48..7574a6d69f 100644
--- a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-init-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-ary.js
index 8cdce7f133..d02077e101 100644
--- a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-id.js
index d11db9f598..26743dcea5 100644
--- a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-obj.js
index 2e32289231..d8fd4ea59e 100644
--- a/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-private-meth-ary-ptrn-rest-not-final-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-ary.js
index 4cbff9b24c..e840fc358b 100644
--- a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-id.js
index bc9f0e0a6d..c7fb0067e8 100644
--- a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-obj.js
index cc0a741ac3..ed16410046 100644
--- a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-ary.js
index e195f28026..599b923d9d 100644
--- a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-id.js
index 914726c88b..873ddce441 100644
--- a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-obj.js
index da74747bdf..a5816a6262 100644
--- a/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-ary.js
index 52b149957d..2a45d9c866 100644
--- a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-id.js
index c39ecabbfd..9b1af4e24a 100644
--- a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-obj.js
index 1121e0e559..524bdabd30 100644
--- a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-init-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-ary.js
index 4c1a8ae178..804eca513f 100644
--- a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-id.js
index 199c06d404..b36c6eb77c 100644
--- a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-obj.js
index f34d4256f3..15f40eb62b 100644
--- a/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-private-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-ary.js
index f2838c6285..7f4de6fad2 100644
--- a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-id.js
index 8bb7d40456..277df5bced 100644
--- a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-obj.js
index cfca7a4315..dd91e54cfb 100644
--- a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index 32d3141704..fe548d0455 100644
--- a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index cc87fa4ceb..fe990e2743 100644
--- a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index 808bf41eed..edb9137535 100644
--- a/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var C = class {
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-async-gen.js b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-async-gen.js
index 70058d1d83..8ff894f05e 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-async.js b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-async.js
index e7dbae5438..c60ec94f82 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-async.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-gen.js b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-gen.js
index 3deda5a95c..6445c708d1 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method.js b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method.js
index 1ee032db1e..dd4bde4a6d 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-privatename.js b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-privatename.js
index 0fff6bc286..e78e339922 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-call-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-async-gen.js b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-async-gen.js
index c93bd3aa71..44a65e006c 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-async.js b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-async.js
index 24e446ad6e..e5ce5db4aa 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-async.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-gen.js b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-gen.js
index e277d3d860..d06e761c92 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method.js b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method.js
index 0e27bae4f5..8f6bebef57 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-privatename.js b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-privatename.js
index 8391f701cf..bb5ad98187 100644
--- a/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-covered-err-delete-member-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-async-gen.js b/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-async-gen.js
index 85692e8a0a..13bee02160 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-async-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-async.js b/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-async.js
index 1b7e804bb0..6b139ba561 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-async.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-async.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-gen.js b/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-gen.js
index 07f30ea57c..3f3c933ab7 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method.js b/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method.js
index 825f6b04f5..9425affa27 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-call-expression-private-method.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-call-expression-privatename.js b/test/language/expressions/class/err-field-delete-err-delete-call-expression-privatename.js
index a0a6dfb622..753c9bda00 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-call-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-call-expression-privatename.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-async-gen.js b/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-async-gen.js
index 4c97007df1..a8d332fc6b 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-async-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-async.js b/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-async.js
index b9e67a8dd7..9632a9c2c6 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-async.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-async.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-gen.js b/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-gen.js
index a62f4a06b3..aaaec51113 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method.js b/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method.js
index bb91955455..f33b6fab60 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-member-expression-private-method.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-err-delete-member-expression-privatename.js b/test/language/expressions/class/err-field-delete-err-delete-member-expression-privatename.js
index 5473212356..8a0790eb26 100644
--- a/test/language/expressions/class/err-field-delete-err-delete-member-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-err-delete-member-expression-privatename.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
index 20b8756ee8..09fc24b671 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async.js
index e997e4cec8..1c449e3fa8 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-gen.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-gen.js
index 6241ef1c8e..5d5abcd3a6 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method.js
index 55eaf4bc37..8fecfab20d 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-privatename.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-privatename.js
index 3966d93358..28aa1a41f3 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-call-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
index cb775243aa..c2f2af6a08 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async.js
index fb9816405c..9b34f0457e 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-gen.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-gen.js
index 1d0fe9e017..a9c6c8e725 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method.js
index 80408996e8..d0915da334 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-privatename.js b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-privatename.js
index c642434f73..00b8481124 100644
--- a/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-privatename.js
+++ b/test/language/expressions/class/err-field-delete-twice-covered-err-delete-member-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-async-gen.js b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-async-gen.js
index bfeb41ff07..913eb21485 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-async.js b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-async.js
index d0e1978cae..1389b9fa22 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-async.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-gen.js b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-gen.js
index a4a76a8c8a..4bbc1dee91 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method.js b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method.js
index 5d0442d239..41b4c51ae0 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-privatename.js b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-privatename.js
index baf0af9bc4..573e31d544 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-call-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-async-gen.js b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-async-gen.js
index f8da44ebc3..b881e17d48 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-async.js b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-async.js
index 0502f1844d..78dc6b43e0 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-async.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-gen.js b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-gen.js
index e30de639ed..9ada69d65b 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method.js b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method.js
index cdf405c40e..4bf3ace5e5 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-privatename.js b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-privatename.js
index f156b04209..3a76ced654 100644
--- a/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-covered-err-delete-member-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-async-gen.js b/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-async-gen.js
index da1d334488..f4285ef6f5 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-async-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-async.js b/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-async.js
index ccc301e8cb..88d049c88e 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-async.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-async.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-gen.js b/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-gen.js
index 719b133283..cf8ec04bc7 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method.js b/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method.js
index 506981f77f..87a8d96dd7 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-call-expression-private-method.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-call-expression-privatename.js b/test/language/expressions/class/err-method-delete-err-delete-call-expression-privatename.js
index 7702a34d0e..3734ee658e 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-call-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-call-expression-privatename.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-async-gen.js b/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-async-gen.js
index 2d74980145..3063c18b02 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-async-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-async.js b/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-async.js
index 8c8e58335b..81535ade2b 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-async.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-async.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-gen.js b/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-gen.js
index 97711860bb..d5fd249bf7 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method.js b/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method.js
index 04ed45b850..5b64b5ab7d 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-member-expression-private-method.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-err-delete-member-expression-privatename.js b/test/language/expressions/class/err-method-delete-err-delete-member-expression-privatename.js
index 026415d918..bec942a517 100644
--- a/test/language/expressions/class/err-method-delete-err-delete-member-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-err-delete-member-expression-privatename.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
index b68666edc2..b91d241b70 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async.js
index e17b6fe5f9..51dee6cc3f 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-gen.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-gen.js
index fd943dbe61..d3fe9f6af9 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method.js
index fe06d4c3af..a7fb5a7776 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-privatename.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-privatename.js
index 782fc1eaae..a653ad5da9 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-call-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
index 18ef304dbe..ef2cc1ab50 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async.js
index 118e6a5bdd..0bdef1bcf4 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-gen.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-gen.js
index 14fdaab48c..e768bd991c 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-gen.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method.js
index b07e7bcb77..ecff06ff0d 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-privatename.js b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-privatename.js
index 4d5277fa75..11a4f67b2e 100644
--- a/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-privatename.js
+++ b/test/language/expressions/class/err-method-delete-twice-covered-err-delete-member-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/fields-arrow-fnc-init-err-contains-arguments.js b/test/language/expressions/class/fields-arrow-fnc-init-err-contains-arguments.js
index 0ab9cd2bfd..efa5e54681 100644
--- a/test/language/expressions/class/fields-arrow-fnc-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-arrow-fnc-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = () => arguments;
diff --git a/test/language/expressions/class/fields-arrow-fnc-init-err-contains-super.js b/test/language/expressions/class/fields-arrow-fnc-init-err-contains-super.js
index 81cb8705df..79aacd2e59 100644
--- a/test/language/expressions/class/fields-arrow-fnc-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-arrow-fnc-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = () => super();
diff --git a/test/language/expressions/class/fields-asi-3.js b/test/language/expressions/class/fields-asi-3.js
index a44e3509bb..e63aa44106 100644
--- a/test/language/expressions/class/fields-asi-3.js
+++ b/test/language/expressions/class/fields-asi-3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = "string"
diff --git a/test/language/expressions/class/fields-asi-4.js b/test/language/expressions/class/fields-asi-4.js
index 3d9b76dfb7..dc207ba8b5 100644
--- a/test/language/expressions/class/fields-asi-4.js
+++ b/test/language/expressions/class/fields-asi-4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = 42
diff --git a/test/language/expressions/class/fields-comp-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-comp-name-init-err-contains-arguments.js
index 277948e58d..7f0cecb79b 100644
--- a/test/language/expressions/class/fields-comp-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-comp-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 var C = class {
diff --git a/test/language/expressions/class/fields-comp-name-init-err-contains-super.js b/test/language/expressions/class/fields-comp-name-init-err-contains-super.js
index b5305a8551..eab5577bc0 100644
--- a/test/language/expressions/class/fields-comp-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-comp-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 var C = class {
diff --git a/test/language/expressions/class/fields-duplicate-privatenames.js b/test/language/expressions/class/fields-duplicate-privatenames.js
index 3e7b064941..913cc812dc 100644
--- a/test/language/expressions/class/fields-duplicate-privatenames.js
+++ b/test/language/expressions/class/fields-duplicate-privatenames.js
@@ -16,7 +16,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/fields-equality-init-err-contains-arguments.js b/test/language/expressions/class/fields-equality-init-err-contains-arguments.js
index ed444b17dd..5501e918bd 100644
--- a/test/language/expressions/class/fields-equality-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-equality-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = {} == arguments;
diff --git a/test/language/expressions/class/fields-equality-init-err-contains-super.js b/test/language/expressions/class/fields-equality-init-err-contains-super.js
index 661e1d70d5..f526efff25 100644
--- a/test/language/expressions/class/fields-equality-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-equality-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = {} == super();
diff --git a/test/language/expressions/class/fields-literal-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-literal-name-init-err-contains-arguments.js
index 584072dc09..41257db8b7 100644
--- a/test/language/expressions/class/fields-literal-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-literal-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = arguments;
diff --git a/test/language/expressions/class/fields-literal-name-init-err-contains-super.js b/test/language/expressions/class/fields-literal-name-init-err-contains-super.js
index 75c9744068..f9c215cab4 100644
--- a/test/language/expressions/class/fields-literal-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-literal-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = super();
diff --git a/test/language/expressions/class/fields-literal-name-propname-constructor.js b/test/language/expressions/class/fields-literal-name-propname-constructor.js
index 5685c3eff4..215facdace 100644
--- a/test/language/expressions/class/fields-literal-name-propname-constructor.js
+++ b/test/language/expressions/class/fields-literal-name-propname-constructor.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   constructor;
diff --git a/test/language/expressions/class/fields-literal-name-static-propname-constructor.js b/test/language/expressions/class/fields-literal-name-static-propname-constructor.js
index 40d489d12a..6e403bb889 100644
--- a/test/language/expressions/class/fields-literal-name-static-propname-constructor.js
+++ b/test/language/expressions/class/fields-literal-name-static-propname-constructor.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static constructor;
diff --git a/test/language/expressions/class/fields-literal-name-static-propname-prototype.js b/test/language/expressions/class/fields-literal-name-static-propname-prototype.js
index 15ee2d37d8..bf988cb266 100644
--- a/test/language/expressions/class/fields-literal-name-static-propname-prototype.js
+++ b/test/language/expressions/class/fields-literal-name-static-propname-prototype.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static prototype;
diff --git a/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-arguments.js b/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-arguments.js
index 997451ffec..02f0cf9638 100644
--- a/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = () => arguments;
diff --git a/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-super.js b/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-super.js
index 56932c16b8..89cafd2eaa 100644
--- a/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-private-arrow-fnc-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = () => super();
diff --git a/test/language/expressions/class/fields-private-literal-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-private-literal-name-init-err-contains-arguments.js
index da2ffb3a5a..5bfd976d13 100644
--- a/test/language/expressions/class/fields-private-literal-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-private-literal-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = arguments;
diff --git a/test/language/expressions/class/fields-private-literal-name-init-err-contains-super.js b/test/language/expressions/class/fields-private-literal-name-init-err-contains-super.js
index e3d9440bf9..6755410513 100644
--- a/test/language/expressions/class/fields-private-literal-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-private-literal-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = super();
diff --git a/test/language/expressions/class/fields-private-ternary-init-err-contains-arguments.js b/test/language/expressions/class/fields-private-ternary-init-err-contains-arguments.js
index a8d32f0929..5c204007eb 100644
--- a/test/language/expressions/class/fields-private-ternary-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-private-ternary-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = true ? {} : arguments;
diff --git a/test/language/expressions/class/fields-private-ternary-init-err-contains-super.js b/test/language/expressions/class/fields-private-ternary-init-err-contains-super.js
index e0c7840ccc..0bd64644e5 100644
--- a/test/language/expressions/class/fields-private-ternary-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-private-ternary-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = true ? {} : super();
diff --git a/test/language/expressions/class/fields-private-typeof-init-err-contains-arguments.js b/test/language/expressions/class/fields-private-typeof-init-err-contains-arguments.js
index 7a46cce9f9..7a77b47cc7 100644
--- a/test/language/expressions/class/fields-private-typeof-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-private-typeof-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = typeof arguments;
diff --git a/test/language/expressions/class/fields-private-typeof-init-err-contains-super.js b/test/language/expressions/class/fields-private-typeof-init-err-contains-super.js
index a206196306..51fb74c823 100644
--- a/test/language/expressions/class/fields-private-typeof-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-private-typeof-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x = typeof super();
diff --git a/test/language/expressions/class/fields-static-comp-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-static-comp-name-init-err-contains-arguments.js
index 9bbdacd4cf..2e3527b5ad 100644
--- a/test/language/expressions/class/fields-static-comp-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-static-comp-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 var C = class {
diff --git a/test/language/expressions/class/fields-static-comp-name-init-err-contains-super.js b/test/language/expressions/class/fields-static-comp-name-init-err-contains-super.js
index 3d1129ae75..02744854c6 100644
--- a/test/language/expressions/class/fields-static-comp-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-static-comp-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 var C = class {
diff --git a/test/language/expressions/class/fields-static-literal-init-err-contains-arguments.js b/test/language/expressions/class/fields-static-literal-init-err-contains-arguments.js
index 0c642d7484..7cc9c62b35 100644
--- a/test/language/expressions/class/fields-static-literal-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-static-literal-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static x = arguments;
diff --git a/test/language/expressions/class/fields-static-literal-init-err-contains-super.js b/test/language/expressions/class/fields-static-literal-init-err-contains-super.js
index bf49a3ac33..4236eca738 100644
--- a/test/language/expressions/class/fields-static-literal-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-static-literal-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static x = super();
diff --git a/test/language/expressions/class/fields-static-private-init-err-contains-arguments.js b/test/language/expressions/class/fields-static-private-init-err-contains-arguments.js
index ae66323058..f48e79b5ba 100644
--- a/test/language/expressions/class/fields-static-private-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-static-private-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static #x = arguments;
diff --git a/test/language/expressions/class/fields-static-private-init-err-contains-super.js b/test/language/expressions/class/fields-static-private-init-err-contains-super.js
index 6c8d5c0ca2..696049dc16 100644
--- a/test/language/expressions/class/fields-static-private-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-static-private-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static #x = super();
diff --git a/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-arguments.js
index 464a6c290d..d16e9ab4e1 100644
--- a/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static 'x' = arguments;
diff --git a/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-super.js b/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-super.js
index 085e4de128..d443984ae2 100644
--- a/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-static-string-literal-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static 'x' = super();
diff --git a/test/language/expressions/class/fields-string-literal-name-init-err-contains-arguments.js b/test/language/expressions/class/fields-string-literal-name-init-err-contains-arguments.js
index e19d61a6ed..ad5c5e3bb4 100644
--- a/test/language/expressions/class/fields-string-literal-name-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-string-literal-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   'x' = arguments;
diff --git a/test/language/expressions/class/fields-string-literal-name-init-err-contains-super.js b/test/language/expressions/class/fields-string-literal-name-init-err-contains-super.js
index fbddb44146..99b6e6c42b 100644
--- a/test/language/expressions/class/fields-string-literal-name-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-string-literal-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   'x' = super();
diff --git a/test/language/expressions/class/fields-string-name-propname-constructor.js b/test/language/expressions/class/fields-string-name-propname-constructor.js
index 3bf6f60abf..270ff49f08 100644
--- a/test/language/expressions/class/fields-string-name-propname-constructor.js
+++ b/test/language/expressions/class/fields-string-name-propname-constructor.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   'constructor';
diff --git a/test/language/expressions/class/fields-string-name-static-propname-constructor.js b/test/language/expressions/class/fields-string-name-static-propname-constructor.js
index b8916bd91c..4140a989b9 100644
--- a/test/language/expressions/class/fields-string-name-static-propname-constructor.js
+++ b/test/language/expressions/class/fields-string-name-static-propname-constructor.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static 'constructor';
diff --git a/test/language/expressions/class/fields-string-name-static-propname-prototype.js b/test/language/expressions/class/fields-string-name-static-propname-prototype.js
index 032f20f003..f4bff12d1e 100644
--- a/test/language/expressions/class/fields-string-name-static-propname-prototype.js
+++ b/test/language/expressions/class/fields-string-name-static-propname-prototype.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static 'prototype';
diff --git a/test/language/expressions/class/fields-ternary-init-err-contains-arguments.js b/test/language/expressions/class/fields-ternary-init-err-contains-arguments.js
index 8a216795c8..1b6650af5e 100644
--- a/test/language/expressions/class/fields-ternary-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-ternary-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = true ? {} : arguments;
diff --git a/test/language/expressions/class/fields-ternary-init-err-contains-super.js b/test/language/expressions/class/fields-ternary-init-err-contains-super.js
index b1b8fe3e44..b812bbee32 100644
--- a/test/language/expressions/class/fields-ternary-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-ternary-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = true ? {} : super();
diff --git a/test/language/expressions/class/fields-typeof-init-err-contains-arguments.js b/test/language/expressions/class/fields-typeof-init-err-contains-arguments.js
index b25b534ffc..be45a55978 100644
--- a/test/language/expressions/class/fields-typeof-init-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-typeof-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = typeof arguments;
diff --git a/test/language/expressions/class/fields-typeof-init-err-contains-super.js b/test/language/expressions/class/fields-typeof-init-err-contains-super.js
index cf450665a2..f2ac2cd612 100644
--- a/test/language/expressions/class/fields-typeof-init-err-contains-super.js
+++ b/test/language/expressions/class/fields-typeof-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x = typeof super();
diff --git a/test/language/expressions/class/gen-meth-dflt-params-duplicates.js b/test/language/expressions/class/gen-meth-dflt-params-duplicates.js
index 42b1c37ea3..122f245977 100644
--- a/test/language/expressions/class/gen-meth-dflt-params-duplicates.js
+++ b/test/language/expressions/class/gen-meth-dflt-params-duplicates.js
@@ -78,7 +78,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   *method(x = 0, x) {
diff --git a/test/language/expressions/class/gen-meth-dflt-params-rest.js b/test/language/expressions/class/gen-meth-dflt-params-rest.js
index 64d2219449..5a764c841a 100644
--- a/test/language/expressions/class/gen-meth-dflt-params-rest.js
+++ b/test/language/expressions/class/gen-meth-dflt-params-rest.js
@@ -82,7 +82,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   *method(...x = []) {
diff --git a/test/language/expressions/class/gen-meth-rest-params-trailing-comma-early-error.js b/test/language/expressions/class/gen-meth-rest-params-trailing-comma-early-error.js
index 700a428fd1..90d4922f12 100644
--- a/test/language/expressions/class/gen-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/class/gen-meth-rest-params-trailing-comma-early-error.js
@@ -75,7 +75,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   *method(...a,) {
diff --git a/test/language/expressions/class/gen-meth-static-dflt-params-duplicates.js b/test/language/expressions/class/gen-meth-static-dflt-params-duplicates.js
index d3ab2d7e83..ce82db7203 100644
--- a/test/language/expressions/class/gen-meth-static-dflt-params-duplicates.js
+++ b/test/language/expressions/class/gen-meth-static-dflt-params-duplicates.js
@@ -78,7 +78,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static *method(x = 0, x) {
diff --git a/test/language/expressions/class/gen-meth-static-dflt-params-rest.js b/test/language/expressions/class/gen-meth-static-dflt-params-rest.js
index 150582e2ab..50d13109dc 100644
--- a/test/language/expressions/class/gen-meth-static-dflt-params-rest.js
+++ b/test/language/expressions/class/gen-meth-static-dflt-params-rest.js
@@ -82,7 +82,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static *method(...x = []) {
diff --git a/test/language/expressions/class/gen-meth-static-rest-params-trailing-comma-early-error.js b/test/language/expressions/class/gen-meth-static-rest-params-trailing-comma-early-error.js
index 9e7c4c5044..dfbf4eeed9 100644
--- a/test/language/expressions/class/gen-meth-static-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/class/gen-meth-static-rest-params-trailing-comma-early-error.js
@@ -75,7 +75,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static *method(...a,) {
diff --git a/test/language/expressions/class/gen-method-param-dflt-yield.js b/test/language/expressions/class/gen-method-param-dflt-yield.js
index fb8a3ae9b0..9df05c656e 100644
--- a/test/language/expressions/class/gen-method-param-dflt-yield.js
+++ b/test/language/expressions/class/gen-method-param-dflt-yield.js
@@ -20,7 +20,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   *g(x = yield) {}
diff --git a/test/language/expressions/class/gen-method-static-yield-as-binding-identifier-escaped.js b/test/language/expressions/class/gen-method-static-yield-as-binding-identifier-escaped.js
index 80e474062d..126e14b0b0 100644
--- a/test/language/expressions/class/gen-method-static-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/gen-method-static-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *gen() {
     var yi\u0065ld;
diff --git a/test/language/expressions/class/gen-method-static-yield-as-binding-identifier.js b/test/language/expressions/class/gen-method-static-yield-as-binding-identifier.js
index 1b8d2e3654..d525041055 100644
--- a/test/language/expressions/class/gen-method-static-yield-as-binding-identifier.js
+++ b/test/language/expressions/class/gen-method-static-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *gen() {
     var yield;
diff --git a/test/language/expressions/class/gen-method-static-yield-as-identifier-reference-escaped.js b/test/language/expressions/class/gen-method-static-yield-as-identifier-reference-escaped.js
index f64f9eac56..e3ffa3bb7e 100644
--- a/test/language/expressions/class/gen-method-static-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/gen-method-static-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *gen() {
     void yi\u0065ld;
diff --git a/test/language/expressions/class/gen-method-static-yield-as-identifier-reference.js b/test/language/expressions/class/gen-method-static-yield-as-identifier-reference.js
index 068979cb89..b6680e8378 100644
--- a/test/language/expressions/class/gen-method-static-yield-as-identifier-reference.js
+++ b/test/language/expressions/class/gen-method-static-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *gen() {
     void yield;
diff --git a/test/language/expressions/class/gen-method-static-yield-as-label-identifier-escaped.js b/test/language/expressions/class/gen-method-static-yield-as-label-identifier-escaped.js
index ec3eb09c1c..026174cbc9 100644
--- a/test/language/expressions/class/gen-method-static-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/gen-method-static-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *gen() {
     yi\u0065ld: ;
diff --git a/test/language/expressions/class/gen-method-static-yield-as-label-identifier.js b/test/language/expressions/class/gen-method-static-yield-as-label-identifier.js
index 6fb8339e1e..bd76f9365e 100644
--- a/test/language/expressions/class/gen-method-static-yield-as-label-identifier.js
+++ b/test/language/expressions/class/gen-method-static-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *gen() {
     yield: ;
diff --git a/test/language/expressions/class/gen-method-static-yield-identifier-spread-strict.js b/test/language/expressions/class/gen-method-static-yield-identifier-spread-strict.js
index cd99572be7..6974c52317 100644
--- a/test/language/expressions/class/gen-method-static-yield-identifier-spread-strict.js
+++ b/test/language/expressions/class/gen-method-static-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/class/gen-method-static-yield-identifier-strict.js b/test/language/expressions/class/gen-method-static-yield-identifier-strict.js
index eb4b478a65..ccc5d97a1c 100644
--- a/test/language/expressions/class/gen-method-static-yield-identifier-strict.js
+++ b/test/language/expressions/class/gen-method-static-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/class/gen-method-yield-as-binding-identifier-escaped.js b/test/language/expressions/class/gen-method-yield-as-binding-identifier-escaped.js
index 063984db8f..5895941480 100644
--- a/test/language/expressions/class/gen-method-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/gen-method-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*gen() {
     var yi\u0065ld;
diff --git a/test/language/expressions/class/gen-method-yield-as-binding-identifier.js b/test/language/expressions/class/gen-method-yield-as-binding-identifier.js
index 93f02d2876..85d32ef32a 100644
--- a/test/language/expressions/class/gen-method-yield-as-binding-identifier.js
+++ b/test/language/expressions/class/gen-method-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*gen() {
     var yield;
diff --git a/test/language/expressions/class/gen-method-yield-as-identifier-reference-escaped.js b/test/language/expressions/class/gen-method-yield-as-identifier-reference-escaped.js
index e923d3c93a..67322b0520 100644
--- a/test/language/expressions/class/gen-method-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/gen-method-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*gen() {
     void yi\u0065ld;
diff --git a/test/language/expressions/class/gen-method-yield-as-identifier-reference.js b/test/language/expressions/class/gen-method-yield-as-identifier-reference.js
index 53d3147bbd..c4b364e743 100644
--- a/test/language/expressions/class/gen-method-yield-as-identifier-reference.js
+++ b/test/language/expressions/class/gen-method-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*gen() {
     void yield;
diff --git a/test/language/expressions/class/gen-method-yield-as-label-identifier-escaped.js b/test/language/expressions/class/gen-method-yield-as-label-identifier-escaped.js
index 5338421754..f55de9edf5 100644
--- a/test/language/expressions/class/gen-method-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/gen-method-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*gen() {
     yi\u0065ld: ;
diff --git a/test/language/expressions/class/gen-method-yield-as-label-identifier.js b/test/language/expressions/class/gen-method-yield-as-label-identifier.js
index 5fb430b525..aacecafb41 100644
--- a/test/language/expressions/class/gen-method-yield-as-label-identifier.js
+++ b/test/language/expressions/class/gen-method-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*gen() {
     yield: ;
diff --git a/test/language/expressions/class/gen-method-yield-identifier-spread-strict.js b/test/language/expressions/class/gen-method-yield-identifier-spread-strict.js
index 9c6b01319c..2a78953d02 100644
--- a/test/language/expressions/class/gen-method-yield-identifier-spread-strict.js
+++ b/test/language/expressions/class/gen-method-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/class/gen-method-yield-identifier-strict.js b/test/language/expressions/class/gen-method-yield-identifier-strict.js
index 217d8542ab..6bc1bc3ac4 100644
--- a/test/language/expressions/class/gen-method-yield-identifier-strict.js
+++ b/test/language/expressions/class/gen-method-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/class/gen-private-method-static-yield-as-binding-identifier-escaped.js b/test/language/expressions/class/gen-private-method-static-yield-as-binding-identifier-escaped.js
index 53428a582f..069cd96a8c 100644
--- a/test/language/expressions/class/gen-private-method-static-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/gen-private-method-static-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *#gen() {
     var yi\u0065ld;
diff --git a/test/language/expressions/class/gen-private-method-static-yield-as-binding-identifier.js b/test/language/expressions/class/gen-private-method-static-yield-as-binding-identifier.js
index a099b98c8a..6fd622c96c 100644
--- a/test/language/expressions/class/gen-private-method-static-yield-as-binding-identifier.js
+++ b/test/language/expressions/class/gen-private-method-static-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *#gen() {
     var yield;
diff --git a/test/language/expressions/class/gen-private-method-static-yield-as-identifier-reference-escaped.js b/test/language/expressions/class/gen-private-method-static-yield-as-identifier-reference-escaped.js
index 8316a60480..1a9d1e8f2c 100644
--- a/test/language/expressions/class/gen-private-method-static-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/gen-private-method-static-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *#gen() {
     void yi\u0065ld;
diff --git a/test/language/expressions/class/gen-private-method-static-yield-as-identifier-reference.js b/test/language/expressions/class/gen-private-method-static-yield-as-identifier-reference.js
index 8cfd05743c..e27e4587c8 100644
--- a/test/language/expressions/class/gen-private-method-static-yield-as-identifier-reference.js
+++ b/test/language/expressions/class/gen-private-method-static-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *#gen() {
     void yield;
diff --git a/test/language/expressions/class/gen-private-method-static-yield-as-label-identifier-escaped.js b/test/language/expressions/class/gen-private-method-static-yield-as-label-identifier-escaped.js
index d83017b824..9c79dd2fb9 100644
--- a/test/language/expressions/class/gen-private-method-static-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/gen-private-method-static-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *#gen() {
     yi\u0065ld: ;
diff --git a/test/language/expressions/class/gen-private-method-static-yield-as-label-identifier.js b/test/language/expressions/class/gen-private-method-static-yield-as-label-identifier.js
index 19a9c94901..ca8a2f0f42 100644
--- a/test/language/expressions/class/gen-private-method-static-yield-as-label-identifier.js
+++ b/test/language/expressions/class/gen-private-method-static-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class { static *#gen() {
     yield: ;
diff --git a/test/language/expressions/class/gen-private-method-static-yield-identifier-spread-strict.js b/test/language/expressions/class/gen-private-method-static-yield-identifier-spread-strict.js
index f3d5a4fa9d..bd987c15bb 100644
--- a/test/language/expressions/class/gen-private-method-static-yield-identifier-spread-strict.js
+++ b/test/language/expressions/class/gen-private-method-static-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/class/gen-private-method-static-yield-identifier-strict.js b/test/language/expressions/class/gen-private-method-static-yield-identifier-strict.js
index 95aefe1eef..0d5bfaca73 100644
--- a/test/language/expressions/class/gen-private-method-static-yield-identifier-strict.js
+++ b/test/language/expressions/class/gen-private-method-static-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/class/gen-private-method-yield-as-binding-identifier-escaped.js b/test/language/expressions/class/gen-private-method-yield-as-binding-identifier-escaped.js
index 073ff9fa76..72f907625f 100644
--- a/test/language/expressions/class/gen-private-method-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/class/gen-private-method-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*#gen() {
     var yi\u0065ld;
diff --git a/test/language/expressions/class/gen-private-method-yield-as-binding-identifier.js b/test/language/expressions/class/gen-private-method-yield-as-binding-identifier.js
index f67eafbe70..5835b36392 100644
--- a/test/language/expressions/class/gen-private-method-yield-as-binding-identifier.js
+++ b/test/language/expressions/class/gen-private-method-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*#gen() {
     var yield;
diff --git a/test/language/expressions/class/gen-private-method-yield-as-identifier-reference-escaped.js b/test/language/expressions/class/gen-private-method-yield-as-identifier-reference-escaped.js
index 09acee9ca1..18cb04ad4e 100644
--- a/test/language/expressions/class/gen-private-method-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/class/gen-private-method-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*#gen() {
     void yi\u0065ld;
diff --git a/test/language/expressions/class/gen-private-method-yield-as-identifier-reference.js b/test/language/expressions/class/gen-private-method-yield-as-identifier-reference.js
index b8ae3f659f..ddfc0e4dd7 100644
--- a/test/language/expressions/class/gen-private-method-yield-as-identifier-reference.js
+++ b/test/language/expressions/class/gen-private-method-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*#gen() {
     void yield;
diff --git a/test/language/expressions/class/gen-private-method-yield-as-label-identifier-escaped.js b/test/language/expressions/class/gen-private-method-yield-as-label-identifier-escaped.js
index 94a924b18f..e2e88380c1 100644
--- a/test/language/expressions/class/gen-private-method-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/class/gen-private-method-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*#gen() {
     yi\u0065ld: ;
diff --git a/test/language/expressions/class/gen-private-method-yield-as-label-identifier.js b/test/language/expressions/class/gen-private-method-yield-as-label-identifier.js
index 6e79b23f9a..80b1e7ac03 100644
--- a/test/language/expressions/class/gen-private-method-yield-as-label-identifier.js
+++ b/test/language/expressions/class/gen-private-method-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {*#gen() {
     yield: ;
diff --git a/test/language/expressions/class/gen-private-method-yield-identifier-spread-strict.js b/test/language/expressions/class/gen-private-method-yield-identifier-spread-strict.js
index aab3d3c044..38fdc84969 100644
--- a/test/language/expressions/class/gen-private-method-yield-identifier-spread-strict.js
+++ b/test/language/expressions/class/gen-private-method-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/class/gen-private-method-yield-identifier-strict.js b/test/language/expressions/class/gen-private-method-yield-identifier-strict.js
index 8d386b0060..251857af53 100644
--- a/test/language/expressions/class/gen-private-method-yield-identifier-strict.js
+++ b/test/language/expressions/class/gen-private-method-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/class/getter-param-dflt.js b/test/language/expressions/class/getter-param-dflt.js
index 6fb21498e1..2c3a642b79 100644
--- a/test/language/expressions/class/getter-param-dflt.js
+++ b/test/language/expressions/class/getter-param-dflt.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class { get a(param = null) {} };
diff --git a/test/language/expressions/class/meth-dflt-params-duplicates.js b/test/language/expressions/class/meth-dflt-params-duplicates.js
index ceb4b84032..0ef3d191a8 100644
--- a/test/language/expressions/class/meth-dflt-params-duplicates.js
+++ b/test/language/expressions/class/meth-dflt-params-duplicates.js
@@ -74,7 +74,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   method(x = 0, x) {
diff --git a/test/language/expressions/class/meth-dflt-params-rest.js b/test/language/expressions/class/meth-dflt-params-rest.js
index 6e7698a18a..9b42a970cc 100644
--- a/test/language/expressions/class/meth-dflt-params-rest.js
+++ b/test/language/expressions/class/meth-dflt-params-rest.js
@@ -78,7 +78,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   method(...x = []) {
diff --git a/test/language/expressions/class/meth-rest-params-trailing-comma-early-error.js b/test/language/expressions/class/meth-rest-params-trailing-comma-early-error.js
index e14dbc8f9d..9ab7e276e6 100644
--- a/test/language/expressions/class/meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/class/meth-rest-params-trailing-comma-early-error.js
@@ -70,7 +70,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   method(...a,) {
diff --git a/test/language/expressions/class/meth-static-dflt-params-duplicates.js b/test/language/expressions/class/meth-static-dflt-params-duplicates.js
index 2dea44b130..f64027fb62 100644
--- a/test/language/expressions/class/meth-static-dflt-params-duplicates.js
+++ b/test/language/expressions/class/meth-static-dflt-params-duplicates.js
@@ -74,7 +74,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static method(x = 0, x) {
diff --git a/test/language/expressions/class/meth-static-dflt-params-rest.js b/test/language/expressions/class/meth-static-dflt-params-rest.js
index 94ddbda662..653b82a45b 100644
--- a/test/language/expressions/class/meth-static-dflt-params-rest.js
+++ b/test/language/expressions/class/meth-static-dflt-params-rest.js
@@ -78,7 +78,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static method(...x = []) {
diff --git a/test/language/expressions/class/meth-static-rest-params-trailing-comma-early-error.js b/test/language/expressions/class/meth-static-rest-params-trailing-comma-early-error.js
index e88aa6e282..a067eca6a4 100644
--- a/test/language/expressions/class/meth-static-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/class/meth-static-rest-params-trailing-comma-early-error.js
@@ -70,7 +70,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static method(...a,) {
diff --git a/test/language/expressions/class/method-param-dflt-yield.js b/test/language/expressions/class/method-param-dflt-yield.js
index 2944a5c269..b99266f02d 100644
--- a/test/language/expressions/class/method-param-dflt-yield.js
+++ b/test/language/expressions/class/method-param-dflt-yield.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   m(x = yield) {}
diff --git a/test/language/expressions/class/static-gen-method-param-dflt-yield.js b/test/language/expressions/class/static-gen-method-param-dflt-yield.js
index 25f5698bd0..249eefec3b 100644
--- a/test/language/expressions/class/static-gen-method-param-dflt-yield.js
+++ b/test/language/expressions/class/static-gen-method-param-dflt-yield.js
@@ -20,7 +20,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static *g(x = yield) {}
diff --git a/test/language/expressions/class/static-method-param-dflt-yield.js b/test/language/expressions/class/static-method-param-dflt-yield.js
index 0553560ef4..bfc9714d5f 100644
--- a/test/language/expressions/class/static-method-param-dflt-yield.js
+++ b/test/language/expressions/class/static-method-param-dflt-yield.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, class {
   static m(x = yield) {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-class-body-ctor-duplicate.js b/test/language/expressions/class/syntax/early-errors/grammar-class-body-ctor-duplicate.js
index 2e1c3e6d3b..9f916729b0 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-class-body-ctor-duplicate.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-class-body-ctor-duplicate.js
@@ -17,7 +17,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-ctor-super-no-heritage.js b/test/language/expressions/class/syntax/early-errors/grammar-ctor-super-no-heritage.js
index 7c5a501247..969899d01c 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-ctor-super-no-heritage.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-ctor-super-no-heritage.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   constructor() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-ues-error.js b/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-ues-error.js
index 13db6d5170..07f145dbb2 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-ues-error.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-ues-error.js
@@ -64,7 +64,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   \u0000;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-zwj-error.js b/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-zwj-error.js
index fe03b4c0c2..599678e169 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-zwj-error.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-zwj-error.js
@@ -64,7 +64,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   \u200D_ZWJ;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-zwnj-error.js b/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-zwnj-error.js
index 6ce524f8ed..1aeaa9789b 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-zwnj-error.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-field-identifier-invalid-zwnj-error.js
@@ -64,7 +64,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   \u200C_ZWNJ;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-fields-same-line-error.js b/test/language/expressions/class/syntax/early-errors/grammar-fields-same-line-error.js
index 239e20cb3e..c59d3f9c0d 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-fields-same-line-error.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-fields-same-line-error.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   x y
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js
index 49b7e04edc..d089a43ac8 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #m;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js
index 1415bfedb4..3331ba8052 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   get #m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js
index bd566d1bb7..8ca448d3bc 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #m;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js
index 1a30b9ebe8..8bf3f2eb84 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   get #m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js
index 234e6e93b5..5659455e02 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js
index 761584c521..f2ecbb3c7b 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   set #m(_) {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js
index bf12f436c9..900715c750 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static #m;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js
index b294e24faf..6108d7b5d6 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static #m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js
index b28dcc3ce7..c88d2cc897 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #m;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js
index d5aea487d5..f78584b9ea 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   set #m(_) {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-constructor.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-constructor.js
index 43928fd29f..bc71785cc4 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-constructor.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #constructor
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-error.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-error.js
index 066e68d66d..792c5b7ac8 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-error.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-error.js
@@ -30,7 +30,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   # x
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-ues.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-ues.js
index d45144df3c..15dafdab4a 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-ues.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-ues.js
@@ -58,7 +58,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #\u0000;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwj-error.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwj-error.js
index 25f2a767a3..4c10be4322 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwj-error.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwj-error.js
@@ -58,7 +58,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #\u200D_ZWJ;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwnj-error.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwnj-error.js
index 991681d9d8..1cb22d5bd1 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwnj-error.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwnj-error.js
@@ -58,7 +58,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #\u200C_ZWNJ;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-get-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-get-meth.js
index 779e39edf1..e1e6ca3306 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-get-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-get-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   get # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-set-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-set-meth.js
index c06e96de88..ef08b39ef9 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-set-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-set-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   set # m(_) {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-async-gen-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-async-gen-meth.js
index 5113b34e5c..975657f608 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-async-gen-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-async-gen-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   async * # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-async-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-async-meth.js
index cda5f9dc04..6e89049158 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-async-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-async-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   async # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-call-expr.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-call-expr.js
index f05ee84029..9a81053c95 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-call-expr.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-call-expr.js
@@ -24,7 +24,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-field-init.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-field-init.js
index 5e2cfa4240..cadc86f392 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-field-init.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-field-init.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   # x = 1;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-field.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-field.js
index 8614e91759..5edb526b05 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-field.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-field.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   # x;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-gen-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-gen-meth.js
index 03b6ebfe05..d63870c6be 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-gen-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-gen-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   * # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-member-expr.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-member-expr.js
index 57fc7d91c1..708780c49b 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-member-expr.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-member-expr.js
@@ -24,7 +24,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-meth.case.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-meth.case.js
index 4c3346a415..e91f16b3c3 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-meth.case.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-meth.case.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-get-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-get-meth.js
index 825b0538d7..dafe8b22ab 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-get-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-get-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static get # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-set-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-set-meth.js
index 28192ebb19..4a019e6bf9 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-set-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-set-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static set # m(_) {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-gen-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-gen-meth.js
index 06300e58f0..680ff18dbb 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-gen-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-gen-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async * # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-meth.js
index 5da1364f0c..078ff7c2b9 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field-init.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field-init.js
index da5dd79250..1fa78e08d7 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field-init.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field-init.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static # x = 1;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field.js
index 8567a6c2da..7f4e496bdd 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static # x;
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-gen-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-gen-meth.js
index 5c0171704c..0f9b374c48 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-gen-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-gen-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static * # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-meth.js
index 8de5e26133..cc7e1baff6 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatename-whitespace-error-static-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static # m() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-privatenames-same-line-error.js b/test/language/expressions/class/syntax/early-errors/grammar-privatenames-same-line-error.js
index 5e7e653591..c6c15798c7 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-privatenames-same-line-error.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-privatenames-same-line-error.js
@@ -30,7 +30,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   #x #y
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-async-gen.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-async-gen.js
index 7858a85568..dea922ed73 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-async-gen.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-async-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   async * method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-async.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-async.js
index 8ab77a1380..2165ce99de 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-async.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-async.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   async method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-gen.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-gen.js
index bd6df7559f..f5491a0fc2 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-gen.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   * method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-get.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-get.js
index 026f2f3ace..263650daf0 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-get.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-get.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   get method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-method.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-method.js
index 9487b3ac3f..fcca096685 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-method.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-method.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-async-gen.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-async-gen.js
index 3a0a9b330c..9052ae8714 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-async-gen.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-async-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   async * #method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-async.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-async.js
index f2ff44fe2c..3a127ac55c 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-async.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-async.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   async #method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-gen.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-gen.js
index 70175e4eea..ad7d10442a 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-gen.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   * #method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-method.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-method.js
index 5309d04104..3ae853309e 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-method.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-private-method.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   #method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-set.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-set.js
index 582e71e0c3..b44b1afd0b 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-set.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-contains-super-set.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   set method(_) {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-async-gen.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-async-gen.js
index 7e7019c820..583608d1ae 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-async-gen.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-async-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   async * constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-async-meth.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-async-meth.js
index 1c7a857479..0d224848b1 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-async-meth.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-async-meth.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   async constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-gen.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-gen.js
index a4d81f066a..21f3725929 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-gen.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   * constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-get.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-get.js
index 5fea0260cd..28e3b63200 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-get.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-get.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   get constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js
index 0933acd98a..41cdab1613 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   set constructor(_) {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-async-gen-meth-prototype.js b/test/language/expressions/class/syntax/early-errors/grammar-static-async-gen-meth-prototype.js
index 68a5d6c57c..9bb774f094 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-async-gen-meth-prototype.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-async-gen-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async * prototype() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-async-gen-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-async-gen-meth-super.js
index b128fd0135..6e64d44320 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-async-gen-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-async-gen-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static async * method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-async-meth-prototype.js b/test/language/expressions/class/syntax/early-errors/grammar-static-async-meth-prototype.js
index 8484c68e3a..625e490b6e 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-async-meth-prototype.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-async-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async prototype() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-async-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-async-meth-super.js
index 9fd928a728..5570a1b1ed 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-async-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-async-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static async method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-gen-meth-prototype.js b/test/language/expressions/class/syntax/early-errors/grammar-static-gen-meth-prototype.js
index 2d7907276d..9de068e20b 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-gen-meth-prototype.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-gen-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static * prototype() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-gen-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-gen-meth-super.js
index a34115794f..0e6daa7323 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-gen-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-gen-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static * method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-get-meth-prototype.js b/test/language/expressions/class/syntax/early-errors/grammar-static-get-meth-prototype.js
index d153c636d9..fa426754b8 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-get-meth-prototype.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-get-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static get prototype() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-get-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-get-meth-super.js
index 31a2601ada..2754ebdd2a 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-get-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-get-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static get method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-meth-prototype.js b/test/language/expressions/class/syntax/early-errors/grammar-static-meth-prototype.js
index ccb0a46edb..03e5400209 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-meth-prototype.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static prototype() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-meth-super.js
index eea7dfa015..d66700ca06 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-gen-meth-constructor.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-gen-meth-constructor.js
index e95ee892ca..8e17609b99 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-gen-meth-constructor.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-gen-meth-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async * #constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-gen-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-gen-meth-super.js
index f820bf89e3..64bd0cc1e6 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-gen-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-gen-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static async * #method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-meth-constructor.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-meth-constructor.js
index 548852bf4e..6e37982855 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-meth-constructor.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-meth-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static async #constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-meth-super.js
index 264979fe98..558e55f0bf 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-private-async-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static async #method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-gen-meth-constructor.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-gen-meth-constructor.js
index c0c86d9077..e903bf844a 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-gen-meth-constructor.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-private-gen-meth-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static * #constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-gen-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-gen-meth-super.js
index 0d5529aa37..b5b60939f2 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-gen-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-private-gen-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static * #method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-meth-constructor.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-meth-constructor.js
index 724c267fa8..f4d795c43b 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-meth-constructor.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-private-meth-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static #constructor() {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-meth-super.js
index 12a9db93ec..06c84fb864 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-private-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static #method() {
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-privatename-constructor.js b/test/language/expressions/class/syntax/early-errors/grammar-static-privatename-constructor.js
index f5df647504..fe40793ad2 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-privatename-constructor.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-privatename-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static #constructor
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js b/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js
index 80f9280944..bbef49e795 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class {
   static set prototype(_) {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-super.js b/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-super.js
index 0b80546ed4..93a6663471 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-super.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var C = class extends Function{
   static set method(_) {
diff --git a/test/language/expressions/compound-assignment/11.13.2-6-1gs.js b/test/language/expressions/compound-assignment/11.13.2-6-1gs.js
index 07510aa7f7..78f9962bba 100644
--- a/test/language/expressions/compound-assignment/11.13.2-6-1gs.js
+++ b/test/language/expressions/compound-assignment/11.13.2-6-1gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 eval *= 20;
diff --git a/test/language/expressions/compound-assignment/add-non-simple.js b/test/language/expressions/compound-assignment/add-non-simple.js
index 5f290e0c9e..76eb1373fe 100644
--- a/test/language/expressions/compound-assignment/add-non-simple.js
+++ b/test/language/expressions/compound-assignment/add-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 += 1;
diff --git a/test/language/expressions/compound-assignment/btws-and-non-simple.js b/test/language/expressions/compound-assignment/btws-and-non-simple.js
index 9e87ecbedc..13a575ff35 100644
--- a/test/language/expressions/compound-assignment/btws-and-non-simple.js
+++ b/test/language/expressions/compound-assignment/btws-and-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 &= 1;
diff --git a/test/language/expressions/compound-assignment/btws-or-non-simple.js b/test/language/expressions/compound-assignment/btws-or-non-simple.js
index 4e834de795..a52f80bdd2 100644
--- a/test/language/expressions/compound-assignment/btws-or-non-simple.js
+++ b/test/language/expressions/compound-assignment/btws-or-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 |= 1;
diff --git a/test/language/expressions/compound-assignment/btws-xor-non-simple.js b/test/language/expressions/compound-assignment/btws-xor-non-simple.js
index 5914394c57..1380721e65 100644
--- a/test/language/expressions/compound-assignment/btws-xor-non-simple.js
+++ b/test/language/expressions/compound-assignment/btws-xor-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 ^= 1;
diff --git a/test/language/expressions/compound-assignment/div-non-simple.js b/test/language/expressions/compound-assignment/div-non-simple.js
index cffdd7b767..287f78cb96 100644
--- a/test/language/expressions/compound-assignment/div-non-simple.js
+++ b/test/language/expressions/compound-assignment/div-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 /= 1;
diff --git a/test/language/expressions/compound-assignment/left-shift-non-simple.js b/test/language/expressions/compound-assignment/left-shift-non-simple.js
index 6b57d132dc..343c54de97 100644
--- a/test/language/expressions/compound-assignment/left-shift-non-simple.js
+++ b/test/language/expressions/compound-assignment/left-shift-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 <<= 1;
diff --git a/test/language/expressions/compound-assignment/mod-div-non-simple.js b/test/language/expressions/compound-assignment/mod-div-non-simple.js
index dea70a1155..7876fdc19a 100644
--- a/test/language/expressions/compound-assignment/mod-div-non-simple.js
+++ b/test/language/expressions/compound-assignment/mod-div-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 %= 1;
diff --git a/test/language/expressions/compound-assignment/mult-non-simple.js b/test/language/expressions/compound-assignment/mult-non-simple.js
index a0bd0d679c..c5e2d18620 100644
--- a/test/language/expressions/compound-assignment/mult-non-simple.js
+++ b/test/language/expressions/compound-assignment/mult-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 *= 1;
diff --git a/test/language/expressions/compound-assignment/right-shift-non-simple.js b/test/language/expressions/compound-assignment/right-shift-non-simple.js
index 22c9826951..713ad4c1b5 100644
--- a/test/language/expressions/compound-assignment/right-shift-non-simple.js
+++ b/test/language/expressions/compound-assignment/right-shift-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 >>= 1;
diff --git a/test/language/expressions/compound-assignment/subtract-non-simple.js b/test/language/expressions/compound-assignment/subtract-non-simple.js
index a2570fd669..694ab1751d 100644
--- a/test/language/expressions/compound-assignment/subtract-non-simple.js
+++ b/test/language/expressions/compound-assignment/subtract-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 -= 1;
diff --git a/test/language/expressions/compound-assignment/u-right-shift-non-simple.js b/test/language/expressions/compound-assignment/u-right-shift-non-simple.js
index 80f3325261..4ee6468a2d 100644
--- a/test/language/expressions/compound-assignment/u-right-shift-non-simple.js
+++ b/test/language/expressions/compound-assignment/u-right-shift-non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1 >>>= 1;
diff --git a/test/language/expressions/conditional/in-branch-2.js b/test/language/expressions/conditional/in-branch-2.js
index 128f3931bb..cfcc63a453 100644
--- a/test/language/expressions/conditional/in-branch-2.js
+++ b/test/language/expressions/conditional/in-branch-2.js
@@ -17,6 +17,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (true ? 0 : 0 in {}; false; ) ;
diff --git a/test/language/expressions/conditional/in-condition.js b/test/language/expressions/conditional/in-condition.js
index 2990f297d8..295c5592dc 100644
--- a/test/language/expressions/conditional/in-condition.js
+++ b/test/language/expressions/conditional/in-condition.js
@@ -17,6 +17,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ('' in {} ? 0 : 0; false; ) ;
diff --git a/test/language/expressions/delete/11.4.1-5-a-5gs.js b/test/language/expressions/delete/11.4.1-5-a-5gs.js
index 0b7ef9936c..6b53cf410d 100644
--- a/test/language/expressions/delete/11.4.1-5-a-5gs.js
+++ b/test/language/expressions/delete/11.4.1-5-a-5gs.js
@@ -12,7 +12,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var _11_4_1_5 = 7;
 delete _11_4_1_5;
diff --git a/test/language/expressions/delete/identifier-strict.js b/test/language/expressions/delete/identifier-strict.js
index 3838eb2b55..5faa5b7d3c 100644
--- a/test/language/expressions/delete/identifier-strict.js
+++ b/test/language/expressions/delete/identifier-strict.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 delete test262identifier;
diff --git a/test/language/expressions/exponentiation/exp-operator-syntax-error-bitnot-unary-expression-base.js b/test/language/expressions/exponentiation/exp-operator-syntax-error-bitnot-unary-expression-base.js
index 0d48b694c9..5ccb8438b6 100644
--- a/test/language/expressions/exponentiation/exp-operator-syntax-error-bitnot-unary-expression-base.js
+++ b/test/language/expressions/exponentiation/exp-operator-syntax-error-bitnot-unary-expression-base.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ~3 ** 2;
diff --git a/test/language/expressions/exponentiation/exp-operator-syntax-error-delete-unary-expression-base.js b/test/language/expressions/exponentiation/exp-operator-syntax-error-delete-unary-expression-base.js
index 7fcc88e3bb..6e112053e7 100644
--- a/test/language/expressions/exponentiation/exp-operator-syntax-error-delete-unary-expression-base.js
+++ b/test/language/expressions/exponentiation/exp-operator-syntax-error-delete-unary-expression-base.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 delete o.p ** 2;
diff --git a/test/language/expressions/exponentiation/exp-operator-syntax-error-logical-not-unary-expression-base.js b/test/language/expressions/exponentiation/exp-operator-syntax-error-logical-not-unary-expression-base.js
index 88ca18cbc3..b453969e34 100644
--- a/test/language/expressions/exponentiation/exp-operator-syntax-error-logical-not-unary-expression-base.js
+++ b/test/language/expressions/exponentiation/exp-operator-syntax-error-logical-not-unary-expression-base.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 !1 ** 2;
diff --git a/test/language/expressions/exponentiation/exp-operator-syntax-error-negate-unary-expression-base.js b/test/language/expressions/exponentiation/exp-operator-syntax-error-negate-unary-expression-base.js
index a166720ec3..992e7925f0 100644
--- a/test/language/expressions/exponentiation/exp-operator-syntax-error-negate-unary-expression-base.js
+++ b/test/language/expressions/exponentiation/exp-operator-syntax-error-negate-unary-expression-base.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 -3 ** 2;
diff --git a/test/language/expressions/exponentiation/exp-operator-syntax-error-plus-unary-expression-base.js b/test/language/expressions/exponentiation/exp-operator-syntax-error-plus-unary-expression-base.js
index a85459efac..c475d138a1 100644
--- a/test/language/expressions/exponentiation/exp-operator-syntax-error-plus-unary-expression-base.js
+++ b/test/language/expressions/exponentiation/exp-operator-syntax-error-plus-unary-expression-base.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 +1 ** 2;
diff --git a/test/language/expressions/exponentiation/exp-operator-syntax-error-typeof-unary-expression-base.js b/test/language/expressions/exponentiation/exp-operator-syntax-error-typeof-unary-expression-base.js
index 3e31b6f721..2193981d69 100644
--- a/test/language/expressions/exponentiation/exp-operator-syntax-error-typeof-unary-expression-base.js
+++ b/test/language/expressions/exponentiation/exp-operator-syntax-error-typeof-unary-expression-base.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 typeof 1 ** 2;
diff --git a/test/language/expressions/exponentiation/exp-operator-syntax-error-void-unary-expression-base.js b/test/language/expressions/exponentiation/exp-operator-syntax-error-void-unary-expression-base.js
index 7fc62b972d..bf5ffc94c3 100644
--- a/test/language/expressions/exponentiation/exp-operator-syntax-error-void-unary-expression-base.js
+++ b/test/language/expressions/exponentiation/exp-operator-syntax-error-void-unary-expression-base.js
@@ -20,5 +20,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 void 1 ** 2;
diff --git a/test/language/expressions/function/dflt-params-duplicates.js b/test/language/expressions/function/dflt-params-duplicates.js
index 81f9829dea..46c93e7014 100644
--- a/test/language/expressions/function/dflt-params-duplicates.js
+++ b/test/language/expressions/function/dflt-params-duplicates.js
@@ -54,7 +54,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function(x = 0, x) {
   
diff --git a/test/language/expressions/function/dflt-params-rest.js b/test/language/expressions/function/dflt-params-rest.js
index e6edbf74e6..81af424a35 100644
--- a/test/language/expressions/function/dflt-params-rest.js
+++ b/test/language/expressions/function/dflt-params-rest.js
@@ -58,7 +58,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function(...x = []) {
   
diff --git a/test/language/expressions/function/dstr-ary-ptrn-rest-init-ary.js b/test/language/expressions/function/dstr-ary-ptrn-rest-init-ary.js
index 1fe91cf1b5..37aac0511a 100644
--- a/test/language/expressions/function/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/function/dstr-ary-ptrn-rest-init-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-ary-ptrn-rest-init-id.js b/test/language/expressions/function/dstr-ary-ptrn-rest-init-id.js
index 4a5169c955..50c96b556b 100644
--- a/test/language/expressions/function/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/function/dstr-ary-ptrn-rest-init-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-ary-ptrn-rest-init-obj.js b/test/language/expressions/function/dstr-ary-ptrn-rest-init-obj.js
index 2c9254fe19..65caf7d2b6 100644
--- a/test/language/expressions/function/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/function/dstr-ary-ptrn-rest-init-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-ary.js
index 9d9848ac5a..5efef36de5 100644
--- a/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-id.js b/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-id.js
index 952aa1ddb6..0a1837e6a9 100644
--- a/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-obj.js
index e442a714e0..f2984e868f 100644
--- a/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/function/dstr-ary-ptrn-rest-not-final-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-ary.js
index 1a1348ea8c..9280fd632e 100644
--- a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-id.js
index 033463387d..a777a989fd 100644
--- a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-obj.js
index 284c78cb65..ce7aca93e2 100644
--- a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-init-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
index c8a85302a8..2c8e21d7d0 100644
--- a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-id.js
index edd6536253..2c6c9e7bc9 100644
--- a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
index 0edb1730f7..989693b49e 100644
--- a/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/function/early-body-super-call.js b/test/language/expressions/function/early-body-super-call.js
index ebbeea2309..24a88c8b3e 100644
--- a/test/language/expressions/function/early-body-super-call.js
+++ b/test/language/expressions/function/early-body-super-call.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function() {
   super();
diff --git a/test/language/expressions/function/early-body-super-prop.js b/test/language/expressions/function/early-body-super-prop.js
index ed03779e49..74f70bede5 100644
--- a/test/language/expressions/function/early-body-super-prop.js
+++ b/test/language/expressions/function/early-body-super-prop.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function() {
   super.x;
diff --git a/test/language/expressions/function/early-params-super-call.js b/test/language/expressions/function/early-params-super-call.js
index dcae4d9e1a..b2dd6a7663 100644
--- a/test/language/expressions/function/early-params-super-call.js
+++ b/test/language/expressions/function/early-params-super-call.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function(x = super()) {};
diff --git a/test/language/expressions/function/early-params-super-prop.js b/test/language/expressions/function/early-params-super-prop.js
index 58a1905feb..c7d2472071 100644
--- a/test/language/expressions/function/early-params-super-prop.js
+++ b/test/language/expressions/function/early-params-super-prop.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function(x = super.x) {};
diff --git a/test/language/expressions/function/name-arguments-strict-body.js b/test/language/expressions/function/name-arguments-strict-body.js
index f765d76f0a..28266383f6 100644
--- a/test/language/expressions/function/name-arguments-strict-body.js
+++ b/test/language/expressions/function/name-arguments-strict-body.js
@@ -13,6 +13,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function arguments() {'use strict';});
diff --git a/test/language/expressions/function/name-arguments-strict.js b/test/language/expressions/function/name-arguments-strict.js
index 54be8f4556..92f45a06b3 100644
--- a/test/language/expressions/function/name-arguments-strict.js
+++ b/test/language/expressions/function/name-arguments-strict.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function arguments() {});
diff --git a/test/language/expressions/function/name-eval-strict-body.js b/test/language/expressions/function/name-eval-strict-body.js
index 876b3541e6..80b4bf5abe 100644
--- a/test/language/expressions/function/name-eval-strict-body.js
+++ b/test/language/expressions/function/name-eval-strict-body.js
@@ -13,6 +13,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function eval() {'use strict';});
diff --git a/test/language/expressions/function/name-eval-strict.js b/test/language/expressions/function/name-eval-strict.js
index 9d19fd2991..1d2ba1ec90 100644
--- a/test/language/expressions/function/name-eval-strict.js
+++ b/test/language/expressions/function/name-eval-strict.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function eval() {});
diff --git a/test/language/expressions/function/param-dflt-yield-strict.js b/test/language/expressions/function/param-dflt-yield-strict.js
index dfe03c2ab5..a59059202b 100644
--- a/test/language/expressions/function/param-dflt-yield-strict.js
+++ b/test/language/expressions/function/param-dflt-yield-strict.js
@@ -16,7 +16,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *g() {
   0, function(x = yield) {
diff --git a/test/language/expressions/function/param-duplicated-strict-1.js b/test/language/expressions/function/param-duplicated-strict-1.js
index 27bffc594b..88746b5b4d 100644
--- a/test/language/expressions/function/param-duplicated-strict-1.js
+++ b/test/language/expressions/function/param-duplicated-strict-1.js
@@ -17,6 +17,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function (param, param) { });
diff --git a/test/language/expressions/function/param-duplicated-strict-2.js b/test/language/expressions/function/param-duplicated-strict-2.js
index e6a4e3d4d2..6042ebce5c 100644
--- a/test/language/expressions/function/param-duplicated-strict-2.js
+++ b/test/language/expressions/function/param-duplicated-strict-2.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function (param1, param2, param1) { });
diff --git a/test/language/expressions/function/param-duplicated-strict-3.js b/test/language/expressions/function/param-duplicated-strict-3.js
index 15460ae5fd..8d8e5ed121 100644
--- a/test/language/expressions/function/param-duplicated-strict-3.js
+++ b/test/language/expressions/function/param-duplicated-strict-3.js
@@ -17,6 +17,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function (param, param, param) { });
diff --git a/test/language/expressions/function/param-duplicated-strict-body-1.js b/test/language/expressions/function/param-duplicated-strict-body-1.js
index 96c19162da..c4c2025c90 100644
--- a/test/language/expressions/function/param-duplicated-strict-body-1.js
+++ b/test/language/expressions/function/param-duplicated-strict-body-1.js
@@ -17,6 +17,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function (param, param) { 'use strict'; });
diff --git a/test/language/expressions/function/param-duplicated-strict-body-2.js b/test/language/expressions/function/param-duplicated-strict-body-2.js
index afe158b2d0..d50e8fcc23 100644
--- a/test/language/expressions/function/param-duplicated-strict-body-2.js
+++ b/test/language/expressions/function/param-duplicated-strict-body-2.js
@@ -18,6 +18,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function (param1, param2, param1) { 'use strict'; });
diff --git a/test/language/expressions/function/param-duplicated-strict-body-3.js b/test/language/expressions/function/param-duplicated-strict-body-3.js
index 35e1493349..a575f01559 100644
--- a/test/language/expressions/function/param-duplicated-strict-body-3.js
+++ b/test/language/expressions/function/param-duplicated-strict-body-3.js
@@ -16,6 +16,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function (param, param, param) { 'use strict'; });
diff --git a/test/language/expressions/function/param-eval-strict-body.js b/test/language/expressions/function/param-eval-strict-body.js
index d6b3a20f53..e4a6006596 100644
--- a/test/language/expressions/function/param-eval-strict-body.js
+++ b/test/language/expressions/function/param-eval-strict-body.js
@@ -17,6 +17,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function (eval) { 'use strict'; });
diff --git a/test/language/expressions/function/rest-params-trailing-comma-early-error.js b/test/language/expressions/function/rest-params-trailing-comma-early-error.js
index 2d84266e87..8fd9b1ca58 100644
--- a/test/language/expressions/function/rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/function/rest-params-trailing-comma-early-error.js
@@ -50,7 +50,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function(...a,) {
   
diff --git a/test/language/expressions/function/use-strict-with-non-simple-param.js b/test/language/expressions/function/use-strict-with-non-simple-param.js
index 4ef97c3cf2..b8317b67db 100644
--- a/test/language/expressions/function/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/function/use-strict-with-non-simple-param.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var f = function(a = 0) {
   "use strict";
diff --git a/test/language/expressions/generators/dflt-params-duplicates.js b/test/language/expressions/generators/dflt-params-duplicates.js
index 9494b1aa8f..45b4769792 100644
--- a/test/language/expressions/generators/dflt-params-duplicates.js
+++ b/test/language/expressions/generators/dflt-params-duplicates.js
@@ -55,7 +55,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function*(x = 0, x) {
   
diff --git a/test/language/expressions/generators/dflt-params-rest.js b/test/language/expressions/generators/dflt-params-rest.js
index e33fc22993..e65fabd222 100644
--- a/test/language/expressions/generators/dflt-params-rest.js
+++ b/test/language/expressions/generators/dflt-params-rest.js
@@ -59,7 +59,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function*(...x = []) {
   
diff --git a/test/language/expressions/generators/dstr-ary-ptrn-rest-init-ary.js b/test/language/expressions/generators/dstr-ary-ptrn-rest-init-ary.js
index bef4556872..4efb82b361 100644
--- a/test/language/expressions/generators/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/generators/dstr-ary-ptrn-rest-init-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-ary-ptrn-rest-init-id.js b/test/language/expressions/generators/dstr-ary-ptrn-rest-init-id.js
index daee44e335..7ddbf8c98e 100644
--- a/test/language/expressions/generators/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/generators/dstr-ary-ptrn-rest-init-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-ary-ptrn-rest-init-obj.js b/test/language/expressions/generators/dstr-ary-ptrn-rest-init-obj.js
index 51abd6dbe1..29a98c4277 100644
--- a/test/language/expressions/generators/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/generators/dstr-ary-ptrn-rest-init-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-ary.js
index 6d97b9750c..f9bcc5f710 100644
--- a/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-id.js b/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-id.js
index a7739124fa..b1285f100f 100644
--- a/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-obj.js
index d6c33ad17d..a6553f3951 100644
--- a/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/generators/dstr-ary-ptrn-rest-not-final-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-ary.js
index 29c36df074..8af741823f 100644
--- a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-id.js
index e08386ea56..1f38f7c805 100644
--- a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-obj.js
index 65be27ba6f..03aeeff68f 100644
--- a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-init-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-ary.js
index 7ca04efe70..0f47ac5ca6 100644
--- a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-id.js
index 36f5279105..b8766c9c30 100644
--- a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-obj.js
index b7173f46a7..9e37dc574d 100644
--- a/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/generators/dstr-dflt-ary-ptrn-rest-not-final-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var f;
diff --git a/test/language/expressions/generators/named-yield-as-binding-identifier-escaped.js b/test/language/expressions/generators/named-yield-as-binding-identifier-escaped.js
index 836dabb919..6494e84329 100644
--- a/test/language/expressions/generators/named-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/generators/named-yield-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *g() {
   var yi\u0065ld;
diff --git a/test/language/expressions/generators/named-yield-as-binding-identifier.js b/test/language/expressions/generators/named-yield-as-binding-identifier.js
index a81318f197..1d93570544 100644
--- a/test/language/expressions/generators/named-yield-as-binding-identifier.js
+++ b/test/language/expressions/generators/named-yield-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *g() {
   var yield;
diff --git a/test/language/expressions/generators/named-yield-as-identifier-reference-escaped.js b/test/language/expressions/generators/named-yield-as-identifier-reference-escaped.js
index 90a3b32cbd..4d122fb06a 100644
--- a/test/language/expressions/generators/named-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/generators/named-yield-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *g() {
   void yi\u0065ld;
diff --git a/test/language/expressions/generators/named-yield-as-identifier-reference.js b/test/language/expressions/generators/named-yield-as-identifier-reference.js
index 497796fb1c..2fd35f2cb0 100644
--- a/test/language/expressions/generators/named-yield-as-identifier-reference.js
+++ b/test/language/expressions/generators/named-yield-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *g() {
   void yield;
diff --git a/test/language/expressions/generators/named-yield-as-label-identifier-escaped.js b/test/language/expressions/generators/named-yield-as-label-identifier-escaped.js
index d4965e7b0c..fbe9ecf3ea 100644
--- a/test/language/expressions/generators/named-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/generators/named-yield-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *g() {
   yi\u0065ld: ;
diff --git a/test/language/expressions/generators/named-yield-as-label-identifier.js b/test/language/expressions/generators/named-yield-as-label-identifier.js
index 72de6b39a0..1bc801cf86 100644
--- a/test/language/expressions/generators/named-yield-as-label-identifier.js
+++ b/test/language/expressions/generators/named-yield-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *g() {
   yield: ;
diff --git a/test/language/expressions/generators/named-yield-identifier-spread-strict.js b/test/language/expressions/generators/named-yield-identifier-spread-strict.js
index d034037e8d..9ea3df2e5d 100644
--- a/test/language/expressions/generators/named-yield-identifier-spread-strict.js
+++ b/test/language/expressions/generators/named-yield-identifier-spread-strict.js
@@ -23,7 +23,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/generators/named-yield-identifier-strict.js b/test/language/expressions/generators/named-yield-identifier-strict.js
index 38f6fe784c..7bbe4e64d7 100644
--- a/test/language/expressions/generators/named-yield-identifier-strict.js
+++ b/test/language/expressions/generators/named-yield-identifier-strict.js
@@ -16,7 +16,7 @@ info: |
       function * BindingIdentifier opt ( FormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/generators/param-dflt-yield.js b/test/language/expressions/generators/param-dflt-yield.js
index 3d3078c870..cfdd00f036 100644
--- a/test/language/expressions/generators/param-dflt-yield.js
+++ b/test/language/expressions/generators/param-dflt-yield.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function*(x = yield) {};
diff --git a/test/language/expressions/generators/rest-params-trailing-comma-early-error.js b/test/language/expressions/generators/rest-params-trailing-comma-early-error.js
index db53203d1b..aecf5c32b7 100644
--- a/test/language/expressions/generators/rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/generators/rest-params-trailing-comma-early-error.js
@@ -52,7 +52,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, function*(...a,) {
   
diff --git a/test/language/expressions/generators/use-strict-with-non-simple-param.js b/test/language/expressions/generators/use-strict-with-non-simple-param.js
index a622e75f7d..64979d74f3 100644
--- a/test/language/expressions/generators/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/generators/use-strict-with-non-simple-param.js
@@ -15,7 +15,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var f = function*(a = 0) {
   "use strict";
diff --git a/test/language/expressions/generators/yield-as-binding-identifier-escaped.js b/test/language/expressions/generators/yield-as-binding-identifier-escaped.js
index 1d15d0fa52..c09efac65c 100644
--- a/test/language/expressions/generators/yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/generators/yield-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *() {
   var yi\u0065ld;
diff --git a/test/language/expressions/generators/yield-as-binding-identifier.js b/test/language/expressions/generators/yield-as-binding-identifier.js
index eefbae33ef..7d88f95ddf 100644
--- a/test/language/expressions/generators/yield-as-binding-identifier.js
+++ b/test/language/expressions/generators/yield-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *() {
   var yield;
diff --git a/test/language/expressions/generators/yield-as-generator-expression-binding-identifier.js b/test/language/expressions/generators/yield-as-generator-expression-binding-identifier.js
index d738340794..55edb36a50 100644
--- a/test/language/expressions/generators/yield-as-generator-expression-binding-identifier.js
+++ b/test/language/expressions/generators/yield-as-generator-expression-binding-identifier.js
@@ -12,6 +12,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var g = function* yield() {};
diff --git a/test/language/expressions/generators/yield-as-identifier-reference-escaped.js b/test/language/expressions/generators/yield-as-identifier-reference-escaped.js
index 93b5526f57..2010eb8243 100644
--- a/test/language/expressions/generators/yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/generators/yield-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *() {
   void yi\u0065ld;
diff --git a/test/language/expressions/generators/yield-as-identifier-reference.js b/test/language/expressions/generators/yield-as-identifier-reference.js
index 5435cf9b1d..4d8b522cd5 100644
--- a/test/language/expressions/generators/yield-as-identifier-reference.js
+++ b/test/language/expressions/generators/yield-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *() {
   void yield;
diff --git a/test/language/expressions/generators/yield-as-label-identifier-escaped.js b/test/language/expressions/generators/yield-as-label-identifier-escaped.js
index 28b7997060..ed82d03418 100644
--- a/test/language/expressions/generators/yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/generators/yield-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *() {
   yi\u0065ld: ;
diff --git a/test/language/expressions/generators/yield-as-label-identifier.js b/test/language/expressions/generators/yield-as-label-identifier.js
index b54fa24c2f..455f2447e1 100644
--- a/test/language/expressions/generators/yield-as-label-identifier.js
+++ b/test/language/expressions/generators/yield-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var gen = function *() {
   yield: ;
diff --git a/test/language/expressions/generators/yield-as-logical-or-expression.js b/test/language/expressions/generators/yield-as-logical-or-expression.js
index 4fa8c6547b..178a5a513f 100644
--- a/test/language/expressions/generators/yield-as-logical-or-expression.js
+++ b/test/language/expressions/generators/yield-as-logical-or-expression.js
@@ -11,7 +11,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var g = function*() {
diff --git a/test/language/expressions/generators/yield-as-parameter.js b/test/language/expressions/generators/yield-as-parameter.js
index d38884b658..a8afd52b04 100644
--- a/test/language/expressions/generators/yield-as-parameter.js
+++ b/test/language/expressions/generators/yield-as-parameter.js
@@ -12,6 +12,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var g = function*(yield) {};
diff --git a/test/language/expressions/generators/yield-identifier-spread-strict.js b/test/language/expressions/generators/yield-identifier-spread-strict.js
index 020a031ab5..25cfa982c7 100644
--- a/test/language/expressions/generators/yield-identifier-spread-strict.js
+++ b/test/language/expressions/generators/yield-identifier-spread-strict.js
@@ -23,7 +23,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/generators/yield-identifier-strict.js b/test/language/expressions/generators/yield-identifier-strict.js
index 4da060d740..accc020621 100644
--- a/test/language/expressions/generators/yield-identifier-strict.js
+++ b/test/language/expressions/generators/yield-identifier-strict.js
@@ -16,7 +16,7 @@ info: |
       function * BindingIdentifier opt ( FormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/generators/yield-star-after-newline.js b/test/language/expressions/generators/yield-star-after-newline.js
index b65122ea78..6b256f857f 100644
--- a/test/language/expressions/generators/yield-star-after-newline.js
+++ b/test/language/expressions/generators/yield-star-after-newline.js
@@ -11,7 +11,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var g = function*() {
   yield
diff --git a/test/language/expressions/generators/yield-weak-binding.js b/test/language/expressions/generators/yield-weak-binding.js
index 19595571a6..608f189682 100644
--- a/test/language/expressions/generators/yield-weak-binding.js
+++ b/test/language/expressions/generators/yield-weak-binding.js
@@ -11,6 +11,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var g = function*() { yield 3 + yield 4; };
diff --git a/test/language/expressions/new.target/escaped-new.js b/test/language/expressions/new.target/escaped-new.js
index 8b480256eb..999480835b 100644
--- a/test/language/expressions/new.target/escaped-new.js
+++ b/test/language/expressions/new.target/escaped-new.js
@@ -18,7 +18,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
     n\u0065w.target;
diff --git a/test/language/expressions/new.target/escaped-target.js b/test/language/expressions/new.target/escaped-target.js
index 04c7e6b93c..50aede41d4 100644
--- a/test/language/expressions/new.target/escaped-target.js
+++ b/test/language/expressions/new.target/escaped-target.js
@@ -18,7 +18,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
     new.t\u0061rget;
diff --git a/test/language/expressions/object/11.1.5-1gs.js b/test/language/expressions/object/11.1.5-1gs.js
index 8972e5ba6f..2dfbee710b 100644
--- a/test/language/expressions/object/11.1.5-1gs.js
+++ b/test/language/expressions/object/11.1.5-1gs.js
@@ -13,6 +13,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = { set _11_1_5_1_fun(eval) {}};
diff --git a/test/language/expressions/object/cover-initialized-name.js b/test/language/expressions/object/cover-initialized-name.js
index 5c059dd05a..865795abbe 100644
--- a/test/language/expressions/object/cover-initialized-name.js
+++ b/test/language/expressions/object/cover-initialized-name.js
@@ -27,6 +27,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ a = 1 });
diff --git a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
index 9844a7448a..be34fb9095 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
index ff8e4979ba..6c9e610570 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
index 2dddc5ad30..db42832ba4 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
index f93cd87cc2..b609489b20 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
index 4fe6a8323e..5aa78c76df 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
index 9a19a70e10..921dfff062 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index 8fefb83cf1..b694a0393e 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
index 08b6c49f10..d6f45edab5 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index ae79cd6707..e7c42ec518 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 49a9252403..4073f55352 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index c375b2a097..7424db0c67 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 86719a95e2..1b40a915a5 100644
--- a/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/object/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -30,7 +30,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-ary.js
index acd6ad513e..2bd11e2d14 100644
--- a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-ary.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-id.js
index 674764a827..b0cf49f422 100644
--- a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-id.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-obj.js
index b52baef82a..4a93122797 100644
--- a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-init-obj.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
index e326964c00..620f87f387 100644
--- a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
index 2bfc8ae971..c286e39c85 100644
--- a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
index febeea489a..1ffe231679 100644
--- a/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/object/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index ad849dceac..36416e1618 100644
--- a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
index a3599f0ee7..5b43b67e5c 100644
--- a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index 4317e6474f..08fcb338d7 100644
--- a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 920ad83087..dbdd2cee3b 100644
--- a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index 5fd9e3e818..229281221e 100644
--- a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 09d8222eb3..291013d5e9 100644
--- a/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/object/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -52,7 +52,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-ary.js b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-ary.js
index 1909aab8a6..37e180b7ae 100644
--- a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-id.js b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-id.js
index e1e3431390..b4a892b0cf 100644
--- a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-obj.js b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-obj.js
index 98a96f077a..75569cba9a 100644
--- a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-ary.js
index 31ef6cce46..f494c42c28 100644
--- a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-id.js b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-id.js
index d8d82b6f7b..b5a2ebcefe 100644
--- a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-obj.js
index 4d6bb67b03..ea72eafbf6 100644
--- a/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/object/dstr-meth-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
index e4c386e436..acba9939bc 100644
--- a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-id.js
index 58a6d4e5dc..2d9d52ee67 100644
--- a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
index e70e71f8ab..e7c96935a6 100644
--- a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 0675eb59d3..0af4d6f35d 100644
--- a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
index d8de9459c7..886b0314f3 100644
--- a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 85e6acf796..37f1c34fca 100644
--- a/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/expressions/object/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -49,7 +49,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 var obj = {
diff --git a/test/language/expressions/object/getter-body-strict-inside.js b/test/language/expressions/object/getter-body-strict-inside.js
index 8b3545b8ef..d452868668 100644
--- a/test/language/expressions/object/getter-body-strict-inside.js
+++ b/test/language/expressions/object/getter-body-strict-inside.js
@@ -12,7 +12,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void {
   get x() {
diff --git a/test/language/expressions/object/getter-body-strict-outside.js b/test/language/expressions/object/getter-body-strict-outside.js
index 708b2947b2..f5118ad764 100644
--- a/test/language/expressions/object/getter-body-strict-outside.js
+++ b/test/language/expressions/object/getter-body-strict-outside.js
@@ -11,7 +11,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void {
   get x() {
diff --git a/test/language/expressions/object/getter-param-dflt.js b/test/language/expressions/object/getter-param-dflt.js
index b7d67df037..8fcc61a406 100644
--- a/test/language/expressions/object/getter-param-dflt.js
+++ b/test/language/expressions/object/getter-param-dflt.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, { get a(param = null) {} };
diff --git a/test/language/expressions/object/identifier-shorthand-invalid-computed-name.js b/test/language/expressions/object/identifier-shorthand-invalid-computed-name.js
index 1e85f91357..680350a369 100644
--- a/test/language/expressions/object/identifier-shorthand-invalid-computed-name.js
+++ b/test/language/expressions/object/identifier-shorthand-invalid-computed-name.js
@@ -24,6 +24,6 @@ negative:
 var x = "y";
 var y = 42;
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({[x]});
diff --git a/test/language/expressions/object/identifier-shorthand-invalid-zero.js b/test/language/expressions/object/identifier-shorthand-invalid-zero.js
index 82265008a4..d08db2875c 100644
--- a/test/language/expressions/object/identifier-shorthand-invalid-zero.js
+++ b/test/language/expressions/object/identifier-shorthand-invalid-zero.js
@@ -17,6 +17,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({0});
diff --git a/test/language/expressions/object/method-definition/async-await-as-binding-identifier-escaped.js b/test/language/expressions/object/method-definition/async-await-as-binding-identifier-escaped.js
index 7109d354b2..09c5cc170c 100644
--- a/test/language/expressions/object/method-definition/async-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/object/method-definition/async-await-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var obj = {
diff --git a/test/language/expressions/object/method-definition/async-await-as-binding-identifier.js b/test/language/expressions/object/method-definition/async-await-as-binding-identifier.js
index 63c1d81ac8..f2c4499b66 100644
--- a/test/language/expressions/object/method-definition/async-await-as-binding-identifier.js
+++ b/test/language/expressions/object/method-definition/async-await-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var obj = {
diff --git a/test/language/expressions/object/method-definition/async-await-as-identifier-reference-escaped.js b/test/language/expressions/object/method-definition/async-await-as-identifier-reference-escaped.js
index 799dda00bd..a34e821203 100644
--- a/test/language/expressions/object/method-definition/async-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/object/method-definition/async-await-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var obj = {
diff --git a/test/language/expressions/object/method-definition/async-await-as-identifier-reference.js b/test/language/expressions/object/method-definition/async-await-as-identifier-reference.js
index 24db88019c..a201e8de27 100644
--- a/test/language/expressions/object/method-definition/async-await-as-identifier-reference.js
+++ b/test/language/expressions/object/method-definition/async-await-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var obj = {
diff --git a/test/language/expressions/object/method-definition/async-await-as-label-identifier-escaped.js b/test/language/expressions/object/method-definition/async-await-as-label-identifier-escaped.js
index 956e6d7193..a3a6202957 100644
--- a/test/language/expressions/object/method-definition/async-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/object/method-definition/async-await-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var obj = {
diff --git a/test/language/expressions/object/method-definition/async-await-as-label-identifier.js b/test/language/expressions/object/method-definition/async-await-as-label-identifier.js
index 5ecfe4ee49..4a2efe54af 100644
--- a/test/language/expressions/object/method-definition/async-await-as-label-identifier.js
+++ b/test/language/expressions/object/method-definition/async-await-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var obj = {
diff --git a/test/language/expressions/object/method-definition/async-gen-await-as-binding-identifier-escaped.js b/test/language/expressions/object/method-definition/async-gen-await-as-binding-identifier-escaped.js
index 454c453b5e..6b55d7fbdf 100644
--- a/test/language/expressions/object/method-definition/async-gen-await-as-binding-identifier-escaped.js
+++ b/test/language/expressions/object/method-definition/async-gen-await-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-await-as-binding-identifier.js b/test/language/expressions/object/method-definition/async-gen-await-as-binding-identifier.js
index 96b0339975..a641df8715 100644
--- a/test/language/expressions/object/method-definition/async-gen-await-as-binding-identifier.js
+++ b/test/language/expressions/object/method-definition/async-gen-await-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-await-as-identifier-reference-escaped.js b/test/language/expressions/object/method-definition/async-gen-await-as-identifier-reference-escaped.js
index 290939a9fa..37afa09def 100644
--- a/test/language/expressions/object/method-definition/async-gen-await-as-identifier-reference-escaped.js
+++ b/test/language/expressions/object/method-definition/async-gen-await-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-await-as-identifier-reference.js b/test/language/expressions/object/method-definition/async-gen-await-as-identifier-reference.js
index 2b87d11a0d..8bacfc238b 100644
--- a/test/language/expressions/object/method-definition/async-gen-await-as-identifier-reference.js
+++ b/test/language/expressions/object/method-definition/async-gen-await-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-await-as-label-identifier-escaped.js b/test/language/expressions/object/method-definition/async-gen-await-as-label-identifier-escaped.js
index c67efe8043..b93ff75c8e 100644
--- a/test/language/expressions/object/method-definition/async-gen-await-as-label-identifier-escaped.js
+++ b/test/language/expressions/object/method-definition/async-gen-await-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-await-as-label-identifier.js b/test/language/expressions/object/method-definition/async-gen-await-as-label-identifier.js
index 14b9746c17..d61b3ae2b7 100644
--- a/test/language/expressions/object/method-definition/async-gen-await-as-label-identifier.js
+++ b/test/language/expressions/object/method-definition/async-gen-await-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-meth-dflt-params-duplicates.js b/test/language/expressions/object/method-definition/async-gen-meth-dflt-params-duplicates.js
index 6d74d64d4a..b76d0ba232 100644
--- a/test/language/expressions/object/method-definition/async-gen-meth-dflt-params-duplicates.js
+++ b/test/language/expressions/object/method-definition/async-gen-meth-dflt-params-duplicates.js
@@ -38,7 +38,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   async *method(x = 0, x) {
diff --git a/test/language/expressions/object/method-definition/async-gen-meth-dflt-params-rest.js b/test/language/expressions/object/method-definition/async-gen-meth-dflt-params-rest.js
index b774ec1e3f..e2a7403bc0 100644
--- a/test/language/expressions/object/method-definition/async-gen-meth-dflt-params-rest.js
+++ b/test/language/expressions/object/method-definition/async-gen-meth-dflt-params-rest.js
@@ -42,7 +42,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   async *method(...x = []) {
diff --git a/test/language/expressions/object/method-definition/async-gen-meth-escaped-async.js b/test/language/expressions/object/method-definition/async-gen-meth-escaped-async.js
index 54e803f2ac..7b28ecbef6 100644
--- a/test/language/expressions/object/method-definition/async-gen-meth-escaped-async.js
+++ b/test/language/expressions/object/method-definition/async-gen-meth-escaped-async.js
@@ -19,7 +19,7 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
     \u0061sync* m(){}
diff --git a/test/language/expressions/object/method-definition/async-gen-meth-rest-params-trailing-comma-early-error.js b/test/language/expressions/object/method-definition/async-gen-meth-rest-params-trailing-comma-early-error.js
index b15beb366c..bd8e8ccae1 100644
--- a/test/language/expressions/object/method-definition/async-gen-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/object/method-definition/async-gen-meth-rest-params-trailing-comma-early-error.js
@@ -35,7 +35,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   async *method(...a,) {
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-as-binding-identifier-escaped.js b/test/language/expressions/object/method-definition/async-gen-yield-as-binding-identifier-escaped.js
index 0ed6225980..87527724ca 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-as-binding-identifier.js b/test/language/expressions/object/method-definition/async-gen-yield-as-binding-identifier.js
index a2825ee1a9..49dd69fda6 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-as-binding-identifier.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-as-identifier-reference-escaped.js b/test/language/expressions/object/method-definition/async-gen-yield-as-identifier-reference-escaped.js
index f6fba4870d..78bf52d9a1 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-as-identifier-reference.js b/test/language/expressions/object/method-definition/async-gen-yield-as-identifier-reference.js
index 9cf1aa9085..3e42123ca5 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-as-identifier-reference.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-as-label-identifier-escaped.js b/test/language/expressions/object/method-definition/async-gen-yield-as-label-identifier-escaped.js
index c48fc5154a..2355d3eaa4 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-as-label-identifier.js b/test/language/expressions/object/method-definition/async-gen-yield-as-label-identifier.js
index d98fdd4150..792178ffac 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-as-label-identifier.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   async *method() {
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-identifier-spread-strict.js b/test/language/expressions/object/method-definition/async-gen-yield-identifier-spread-strict.js
index fa5f001f81..0f5d653762 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-identifier-spread-strict.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-identifier-spread-strict.js
@@ -23,7 +23,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-identifier-strict.js b/test/language/expressions/object/method-definition/async-gen-yield-identifier-strict.js
index de7214d8a5..6e764d42da 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-identifier-strict.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-identifier-strict.js
@@ -16,7 +16,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/object/method-definition/async-meth-dflt-params-duplicates.js b/test/language/expressions/object/method-definition/async-meth-dflt-params-duplicates.js
index f658f27f4c..e51bf7b818 100644
--- a/test/language/expressions/object/method-definition/async-meth-dflt-params-duplicates.js
+++ b/test/language/expressions/object/method-definition/async-meth-dflt-params-duplicates.js
@@ -30,7 +30,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 ({
diff --git a/test/language/expressions/object/method-definition/async-meth-dflt-params-rest.js b/test/language/expressions/object/method-definition/async-meth-dflt-params-rest.js
index 4fa4ad46bd..beb53da752 100644
--- a/test/language/expressions/object/method-definition/async-meth-dflt-params-rest.js
+++ b/test/language/expressions/object/method-definition/async-meth-dflt-params-rest.js
@@ -34,7 +34,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 ({
diff --git a/test/language/expressions/object/method-definition/async-meth-escaped-async.js b/test/language/expressions/object/method-definition/async-meth-escaped-async.js
index cd0534858d..b32bd73f28 100644
--- a/test/language/expressions/object/method-definition/async-meth-escaped-async.js
+++ b/test/language/expressions/object/method-definition/async-meth-escaped-async.js
@@ -19,7 +19,7 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
     \u0061sync m(){}
diff --git a/test/language/expressions/object/method-definition/async-meth-rest-params-trailing-comma-early-error.js b/test/language/expressions/object/method-definition/async-meth-rest-params-trailing-comma-early-error.js
index ee1b1a4141..3325f322ad 100644
--- a/test/language/expressions/object/method-definition/async-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/object/method-definition/async-meth-rest-params-trailing-comma-early-error.js
@@ -27,7 +27,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 ({
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-NSPL-with-USD.js b/test/language/expressions/object/method-definition/early-errors-object-method-NSPL-with-USD.js
index 519e13c114..e9d60213e3 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-NSPL-with-USD.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-NSPL-with-USD.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ({
   foo(x = 1) {"use strict"}
 });
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-arguments-in-formal-parameters.js b/test/language/expressions/object/method-definition/early-errors-object-method-arguments-in-formal-parameters.js
index 6fe8ac0774..2c2b700287 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-arguments-in-formal-parameters.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-arguments-in-formal-parameters.js
@@ -11,7 +11,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ({
   async foo (arguments) { }
 })
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-async-lineterminator.js b/test/language/expressions/object/method-definition/early-errors-object-method-async-lineterminator.js
index 9d57661509..753dc5a785 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-async-lineterminator.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-async-lineterminator.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
   async
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-await-in-formals-default.js b/test/language/expressions/object/method-definition/early-errors-object-method-await-in-formals-default.js
index fbdde90ff2..9085b44470 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-await-in-formals-default.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-await-in-formals-default.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ({
   async foo (x = await) {  }
 })
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-await-in-formals.js b/test/language/expressions/object/method-definition/early-errors-object-method-await-in-formals.js
index 8e8c939fc8..119d969cb2 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-await-in-formals.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-await-in-formals.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ({
   async foo (await) {  }
 })
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-body-contains-super-call.js b/test/language/expressions/object/method-definition/early-errors-object-method-body-contains-super-call.js
index 4ed290b029..b02c757197 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-body-contains-super-call.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-body-contains-super-call.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ({
   async foo () { super() }
 })
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-duplicate-parameters.js b/test/language/expressions/object/method-definition/early-errors-object-method-duplicate-parameters.js
index 5558f3e41f..79b0c13659 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-duplicate-parameters.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-duplicate-parameters.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ({
   async foo(a, a) { }
 })
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-eval-in-formal-parameters.js b/test/language/expressions/object/method-definition/early-errors-object-method-eval-in-formal-parameters.js
index 535513f6cb..69b3d38240 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-eval-in-formal-parameters.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-eval-in-formal-parameters.js
@@ -11,7 +11,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ({
   async foo(eval) { }
 })
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-formals-body-duplicate.js b/test/language/expressions/object/method-definition/early-errors-object-method-formals-body-duplicate.js
index 27a1a6c2b7..c4d0271dfd 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-formals-body-duplicate.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-formals-body-duplicate.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
   async function foo(bar) { let bar; }
diff --git a/test/language/expressions/object/method-definition/early-errors-object-method-formals-contains-super-call.js b/test/language/expressions/object/method-definition/early-errors-object-method-formals-contains-super-call.js
index 9960bc14fb..536fe65d6a 100644
--- a/test/language/expressions/object/method-definition/early-errors-object-method-formals-contains-super-call.js
+++ b/test/language/expressions/object/method-definition/early-errors-object-method-formals-contains-super-call.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 ({
   async foo(foo = super()) { }
 })
diff --git a/test/language/expressions/object/method-definition/escaped-get.js b/test/language/expressions/object/method-definition/escaped-get.js
index 153a7f1d0b..f573600678 100644
--- a/test/language/expressions/object/method-definition/escaped-get.js
+++ b/test/language/expressions/object/method-definition/escaped-get.js
@@ -18,7 +18,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
   g\u0065t m() {}
diff --git a/test/language/expressions/object/method-definition/escaped-set.js b/test/language/expressions/object/method-definition/escaped-set.js
index 31f640cd9e..be90588c3b 100644
--- a/test/language/expressions/object/method-definition/escaped-set.js
+++ b/test/language/expressions/object/method-definition/escaped-set.js
@@ -18,7 +18,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
   s\u0065t m(v) {}
diff --git a/test/language/expressions/object/method-definition/gen-meth-dflt-params-duplicates.js b/test/language/expressions/object/method-definition/gen-meth-dflt-params-duplicates.js
index d38b0166c3..ba97785763 100644
--- a/test/language/expressions/object/method-definition/gen-meth-dflt-params-duplicates.js
+++ b/test/language/expressions/object/method-definition/gen-meth-dflt-params-duplicates.js
@@ -60,7 +60,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   *method(x = 0, x) {
diff --git a/test/language/expressions/object/method-definition/gen-meth-dflt-params-rest.js b/test/language/expressions/object/method-definition/gen-meth-dflt-params-rest.js
index e5e66a8702..9023c962eb 100644
--- a/test/language/expressions/object/method-definition/gen-meth-dflt-params-rest.js
+++ b/test/language/expressions/object/method-definition/gen-meth-dflt-params-rest.js
@@ -64,7 +64,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   *method(...x = []) {
diff --git a/test/language/expressions/object/method-definition/gen-meth-rest-params-trailing-comma-early-error.js b/test/language/expressions/object/method-definition/gen-meth-rest-params-trailing-comma-early-error.js
index b4ff9e82c0..085e9f99e4 100644
--- a/test/language/expressions/object/method-definition/gen-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/object/method-definition/gen-meth-rest-params-trailing-comma-early-error.js
@@ -57,7 +57,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   *method(...a,) {
diff --git a/test/language/expressions/object/method-definition/gen-yield-as-binding-identifier-escaped.js b/test/language/expressions/object/method-definition/gen-yield-as-binding-identifier-escaped.js
index 5bc0ac88be..f86606013c 100644
--- a/test/language/expressions/object/method-definition/gen-yield-as-binding-identifier-escaped.js
+++ b/test/language/expressions/object/method-definition/gen-yield-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *method() {
diff --git a/test/language/expressions/object/method-definition/gen-yield-as-binding-identifier.js b/test/language/expressions/object/method-definition/gen-yield-as-binding-identifier.js
index 7e4fd7b31b..5ca6a728ff 100644
--- a/test/language/expressions/object/method-definition/gen-yield-as-binding-identifier.js
+++ b/test/language/expressions/object/method-definition/gen-yield-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *method() {
diff --git a/test/language/expressions/object/method-definition/gen-yield-as-identifier-reference-escaped.js b/test/language/expressions/object/method-definition/gen-yield-as-identifier-reference-escaped.js
index 8fc7ce139f..e77dd7d5ae 100644
--- a/test/language/expressions/object/method-definition/gen-yield-as-identifier-reference-escaped.js
+++ b/test/language/expressions/object/method-definition/gen-yield-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *method() {
diff --git a/test/language/expressions/object/method-definition/gen-yield-as-identifier-reference.js b/test/language/expressions/object/method-definition/gen-yield-as-identifier-reference.js
index 0b1008c69f..d609f97bc6 100644
--- a/test/language/expressions/object/method-definition/gen-yield-as-identifier-reference.js
+++ b/test/language/expressions/object/method-definition/gen-yield-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *method() {
diff --git a/test/language/expressions/object/method-definition/gen-yield-as-label-identifier-escaped.js b/test/language/expressions/object/method-definition/gen-yield-as-label-identifier-escaped.js
index 0e72d77596..c49e20ec63 100644
--- a/test/language/expressions/object/method-definition/gen-yield-as-label-identifier-escaped.js
+++ b/test/language/expressions/object/method-definition/gen-yield-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *method() {
diff --git a/test/language/expressions/object/method-definition/gen-yield-as-label-identifier.js b/test/language/expressions/object/method-definition/gen-yield-as-label-identifier.js
index e496903219..5af1651890 100644
--- a/test/language/expressions/object/method-definition/gen-yield-as-label-identifier.js
+++ b/test/language/expressions/object/method-definition/gen-yield-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *method() {
diff --git a/test/language/expressions/object/method-definition/gen-yield-identifier-spread-strict.js b/test/language/expressions/object/method-definition/gen-yield-identifier-spread-strict.js
index 1f8535eea4..da84d4d4a1 100644
--- a/test/language/expressions/object/method-definition/gen-yield-identifier-spread-strict.js
+++ b/test/language/expressions/object/method-definition/gen-yield-identifier-spread-strict.js
@@ -23,7 +23,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/object/method-definition/gen-yield-identifier-strict.js b/test/language/expressions/object/method-definition/gen-yield-identifier-strict.js
index dda6fe5562..3bea70d7d7 100644
--- a/test/language/expressions/object/method-definition/gen-yield-identifier-strict.js
+++ b/test/language/expressions/object/method-definition/gen-yield-identifier-strict.js
@@ -16,7 +16,7 @@ info: |
       * PropertyName[?Yield, ?Await] ( UniqueFormalParameters[+Yield, ~Await] ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/expressions/object/method-definition/generator-param-id-yield.js b/test/language/expressions/object/method-definition/generator-param-id-yield.js
index 7226a44bd2..8ac595b272 100644
--- a/test/language/expressions/object/method-definition/generator-param-id-yield.js
+++ b/test/language/expressions/object/method-definition/generator-param-id-yield.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
   *method(yield) {}
diff --git a/test/language/expressions/object/method-definition/generator-param-init-yield.js b/test/language/expressions/object/method-definition/generator-param-init-yield.js
index a63139eaf2..4ae37d8ffe 100644
--- a/test/language/expressions/object/method-definition/generator-param-init-yield.js
+++ b/test/language/expressions/object/method-definition/generator-param-init-yield.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function*() {
   ({
diff --git a/test/language/expressions/object/method-definition/generator-param-redecl-const.js b/test/language/expressions/object/method-definition/generator-param-redecl-const.js
index b011721815..5a326b8289 100644
--- a/test/language/expressions/object/method-definition/generator-param-redecl-const.js
+++ b/test/language/expressions/object/method-definition/generator-param-redecl-const.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
     *foo(a) {
diff --git a/test/language/expressions/object/method-definition/generator-param-redecl-let.js b/test/language/expressions/object/method-definition/generator-param-redecl-let.js
index fab88ce203..7039c8bc46 100644
--- a/test/language/expressions/object/method-definition/generator-param-redecl-let.js
+++ b/test/language/expressions/object/method-definition/generator-param-redecl-let.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
     *foo(a) {
diff --git a/test/language/expressions/object/method-definition/generator-super-call-body.js b/test/language/expressions/object/method-definition/generator-super-call-body.js
index 782a90275e..f3d5da1841 100644
--- a/test/language/expressions/object/method-definition/generator-super-call-body.js
+++ b/test/language/expressions/object/method-definition/generator-super-call-body.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
     *foo(a) {
diff --git a/test/language/expressions/object/method-definition/generator-super-call-param.js b/test/language/expressions/object/method-definition/generator-super-call-param.js
index a54c41429c..b3137040d8 100644
--- a/test/language/expressions/object/method-definition/generator-super-call-param.js
+++ b/test/language/expressions/object/method-definition/generator-super-call-param.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
     *foo(a = super()) {
diff --git a/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
index 493b0708a5..b340d92700 100644
--- a/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
@@ -15,7 +15,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var o = {
   *m(a = 0) {
diff --git a/test/language/expressions/object/method-definition/meth-dflt-params-duplicates.js b/test/language/expressions/object/method-definition/meth-dflt-params-duplicates.js
index a370be1148..fed6be76ad 100644
--- a/test/language/expressions/object/method-definition/meth-dflt-params-duplicates.js
+++ b/test/language/expressions/object/method-definition/meth-dflt-params-duplicates.js
@@ -56,7 +56,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   method(x = 0, x) {
diff --git a/test/language/expressions/object/method-definition/meth-dflt-params-rest.js b/test/language/expressions/object/method-definition/meth-dflt-params-rest.js
index 446d40ccb4..72d80c0637 100644
--- a/test/language/expressions/object/method-definition/meth-dflt-params-rest.js
+++ b/test/language/expressions/object/method-definition/meth-dflt-params-rest.js
@@ -60,7 +60,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   method(...x = []) {
diff --git a/test/language/expressions/object/method-definition/meth-rest-params-trailing-comma-early-error.js b/test/language/expressions/object/method-definition/meth-rest-params-trailing-comma-early-error.js
index c634518b50..b52038bc7b 100644
--- a/test/language/expressions/object/method-definition/meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/expressions/object/method-definition/meth-rest-params-trailing-comma-early-error.js
@@ -52,7 +52,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0, {
   method(...a,) {
diff --git a/test/language/expressions/object/method-definition/name-param-redecl.js b/test/language/expressions/object/method-definition/name-param-redecl.js
index e0a54b1208..27ff0d5ca8 100644
--- a/test/language/expressions/object/method-definition/name-param-redecl.js
+++ b/test/language/expressions/object/method-definition/name-param-redecl.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   method(param) {
diff --git a/test/language/expressions/object/method-definition/name-super-call-body.js b/test/language/expressions/object/method-definition/name-super-call-body.js
index c33c42be01..b4a69cef83 100644
--- a/test/language/expressions/object/method-definition/name-super-call-body.js
+++ b/test/language/expressions/object/method-definition/name-super-call-body.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
   method() {
diff --git a/test/language/expressions/object/method-definition/name-super-call-param.js b/test/language/expressions/object/method-definition/name-super-call-param.js
index bafe1879f8..293435476f 100644
--- a/test/language/expressions/object/method-definition/name-super-call-param.js
+++ b/test/language/expressions/object/method-definition/name-super-call-param.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({
   method(param = super) {}
diff --git a/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
index 429da51c28..2a7c28a35d 100644
--- a/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var o = {
   set m(a = 0) {
diff --git a/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
index 42f5c8ada9..535463790c 100644
--- a/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var o = {
   m(a = 0) {
diff --git a/test/language/expressions/object/method-definition/yield-as-logical-or-expression.js b/test/language/expressions/object/method-definition/yield-as-logical-or-expression.js
index 5203daa6eb..54e3da0efa 100644
--- a/test/language/expressions/object/method-definition/yield-as-logical-or-expression.js
+++ b/test/language/expressions/object/method-definition/yield-as-logical-or-expression.js
@@ -11,7 +11,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *g() {
diff --git a/test/language/expressions/object/method-definition/yield-as-parameter.js b/test/language/expressions/object/method-definition/yield-as-parameter.js
index 2305b1c265..25c3f7ee14 100644
--- a/test/language/expressions/object/method-definition/yield-as-parameter.js
+++ b/test/language/expressions/object/method-definition/yield-as-parameter.js
@@ -12,7 +12,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *g(yield) {}
diff --git a/test/language/expressions/object/method-definition/yield-star-after-newline.js b/test/language/expressions/object/method-definition/yield-star-after-newline.js
index 469727f16b..6c5ae66756 100644
--- a/test/language/expressions/object/method-definition/yield-star-after-newline.js
+++ b/test/language/expressions/object/method-definition/yield-star-after-newline.js
@@ -11,7 +11,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *g() {
diff --git a/test/language/expressions/object/method-definition/yield-weak-binding.js b/test/language/expressions/object/method-definition/yield-weak-binding.js
index 6670cc7849..d4853ccedc 100644
--- a/test/language/expressions/object/method-definition/yield-weak-binding.js
+++ b/test/language/expressions/object/method-definition/yield-weak-binding.js
@@ -11,7 +11,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var obj = {
   *g() { yield 3 + yield 4; }
diff --git a/test/language/expressions/object/prop-def-invalid-async-prefix.js b/test/language/expressions/object/prop-def-invalid-async-prefix.js
index f72ec27726..a2fe1eee91 100644
--- a/test/language/expressions/object/prop-def-invalid-async-prefix.js
+++ b/test/language/expressions/object/prop-def-invalid-async-prefix.js
@@ -30,6 +30,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({async async});
diff --git a/test/language/expressions/object/setter-body-strict-inside.js b/test/language/expressions/object/setter-body-strict-inside.js
index 6100bb9d58..ece9ef0255 100644
--- a/test/language/expressions/object/setter-body-strict-inside.js
+++ b/test/language/expressions/object/setter-body-strict-inside.js
@@ -12,7 +12,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void {
   set x(value) {
diff --git a/test/language/expressions/object/setter-body-strict-outside.js b/test/language/expressions/object/setter-body-strict-outside.js
index da3cd978ab..b82dfd470b 100644
--- a/test/language/expressions/object/setter-body-strict-outside.js
+++ b/test/language/expressions/object/setter-body-strict-outside.js
@@ -11,7 +11,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void {
   set x(value) {
diff --git a/test/language/expressions/object/setter-param-arguments-strict-inside.js b/test/language/expressions/object/setter-param-arguments-strict-inside.js
index 7ebae2e562..846d441fc0 100644
--- a/test/language/expressions/object/setter-param-arguments-strict-inside.js
+++ b/test/language/expressions/object/setter-param-arguments-strict-inside.js
@@ -12,7 +12,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void {
   set x(arguments) {
diff --git a/test/language/expressions/object/setter-param-arguments-strict-outside.js b/test/language/expressions/object/setter-param-arguments-strict-outside.js
index 74cef5cce7..ea1522a452 100644
--- a/test/language/expressions/object/setter-param-arguments-strict-outside.js
+++ b/test/language/expressions/object/setter-param-arguments-strict-outside.js
@@ -12,7 +12,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void {
   set x(arguments) {}
diff --git a/test/language/expressions/object/setter-param-eval-strict-inside.js b/test/language/expressions/object/setter-param-eval-strict-inside.js
index 143bbe732c..370055e9b6 100644
--- a/test/language/expressions/object/setter-param-eval-strict-inside.js
+++ b/test/language/expressions/object/setter-param-eval-strict-inside.js
@@ -12,7 +12,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void {
   set x(eval) {
diff --git a/test/language/expressions/object/setter-param-eval-strict-outside.js b/test/language/expressions/object/setter-param-eval-strict-outside.js
index 8cc908afb2..e1cb447ec1 100644
--- a/test/language/expressions/object/setter-param-eval-strict-outside.js
+++ b/test/language/expressions/object/setter-param-eval-strict-outside.js
@@ -12,7 +12,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void {
   set x(eval) {}
diff --git a/test/language/expressions/postfix-decrement/arguments.js b/test/language/expressions/postfix-decrement/arguments.js
index 67910b3c11..f7188c760a 100644
--- a/test/language/expressions/postfix-decrement/arguments.js
+++ b/test/language/expressions/postfix-decrement/arguments.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 arguments--;
diff --git a/test/language/expressions/postfix-decrement/eval.js b/test/language/expressions/postfix-decrement/eval.js
index f406580ab2..4a7a263910 100644
--- a/test/language/expressions/postfix-decrement/eval.js
+++ b/test/language/expressions/postfix-decrement/eval.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 eval--;
diff --git a/test/language/expressions/postfix-decrement/line-terminator-carriage-return.js b/test/language/expressions/postfix-decrement/line-terminator-carriage-return.js
index 3d21f70ef5..e80699e906 100644
--- a/test/language/expressions/postfix-decrement/line-terminator-carriage-return.js
+++ b/test/language/expressions/postfix-decrement/line-terminator-carriage-return.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x
 --;
diff --git a/test/language/expressions/postfix-decrement/line-terminator-line-feed.js b/test/language/expressions/postfix-decrement/line-terminator-line-feed.js
index 8af18a5024..11d580e632 100644
--- a/test/language/expressions/postfix-decrement/line-terminator-line-feed.js
+++ b/test/language/expressions/postfix-decrement/line-terminator-line-feed.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x
 --;
diff --git a/test/language/expressions/postfix-decrement/line-terminator-line-separator.js b/test/language/expressions/postfix-decrement/line-terminator-line-separator.js
index d1c479ea41..71fd80f371 100644
--- a/test/language/expressions/postfix-decrement/line-terminator-line-separator.js
+++ b/test/language/expressions/postfix-decrement/line-terminator-line-separator.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x
--;
 // The preceding line contains an unprintable LINE SEPARATOR character (U+2028)
diff --git a/test/language/expressions/postfix-decrement/line-terminator-paragraph-separator.js b/test/language/expressions/postfix-decrement/line-terminator-paragraph-separator.js
index a384906f45..f77882a965 100644
--- a/test/language/expressions/postfix-decrement/line-terminator-paragraph-separator.js
+++ b/test/language/expressions/postfix-decrement/line-terminator-paragraph-separator.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x
--;
 // The preceding line contains an unprintable PARAGRAPH SEPARATOR character
diff --git a/test/language/expressions/postfix-decrement/non-simple.js b/test/language/expressions/postfix-decrement/non-simple.js
index 6f90ac91c0..cc323d7d71 100644
--- a/test/language/expressions/postfix-decrement/non-simple.js
+++ b/test/language/expressions/postfix-decrement/non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1--;
diff --git a/test/language/expressions/postfix-decrement/target-cover-newtarget.js b/test/language/expressions/postfix-decrement/target-cover-newtarget.js
index 0c0e48f989..a56749b7f0 100644
--- a/test/language/expressions/postfix-decrement/target-cover-newtarget.js
+++ b/test/language/expressions/postfix-decrement/target-cover-newtarget.js
@@ -25,7 +25,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   (new.target)--;
diff --git a/test/language/expressions/postfix-decrement/target-cover-yieldexpr.js b/test/language/expressions/postfix-decrement/target-cover-yieldexpr.js
index 3576226914..a774956f89 100644
--- a/test/language/expressions/postfix-decrement/target-cover-yieldexpr.js
+++ b/test/language/expressions/postfix-decrement/target-cover-yieldexpr.js
@@ -27,7 +27,7 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   (yield)--;
diff --git a/test/language/expressions/postfix-decrement/target-newtarget.js b/test/language/expressions/postfix-decrement/target-newtarget.js
index 7a039843b4..472f5cd107 100644
--- a/test/language/expressions/postfix-decrement/target-newtarget.js
+++ b/test/language/expressions/postfix-decrement/target-newtarget.js
@@ -25,7 +25,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   new.target--;
diff --git a/test/language/expressions/postfix-increment/11.3.1-2-1gs.js b/test/language/expressions/postfix-increment/11.3.1-2-1gs.js
index 494022a711..ba56870f69 100644
--- a/test/language/expressions/postfix-increment/11.3.1-2-1gs.js
+++ b/test/language/expressions/postfix-increment/11.3.1-2-1gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 arguments++;
diff --git a/test/language/expressions/postfix-increment/arguments.js b/test/language/expressions/postfix-increment/arguments.js
index 75a5a7603f..b2bfce27c4 100644
--- a/test/language/expressions/postfix-increment/arguments.js
+++ b/test/language/expressions/postfix-increment/arguments.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 arguments++;
diff --git a/test/language/expressions/postfix-increment/eval.js b/test/language/expressions/postfix-increment/eval.js
index 4493a9df63..329dae9e1c 100644
--- a/test/language/expressions/postfix-increment/eval.js
+++ b/test/language/expressions/postfix-increment/eval.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 eval++;
diff --git a/test/language/expressions/postfix-increment/line-terminator-carriage-return.js b/test/language/expressions/postfix-increment/line-terminator-carriage-return.js
index 4b9bc5f47c..a875207c8e 100644
--- a/test/language/expressions/postfix-increment/line-terminator-carriage-return.js
+++ b/test/language/expressions/postfix-increment/line-terminator-carriage-return.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x
 ++;
diff --git a/test/language/expressions/postfix-increment/line-terminator-line-feed.js b/test/language/expressions/postfix-increment/line-terminator-line-feed.js
index 2bad0a2825..a3b10f1915 100644
--- a/test/language/expressions/postfix-increment/line-terminator-line-feed.js
+++ b/test/language/expressions/postfix-increment/line-terminator-line-feed.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x
 ++;
diff --git a/test/language/expressions/postfix-increment/line-terminator-line-separator.js b/test/language/expressions/postfix-increment/line-terminator-line-separator.js
index f3fe3a0a5b..a709982198 100644
--- a/test/language/expressions/postfix-increment/line-terminator-line-separator.js
+++ b/test/language/expressions/postfix-increment/line-terminator-line-separator.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x
++;
 // The preceding line contains an unprintable LINE SEPARATOR character (U+2028)
diff --git a/test/language/expressions/postfix-increment/line-terminator-paragraph-separator.js b/test/language/expressions/postfix-increment/line-terminator-paragraph-separator.js
index fe59704953..76870f24f3 100644
--- a/test/language/expressions/postfix-increment/line-terminator-paragraph-separator.js
+++ b/test/language/expressions/postfix-increment/line-terminator-paragraph-separator.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x
++;
 // The preceding line contains an unprintable PARAGRAPH SEPARATOR character
diff --git a/test/language/expressions/postfix-increment/non-simple.js b/test/language/expressions/postfix-increment/non-simple.js
index 7df3e6ee4d..5494f1be5b 100644
--- a/test/language/expressions/postfix-increment/non-simple.js
+++ b/test/language/expressions/postfix-increment/non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1++;
diff --git a/test/language/expressions/postfix-increment/target-cover-newtarget.js b/test/language/expressions/postfix-increment/target-cover-newtarget.js
index db73f89907..f6f2f55bee 100644
--- a/test/language/expressions/postfix-increment/target-cover-newtarget.js
+++ b/test/language/expressions/postfix-increment/target-cover-newtarget.js
@@ -25,7 +25,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   (new.target)++;
diff --git a/test/language/expressions/postfix-increment/target-cover-yieldexpr.js b/test/language/expressions/postfix-increment/target-cover-yieldexpr.js
index df76917ab4..5d23858fd9 100644
--- a/test/language/expressions/postfix-increment/target-cover-yieldexpr.js
+++ b/test/language/expressions/postfix-increment/target-cover-yieldexpr.js
@@ -27,7 +27,7 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   (yield)++;
diff --git a/test/language/expressions/postfix-increment/target-newtarget.js b/test/language/expressions/postfix-increment/target-newtarget.js
index 793e57b2a4..ee1109b30d 100644
--- a/test/language/expressions/postfix-increment/target-newtarget.js
+++ b/test/language/expressions/postfix-increment/target-newtarget.js
@@ -25,7 +25,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   new.target++;
diff --git a/test/language/expressions/prefix-decrement/11.4.5-2-2gs.js b/test/language/expressions/prefix-decrement/11.4.5-2-2gs.js
index 87e5eead0c..37be005c6a 100644
--- a/test/language/expressions/prefix-decrement/11.4.5-2-2gs.js
+++ b/test/language/expressions/prefix-decrement/11.4.5-2-2gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 --arguments;
diff --git a/test/language/expressions/prefix-decrement/arguments.js b/test/language/expressions/prefix-decrement/arguments.js
index 199710535c..a740557056 100644
--- a/test/language/expressions/prefix-decrement/arguments.js
+++ b/test/language/expressions/prefix-decrement/arguments.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 --arguments;
diff --git a/test/language/expressions/prefix-decrement/eval.js b/test/language/expressions/prefix-decrement/eval.js
index 0345d73cc9..cd5737c98a 100644
--- a/test/language/expressions/prefix-decrement/eval.js
+++ b/test/language/expressions/prefix-decrement/eval.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 --eval;
diff --git a/test/language/expressions/prefix-decrement/non-simple.js b/test/language/expressions/prefix-decrement/non-simple.js
index 0b6206b4cb..e11e1e6966 100644
--- a/test/language/expressions/prefix-decrement/non-simple.js
+++ b/test/language/expressions/prefix-decrement/non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 --1;
diff --git a/test/language/expressions/prefix-decrement/target-cover-newtarget.js b/test/language/expressions/prefix-decrement/target-cover-newtarget.js
index 14bfdc795a..4f40ea82ed 100644
--- a/test/language/expressions/prefix-decrement/target-cover-newtarget.js
+++ b/test/language/expressions/prefix-decrement/target-cover-newtarget.js
@@ -25,7 +25,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   --(new.target);
diff --git a/test/language/expressions/prefix-decrement/target-cover-yieldexpr.js b/test/language/expressions/prefix-decrement/target-cover-yieldexpr.js
index 5ad674a38a..fa08eee652 100644
--- a/test/language/expressions/prefix-decrement/target-cover-yieldexpr.js
+++ b/test/language/expressions/prefix-decrement/target-cover-yieldexpr.js
@@ -27,7 +27,7 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   --(yield);
diff --git a/test/language/expressions/prefix-decrement/target-newtarget.js b/test/language/expressions/prefix-decrement/target-newtarget.js
index 706a85dabf..c0a08a38f5 100644
--- a/test/language/expressions/prefix-decrement/target-newtarget.js
+++ b/test/language/expressions/prefix-decrement/target-newtarget.js
@@ -25,7 +25,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   --new.target;
diff --git a/test/language/expressions/prefix-increment/arguments.js b/test/language/expressions/prefix-increment/arguments.js
index d073c815be..c8e0c2e039 100644
--- a/test/language/expressions/prefix-increment/arguments.js
+++ b/test/language/expressions/prefix-increment/arguments.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ++arguments;
diff --git a/test/language/expressions/prefix-increment/eval.js b/test/language/expressions/prefix-increment/eval.js
index f3aa1d6245..c8477cef8b 100644
--- a/test/language/expressions/prefix-increment/eval.js
+++ b/test/language/expressions/prefix-increment/eval.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ++eval;
diff --git a/test/language/expressions/prefix-increment/non-simple.js b/test/language/expressions/prefix-increment/non-simple.js
index c7b0cddec2..300ecf4849 100644
--- a/test/language/expressions/prefix-increment/non-simple.js
+++ b/test/language/expressions/prefix-increment/non-simple.js
@@ -12,6 +12,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ++1;
diff --git a/test/language/expressions/prefix-increment/target-cover-newtarget.js b/test/language/expressions/prefix-increment/target-cover-newtarget.js
index 353db43e0c..98666e02c1 100644
--- a/test/language/expressions/prefix-increment/target-cover-newtarget.js
+++ b/test/language/expressions/prefix-increment/target-cover-newtarget.js
@@ -25,7 +25,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   ++(new.target);
diff --git a/test/language/expressions/prefix-increment/target-cover-yieldexpr.js b/test/language/expressions/prefix-increment/target-cover-yieldexpr.js
index 7357046915..c064968e79 100644
--- a/test/language/expressions/prefix-increment/target-cover-yieldexpr.js
+++ b/test/language/expressions/prefix-increment/target-cover-yieldexpr.js
@@ -27,7 +27,7 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   ++(yield);
diff --git a/test/language/expressions/prefix-increment/target-newtarget.js b/test/language/expressions/prefix-increment/target-newtarget.js
index 492e3c08f5..e1d06154cf 100644
--- a/test/language/expressions/prefix-increment/target-newtarget.js
+++ b/test/language/expressions/prefix-increment/target-newtarget.js
@@ -25,7 +25,7 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   ++new.target;
diff --git a/test/language/expressions/property-accessors/non-identifier-name.js b/test/language/expressions/property-accessors/non-identifier-name.js
index 6b4121d326..912cc487bb 100644
--- a/test/language/expressions/property-accessors/non-identifier-name.js
+++ b/test/language/expressions/property-accessors/non-identifier-name.js
@@ -15,6 +15,6 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 unresolvableReference."";
diff --git a/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-1.js b/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-1.js
index 640d341b2d..78123982bb 100644
--- a/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-1.js
+++ b/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-1.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\x0`;
diff --git a/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-2.js b/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-2.js
index 636319011e..660a2d372d 100644
--- a/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-2.js
+++ b/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-2.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\x0G`;
diff --git a/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-3.js b/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-3.js
index c0f3ae6dd4..6af45b0a01 100644
--- a/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-3.js
+++ b/test/language/expressions/template-literal/invalid-hexidecimal-character-escape-sequence-truncated-3.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\xG`;
diff --git a/test/language/expressions/template-literal/invalid-legacy-octal-escape-sequence.js b/test/language/expressions/template-literal/invalid-legacy-octal-escape-sequence.js
index 501ef3dfb1..21923e5408 100644
--- a/test/language/expressions/template-literal/invalid-legacy-octal-escape-sequence.js
+++ b/test/language/expressions/template-literal/invalid-legacy-octal-escape-sequence.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\00`;
diff --git a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-1.js b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-1.js
index 80b064d161..8ac46bc9d0 100644
--- a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-1.js
+++ b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-1.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u0`;
diff --git a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-2.js b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-2.js
index af1c703a18..74dd337150 100644
--- a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-2.js
+++ b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-2.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u0g`;
diff --git a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-3.js b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-3.js
index ddf076dc74..d032316647 100644
--- a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-3.js
+++ b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-3.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u00g`;
diff --git a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-4.js b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-4.js
index 5a6b4cae94..54b0b77f70 100644
--- a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-4.js
+++ b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-4.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u000g`;
diff --git a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-5.js b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-5.js
index bb3e9ccff0..26a442f0fa 100644
--- a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-5.js
+++ b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-5.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u{g`;
diff --git a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-6.js b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-6.js
index 881ec89901..eab2904df1 100644
--- a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-6.js
+++ b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-6.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u{0`;
diff --git a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-7.js b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-7.js
index 07b972a4f2..c3ed51b152 100644
--- a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-7.js
+++ b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-7.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u{10FFFFF}`;
diff --git a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-8.js b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-8.js
index 92d5996220..5b6e0a4e4c 100644
--- a/test/language/expressions/template-literal/invalid-unicode-escape-sequence-8.js
+++ b/test/language/expressions/template-literal/invalid-unicode-escape-sequence-8.js
@@ -8,6 +8,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u{10FFFFF}${'inner'}right`;
diff --git a/test/language/expressions/template-literal/unicode-escape-nls-err.js b/test/language/expressions/template-literal/unicode-escape-nls-err.js
index 50a81d474f..ed2006310d 100644
--- a/test/language/expressions/template-literal/unicode-escape-nls-err.js
+++ b/test/language/expressions/template-literal/unicode-escape-nls-err.js
@@ -50,6 +50,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 `\u{1F_639}`;
diff --git a/test/language/expressions/this/S11.1.1_A1.js b/test/language/expressions/this/S11.1.1_A1.js
index fe9d0bc995..ac22204c23 100644
--- a/test/language/expressions/this/S11.1.1_A1.js
+++ b/test/language/expressions/this/S11.1.1_A1.js
@@ -10,6 +10,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 this = 1;
diff --git a/test/language/expressions/yield/in-iteration-stmt.js b/test/language/expressions/yield/in-iteration-stmt.js
index 7c8c990cf7..0094586df0 100644
--- a/test/language/expressions/yield/in-iteration-stmt.js
+++ b/test/language/expressions/yield/in-iteration-stmt.js
@@ -16,7 +16,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   for (yield '' in {}; ; ) ;
diff --git a/test/language/expressions/yield/invalid-left-hand-side.js b/test/language/expressions/yield/invalid-left-hand-side.js
index 3f6ea6238c..049c14ab41 100644
--- a/test/language/expressions/yield/invalid-left-hand-side.js
+++ b/test/language/expressions/yield/invalid-left-hand-side.js
@@ -21,7 +21,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   yield = 1;
diff --git a/test/language/expressions/yield/star-in-iteration-stmt.js b/test/language/expressions/yield/star-in-iteration-stmt.js
index d4c12f0e03..b458c93170 100644
--- a/test/language/expressions/yield/star-in-iteration-stmt.js
+++ b/test/language/expressions/yield/star-in-iteration-stmt.js
@@ -16,7 +16,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   for (yield * '' in {}; ; ) ;
diff --git a/test/language/future-reserved-words/class.js b/test/language/future-reserved-words/class.js
index f67136358a..c2ce8eeb9e 100644
--- a/test/language/future-reserved-words/class.js
+++ b/test/language/future-reserved-words/class.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var class = 1;
diff --git a/test/language/future-reserved-words/const.js b/test/language/future-reserved-words/const.js
index 1a473c6fb5..d13519cb66 100644
--- a/test/language/future-reserved-words/const.js
+++ b/test/language/future-reserved-words/const.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var const = 1;
diff --git a/test/language/future-reserved-words/debugger.js b/test/language/future-reserved-words/debugger.js
index f9773a0815..b6284e7fdb 100644
--- a/test/language/future-reserved-words/debugger.js
+++ b/test/language/future-reserved-words/debugger.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var debugger = 1;
diff --git a/test/language/future-reserved-words/enum.js b/test/language/future-reserved-words/enum.js
index 1f4dda26e6..aab7823254 100644
--- a/test/language/future-reserved-words/enum.js
+++ b/test/language/future-reserved-words/enum.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var enum = 1;
diff --git a/test/language/future-reserved-words/export.js b/test/language/future-reserved-words/export.js
index 13710fa995..48393ad363 100644
--- a/test/language/future-reserved-words/export.js
+++ b/test/language/future-reserved-words/export.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var export = 1;
diff --git a/test/language/future-reserved-words/extends.js b/test/language/future-reserved-words/extends.js
index f5fd69dc34..b6185edc92 100644
--- a/test/language/future-reserved-words/extends.js
+++ b/test/language/future-reserved-words/extends.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var extends = 1;
diff --git a/test/language/future-reserved-words/implements-strict-escaped.js b/test/language/future-reserved-words/implements-strict-escaped.js
index 0bb92d3d00..83d508a848 100644
--- a/test/language/future-reserved-words/implements-strict-escaped.js
+++ b/test/language/future-reserved-words/implements-strict-escaped.js
@@ -19,6 +19,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0069mplements = 123;
diff --git a/test/language/future-reserved-words/implements-strict.js b/test/language/future-reserved-words/implements-strict.js
index 3c675d85c6..43ed0c631f 100644
--- a/test/language/future-reserved-words/implements-strict.js
+++ b/test/language/future-reserved-words/implements-strict.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var implements = 1;
diff --git a/test/language/future-reserved-words/import.js b/test/language/future-reserved-words/import.js
index 75ba14e43c..a2d14672a4 100644
--- a/test/language/future-reserved-words/import.js
+++ b/test/language/future-reserved-words/import.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var import = 1;
diff --git a/test/language/future-reserved-words/interface-strict-escaped.js b/test/language/future-reserved-words/interface-strict-escaped.js
index ccc1b78600..00833ec7eb 100644
--- a/test/language/future-reserved-words/interface-strict-escaped.js
+++ b/test/language/future-reserved-words/interface-strict-escaped.js
@@ -19,6 +19,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var inte\u0072face = 123;
diff --git a/test/language/future-reserved-words/interface-strict.js b/test/language/future-reserved-words/interface-strict.js
index b45d4bddf1..a9d4db268a 100644
--- a/test/language/future-reserved-words/interface-strict.js
+++ b/test/language/future-reserved-words/interface-strict.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var interface = 1;
diff --git a/test/language/future-reserved-words/let-strict-escaped.js b/test/language/future-reserved-words/let-strict-escaped.js
index aeccdce014..89ec4c9919 100644
--- a/test/language/future-reserved-words/let-strict-escaped.js
+++ b/test/language/future-reserved-words/let-strict-escaped.js
@@ -19,6 +19,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var l\u0065t = 123;
diff --git a/test/language/future-reserved-words/let-strict.js b/test/language/future-reserved-words/let-strict.js
index 6dd7cbb2dd..6302594272 100644
--- a/test/language/future-reserved-words/let-strict.js
+++ b/test/language/future-reserved-words/let-strict.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var let = 1;
diff --git a/test/language/future-reserved-words/package-strict-escaped.js b/test/language/future-reserved-words/package-strict-escaped.js
index d4bab9afd0..441a90def5 100644
--- a/test/language/future-reserved-words/package-strict-escaped.js
+++ b/test/language/future-reserved-words/package-strict-escaped.js
@@ -19,6 +19,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var packag\u0065 = 123;
diff --git a/test/language/future-reserved-words/package-strict.js b/test/language/future-reserved-words/package-strict.js
index d384facb54..f048b6b4d7 100644
--- a/test/language/future-reserved-words/package-strict.js
+++ b/test/language/future-reserved-words/package-strict.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var package = 1;
diff --git a/test/language/future-reserved-words/private-strict-escaped.js b/test/language/future-reserved-words/private-strict-escaped.js
index d88908905a..2d4507e286 100644
--- a/test/language/future-reserved-words/private-strict-escaped.js
+++ b/test/language/future-reserved-words/private-strict-escaped.js
@@ -19,6 +19,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var privat\u0065 = 123;
diff --git a/test/language/future-reserved-words/private-strict.js b/test/language/future-reserved-words/private-strict.js
index 0bc08b58c0..d23de9fe3e 100644
--- a/test/language/future-reserved-words/private-strict.js
+++ b/test/language/future-reserved-words/private-strict.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var private = 1;
diff --git a/test/language/future-reserved-words/protected-strict-escaped.js b/test/language/future-reserved-words/protected-strict-escaped.js
index dbd08022ff..fd4cd23ce8 100644
--- a/test/language/future-reserved-words/protected-strict-escaped.js
+++ b/test/language/future-reserved-words/protected-strict-escaped.js
@@ -20,6 +20,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0070\u0072\u006f\u0074\u0065\u0063\u0074\u0065\u0064 = 123;
diff --git a/test/language/future-reserved-words/protected-strict.js b/test/language/future-reserved-words/protected-strict.js
index a1bf25bb37..5fbc17a91d 100644
--- a/test/language/future-reserved-words/protected-strict.js
+++ b/test/language/future-reserved-words/protected-strict.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var protected = 1;
diff --git a/test/language/future-reserved-words/public-strict-escaped.js b/test/language/future-reserved-words/public-strict-escaped.js
index 685c1bc515..b3f99fabf1 100644
--- a/test/language/future-reserved-words/public-strict-escaped.js
+++ b/test/language/future-reserved-words/public-strict-escaped.js
@@ -19,6 +19,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0070\u0075\u0062\u006c\u0069\u0063 = 123;
diff --git a/test/language/future-reserved-words/public-strict.js b/test/language/future-reserved-words/public-strict.js
index 5b472110df..3830280281 100644
--- a/test/language/future-reserved-words/public-strict.js
+++ b/test/language/future-reserved-words/public-strict.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var public = 1;
diff --git a/test/language/future-reserved-words/static-strict-escaped.js b/test/language/future-reserved-words/static-strict-escaped.js
index e9b8f11783..6693edd21e 100644
--- a/test/language/future-reserved-words/static-strict-escaped.js
+++ b/test/language/future-reserved-words/static-strict-escaped.js
@@ -19,6 +19,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0073\u0074\u0061\u0074\u0069\u0063 = 123;
diff --git a/test/language/future-reserved-words/static-strict.js b/test/language/future-reserved-words/static-strict.js
index d8bed546d7..169b966015 100644
--- a/test/language/future-reserved-words/static-strict.js
+++ b/test/language/future-reserved-words/static-strict.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var static = 1;
diff --git a/test/language/future-reserved-words/super.js b/test/language/future-reserved-words/super.js
index 438d5645e2..7b4e01835e 100644
--- a/test/language/future-reserved-words/super.js
+++ b/test/language/future-reserved-words/super.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var super = 1;
diff --git a/test/language/future-reserved-words/yield-strict-escaped.js b/test/language/future-reserved-words/yield-strict-escaped.js
index 898ebf3d9b..1276a92ca6 100644
--- a/test/language/future-reserved-words/yield-strict-escaped.js
+++ b/test/language/future-reserved-words/yield-strict-escaped.js
@@ -19,6 +19,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0079ield = 123;
diff --git a/test/language/future-reserved-words/yield-strict.js b/test/language/future-reserved-words/yield-strict.js
index f0ab6dae8e..ec21143c20 100644
--- a/test/language/future-reserved-words/yield-strict.js
+++ b/test/language/future-reserved-words/yield-strict.js
@@ -17,6 +17,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var yield = 1;
diff --git a/test/language/global-code/export.js b/test/language/global-code/export.js
index 2368bd3643..ced6382163 100644
--- a/test/language/global-code/export.js
+++ b/test/language/global-code/export.js
@@ -16,6 +16,6 @@ info: |
          StatementList
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default null;
diff --git a/test/language/global-code/import.js b/test/language/global-code/import.js
index 708f246471..e0557fae77 100644
--- a/test/language/global-code/import.js
+++ b/test/language/global-code/import.js
@@ -16,6 +16,6 @@ info: |
          StatementList
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import v from './import.js';
diff --git a/test/language/global-code/new.target-arrow.js b/test/language/global-code/new.target-arrow.js
index 6dd6f5289c..c818ce5065 100644
--- a/test/language/global-code/new.target-arrow.js
+++ b/test/language/global-code/new.target-arrow.js
@@ -30,7 +30,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 () => {
   new.target;
diff --git a/test/language/global-code/new.target.js b/test/language/global-code/new.target.js
index b91e688d7a..e8c55b1ce9 100644
--- a/test/language/global-code/new.target.js
+++ b/test/language/global-code/new.target.js
@@ -15,6 +15,6 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 new.target;
diff --git a/test/language/global-code/return.js b/test/language/global-code/return.js
index db6e2bc888..92835966a5 100644
--- a/test/language/global-code/return.js
+++ b/test/language/global-code/return.js
@@ -17,6 +17,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 return;
diff --git a/test/language/global-code/super-call-arrow.js b/test/language/global-code/super-call-arrow.js
index a28581588d..5c24ccea4c 100644
--- a/test/language/global-code/super-call-arrow.js
+++ b/test/language/global-code/super-call-arrow.js
@@ -30,7 +30,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 () => {
   super();
diff --git a/test/language/global-code/super-call.js b/test/language/global-code/super-call.js
index 009cb5f83e..5a9e9f1da3 100644
--- a/test/language/global-code/super-call.js
+++ b/test/language/global-code/super-call.js
@@ -15,6 +15,6 @@ negative:
 features: [super]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 super();
diff --git a/test/language/global-code/super-prop-arrow.js b/test/language/global-code/super-prop-arrow.js
index 49206d5aa0..bc6518c48c 100644
--- a/test/language/global-code/super-prop-arrow.js
+++ b/test/language/global-code/super-prop-arrow.js
@@ -30,7 +30,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 () => {
   super.property;
diff --git a/test/language/global-code/super-prop.js b/test/language/global-code/super-prop.js
index f289105887..c381795520 100644
--- a/test/language/global-code/super-prop.js
+++ b/test/language/global-code/super-prop.js
@@ -15,6 +15,6 @@ negative:
 features: [super]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 super.property;
diff --git a/test/language/global-code/yield-strict.js b/test/language/global-code/yield-strict.js
index b49a82eb40..ec6292b44e 100644
--- a/test/language/global-code/yield-strict.js
+++ b/test/language/global-code/yield-strict.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 yield;
diff --git a/test/language/identifiers/unicode-escape-nls-err.js b/test/language/identifiers/unicode-escape-nls-err.js
index 3d9c51244f..5995535170 100644
--- a/test/language/identifiers/unicode-escape-nls-err.js
+++ b/test/language/identifiers/unicode-escape-nls-err.js
@@ -43,6 +43,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{00_76} = 1;
diff --git a/test/language/identifiers/val-break-via-escape-hex.js b/test/language/identifiers/val-break-via-escape-hex.js
index 019c08273d..cbcc1e2fcb 100644
--- a/test/language/identifiers/val-break-via-escape-hex.js
+++ b/test/language/identifiers/val-break-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{62}\u{72}\u{65}\u{61}\u{6b} = 123;;
diff --git a/test/language/identifiers/val-break-via-escape-hex4.js b/test/language/identifiers/val-break-via-escape-hex4.js
index 91a62357e4..dc912f000d 100644
--- a/test/language/identifiers/val-break-via-escape-hex4.js
+++ b/test/language/identifiers/val-break-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0062\u0072\u0065\u0061\u006b = 123;;
diff --git a/test/language/identifiers/val-break.js b/test/language/identifiers/val-break.js
index 9cbeab2bf4..63245c571f 100644
--- a/test/language/identifiers/val-break.js
+++ b/test/language/identifiers/val-break.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var break = 123;;
diff --git a/test/language/identifiers/val-case-via-escape-hex.js b/test/language/identifiers/val-case-via-escape-hex.js
index e4c734d329..a64dc36d2f 100644
--- a/test/language/identifiers/val-case-via-escape-hex.js
+++ b/test/language/identifiers/val-case-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{63}ase = 123;
diff --git a/test/language/identifiers/val-case-via-escape-hex4.js b/test/language/identifiers/val-case-via-escape-hex4.js
index 3df4d94afb..af13050280 100644
--- a/test/language/identifiers/val-case-via-escape-hex4.js
+++ b/test/language/identifiers/val-case-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0063ase = 123;
diff --git a/test/language/identifiers/val-case.js b/test/language/identifiers/val-case.js
index 3bf3981071..e33501f3ec 100644
--- a/test/language/identifiers/val-case.js
+++ b/test/language/identifiers/val-case.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var case = 123;
diff --git a/test/language/identifiers/val-catch-via-escape-hex.js b/test/language/identifiers/val-catch-via-escape-hex.js
index aa249d1e50..1feabad247 100644
--- a/test/language/identifiers/val-catch-via-escape-hex.js
+++ b/test/language/identifiers/val-catch-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{63}atch = 123;
diff --git a/test/language/identifiers/val-catch-via-escape-hex4.js b/test/language/identifiers/val-catch-via-escape-hex4.js
index 07e78017cb..c6d5a8e70a 100644
--- a/test/language/identifiers/val-catch-via-escape-hex4.js
+++ b/test/language/identifiers/val-catch-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0063atch = 123;
diff --git a/test/language/identifiers/val-catch.js b/test/language/identifiers/val-catch.js
index 8dc266b77f..da3290b5a5 100644
--- a/test/language/identifiers/val-catch.js
+++ b/test/language/identifiers/val-catch.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var catch = 123;
diff --git a/test/language/identifiers/val-class-via-escape-hex.js b/test/language/identifiers/val-class-via-escape-hex.js
index 6bebe47b9d..ad9c9fbcf3 100644
--- a/test/language/identifiers/val-class-via-escape-hex.js
+++ b/test/language/identifiers/val-class-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var cla\u{73}s = 123;
diff --git a/test/language/identifiers/val-class-via-escape-hex4.js b/test/language/identifiers/val-class-via-escape-hex4.js
index 1c0cac3b5e..b9a86fe0bf 100644
--- a/test/language/identifiers/val-class-via-escape-hex4.js
+++ b/test/language/identifiers/val-class-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var cla\u0073s = 123;
diff --git a/test/language/identifiers/val-class.js b/test/language/identifiers/val-class.js
index 9350304727..523e45e9d2 100644
--- a/test/language/identifiers/val-class.js
+++ b/test/language/identifiers/val-class.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var class = 123;
diff --git a/test/language/identifiers/val-const-via-escape-hex.js b/test/language/identifiers/val-const-via-escape-hex.js
index 86a0032b76..16a81b93e7 100644
--- a/test/language/identifiers/val-const-via-escape-hex.js
+++ b/test/language/identifiers/val-const-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var co\u{6e}st = 123;
diff --git a/test/language/identifiers/val-const-via-escape-hex4.js b/test/language/identifiers/val-const-via-escape-hex4.js
index f4163a26c1..9dc1fefcb7 100644
--- a/test/language/identifiers/val-const-via-escape-hex4.js
+++ b/test/language/identifiers/val-const-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var co\u006est = 123;
diff --git a/test/language/identifiers/val-const.js b/test/language/identifiers/val-const.js
index aa904500fa..1026f63478 100644
--- a/test/language/identifiers/val-const.js
+++ b/test/language/identifiers/val-const.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var const = 123;
diff --git a/test/language/identifiers/val-continue-via-escape-hex.js b/test/language/identifiers/val-continue-via-escape-hex.js
index 46d43f064c..3c6b60a371 100644
--- a/test/language/identifiers/val-continue-via-escape-hex.js
+++ b/test/language/identifiers/val-continue-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{63}ontinue = 123;
diff --git a/test/language/identifiers/val-continue-via-escape-hex4.js b/test/language/identifiers/val-continue-via-escape-hex4.js
index 86eb6dd966..d39c1d7561 100644
--- a/test/language/identifiers/val-continue-via-escape-hex4.js
+++ b/test/language/identifiers/val-continue-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0063ontinue = 123;
diff --git a/test/language/identifiers/val-continue.js b/test/language/identifiers/val-continue.js
index ebd9be96a4..99e97f00cd 100644
--- a/test/language/identifiers/val-continue.js
+++ b/test/language/identifiers/val-continue.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var continue = 123;
diff --git a/test/language/identifiers/val-debugger-via-escape-hex.js b/test/language/identifiers/val-debugger-via-escape-hex.js
index bda569098c..5729462032 100644
--- a/test/language/identifiers/val-debugger-via-escape-hex.js
+++ b/test/language/identifiers/val-debugger-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{64}ebugger = 123;
diff --git a/test/language/identifiers/val-debugger-via-escape-hex4.js b/test/language/identifiers/val-debugger-via-escape-hex4.js
index 3c78263082..b1e7b10387 100644
--- a/test/language/identifiers/val-debugger-via-escape-hex4.js
+++ b/test/language/identifiers/val-debugger-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0064ebugger = 123;
diff --git a/test/language/identifiers/val-debugger.js b/test/language/identifiers/val-debugger.js
index a38f06f0f7..887ff11565 100644
--- a/test/language/identifiers/val-debugger.js
+++ b/test/language/identifiers/val-debugger.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var debugger = 123;
diff --git a/test/language/identifiers/val-default-via-escape-hex.js b/test/language/identifiers/val-default-via-escape-hex.js
index f6fe580c36..e3f51cb737 100644
--- a/test/language/identifiers/val-default-via-escape-hex.js
+++ b/test/language/identifiers/val-default-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var def\u{61}ult = 123;
diff --git a/test/language/identifiers/val-default-via-escape-hex4.js b/test/language/identifiers/val-default-via-escape-hex4.js
index f613d8c28e..e55e7613c3 100644
--- a/test/language/identifiers/val-default-via-escape-hex4.js
+++ b/test/language/identifiers/val-default-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var def\u0061ult = 123;
diff --git a/test/language/identifiers/val-default.js b/test/language/identifiers/val-default.js
index 7fe8855dbe..0362c98e93 100644
--- a/test/language/identifiers/val-default.js
+++ b/test/language/identifiers/val-default.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var default = 123;
diff --git a/test/language/identifiers/val-delete-via-escape-hex.js b/test/language/identifiers/val-delete-via-escape-hex.js
index 0b321e4e93..6aee519626 100644
--- a/test/language/identifiers/val-delete-via-escape-hex.js
+++ b/test/language/identifiers/val-delete-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{64}elete = 123;
diff --git a/test/language/identifiers/val-delete-via-escape-hex4.js b/test/language/identifiers/val-delete-via-escape-hex4.js
index 953f22fd34..3a0ec4aacd 100644
--- a/test/language/identifiers/val-delete-via-escape-hex4.js
+++ b/test/language/identifiers/val-delete-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0064elete = 123;
diff --git a/test/language/identifiers/val-delete.js b/test/language/identifiers/val-delete.js
index 1a2263a54d..ea6d6e8a52 100644
--- a/test/language/identifiers/val-delete.js
+++ b/test/language/identifiers/val-delete.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var delete = 123;
diff --git a/test/language/identifiers/val-do-via-escape-hex.js b/test/language/identifiers/val-do-via-escape-hex.js
index 98e2865ceb..57737dd3ae 100644
--- a/test/language/identifiers/val-do-via-escape-hex.js
+++ b/test/language/identifiers/val-do-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{64}\u{6f} = 123;
diff --git a/test/language/identifiers/val-do-via-escape-hex4.js b/test/language/identifiers/val-do-via-escape-hex4.js
index 7d347a6386..5dda96dae9 100644
--- a/test/language/identifiers/val-do-via-escape-hex4.js
+++ b/test/language/identifiers/val-do-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0064\u006f = 123;
diff --git a/test/language/identifiers/val-do.js b/test/language/identifiers/val-do.js
index fbfba285d0..5e39924aa0 100644
--- a/test/language/identifiers/val-do.js
+++ b/test/language/identifiers/val-do.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var do = 123;
diff --git a/test/language/identifiers/val-else-via-escape-hex.js b/test/language/identifiers/val-else-via-escape-hex.js
index f4433e753b..15aa60b3dd 100644
--- a/test/language/identifiers/val-else-via-escape-hex.js
+++ b/test/language/identifiers/val-else-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{65}lse = 123;
diff --git a/test/language/identifiers/val-else-via-escape-hex4.js b/test/language/identifiers/val-else-via-escape-hex4.js
index b80c40f1c3..242d3f40d7 100644
--- a/test/language/identifiers/val-else-via-escape-hex4.js
+++ b/test/language/identifiers/val-else-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0065lse = 123;
diff --git a/test/language/identifiers/val-else.js b/test/language/identifiers/val-else.js
index 8a98ffeb3a..85bb6cf95c 100644
--- a/test/language/identifiers/val-else.js
+++ b/test/language/identifiers/val-else.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var else = 123;
diff --git a/test/language/identifiers/val-enum-via-escape-hex.js b/test/language/identifiers/val-enum-via-escape-hex.js
index ea5455dce6..8e5b69d96c 100644
--- a/test/language/identifiers/val-enum-via-escape-hex.js
+++ b/test/language/identifiers/val-enum-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{65}\u{6e}\u{75}\u{6d} = 123;
diff --git a/test/language/identifiers/val-enum-via-escape-hex4.js b/test/language/identifiers/val-enum-via-escape-hex4.js
index 94d696a353..6b0fe1c791 100644
--- a/test/language/identifiers/val-enum-via-escape-hex4.js
+++ b/test/language/identifiers/val-enum-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0065\u006e\u0075\u006d = 123;
diff --git a/test/language/identifiers/val-enum.js b/test/language/identifiers/val-enum.js
index 6a3a59a61a..6021eebaf5 100644
--- a/test/language/identifiers/val-enum.js
+++ b/test/language/identifiers/val-enum.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var enum = 123;
diff --git a/test/language/identifiers/val-export-via-escape-hex.js b/test/language/identifiers/val-export-via-escape-hex.js
index 0bdbfb995a..6df8f9a005 100644
--- a/test/language/identifiers/val-export-via-escape-hex.js
+++ b/test/language/identifiers/val-export-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var expor\u{74} = 123;
diff --git a/test/language/identifiers/val-export-via-escape-hex4.js b/test/language/identifiers/val-export-via-escape-hex4.js
index 584df1e8ac..a7e65aff3a 100644
--- a/test/language/identifiers/val-export-via-escape-hex4.js
+++ b/test/language/identifiers/val-export-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var expor\u0074 = 123;
diff --git a/test/language/identifiers/val-export.js b/test/language/identifiers/val-export.js
index 8088bf1049..7353bc17c1 100644
--- a/test/language/identifiers/val-export.js
+++ b/test/language/identifiers/val-export.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var export = 123;
diff --git a/test/language/identifiers/val-extends-via-escape-hex.js b/test/language/identifiers/val-extends-via-escape-hex.js
index 85a2242a25..0eebd7a789 100644
--- a/test/language/identifiers/val-extends-via-escape-hex.js
+++ b/test/language/identifiers/val-extends-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var extend\u{73} = 123;
diff --git a/test/language/identifiers/val-extends-via-escape-hex4.js b/test/language/identifiers/val-extends-via-escape-hex4.js
index 22dc513875..ec2902f722 100644
--- a/test/language/identifiers/val-extends-via-escape-hex4.js
+++ b/test/language/identifiers/val-extends-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var extend\u0073 = 123;
diff --git a/test/language/identifiers/val-extends.js b/test/language/identifiers/val-extends.js
index ca24e6e0b5..f90534e94e 100644
--- a/test/language/identifiers/val-extends.js
+++ b/test/language/identifiers/val-extends.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var extends = 123;
diff --git a/test/language/identifiers/val-false-via-escape-hex.js b/test/language/identifiers/val-false-via-escape-hex.js
index a9d280b471..1072b5f329 100644
--- a/test/language/identifiers/val-false-via-escape-hex.js
+++ b/test/language/identifiers/val-false-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var fals\u{65} = 123;
diff --git a/test/language/identifiers/val-false-via-escape-hex4.js b/test/language/identifiers/val-false-via-escape-hex4.js
index 0f5b811e09..5689a2aa62 100644
--- a/test/language/identifiers/val-false-via-escape-hex4.js
+++ b/test/language/identifiers/val-false-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var fals\u0065 = 123;
diff --git a/test/language/identifiers/val-false.js b/test/language/identifiers/val-false.js
index 8696cba157..5ac71043b3 100644
--- a/test/language/identifiers/val-false.js
+++ b/test/language/identifiers/val-false.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var false = 123;
diff --git a/test/language/identifiers/val-finally-via-escape-hex.js b/test/language/identifiers/val-finally-via-escape-hex.js
index 8fee6ab888..71cf88f512 100644
--- a/test/language/identifiers/val-finally-via-escape-hex.js
+++ b/test/language/identifiers/val-finally-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var fina\u{6c}ly = 123;
diff --git a/test/language/identifiers/val-finally-via-escape-hex4.js b/test/language/identifiers/val-finally-via-escape-hex4.js
index 5c70e76593..6601e830e5 100644
--- a/test/language/identifiers/val-finally-via-escape-hex4.js
+++ b/test/language/identifiers/val-finally-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var fina\u006cly = 123;
diff --git a/test/language/identifiers/val-finally.js b/test/language/identifiers/val-finally.js
index bbedcf4725..789804f5d8 100644
--- a/test/language/identifiers/val-finally.js
+++ b/test/language/identifiers/val-finally.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var finally = 123;
diff --git a/test/language/identifiers/val-for-via-escape-hex.js b/test/language/identifiers/val-for-via-escape-hex.js
index ff34ced5e1..2c29a6ab09 100644
--- a/test/language/identifiers/val-for-via-escape-hex.js
+++ b/test/language/identifiers/val-for-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var f\u{6f}r = 123;
diff --git a/test/language/identifiers/val-for-via-escape-hex4.js b/test/language/identifiers/val-for-via-escape-hex4.js
index ea27114e5d..b7bc7093c7 100644
--- a/test/language/identifiers/val-for-via-escape-hex4.js
+++ b/test/language/identifiers/val-for-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var f\u006fr = 123;
diff --git a/test/language/identifiers/val-for.js b/test/language/identifiers/val-for.js
index 2817f03f31..1f2ff856b8 100644
--- a/test/language/identifiers/val-for.js
+++ b/test/language/identifiers/val-for.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var for = 123;
diff --git a/test/language/identifiers/val-function-via-escape-hex.js b/test/language/identifiers/val-function-via-escape-hex.js
index cabef7300e..250a5fd483 100644
--- a/test/language/identifiers/val-function-via-escape-hex.js
+++ b/test/language/identifiers/val-function-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var func\u{74}ion = 123;
diff --git a/test/language/identifiers/val-function-via-escape-hex4.js b/test/language/identifiers/val-function-via-escape-hex4.js
index 7f1d7643b6..710c6340f4 100644
--- a/test/language/identifiers/val-function-via-escape-hex4.js
+++ b/test/language/identifiers/val-function-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var func\u0074ion = 123;
diff --git a/test/language/identifiers/val-function.js b/test/language/identifiers/val-function.js
index 6c621f894f..471ee03d77 100644
--- a/test/language/identifiers/val-function.js
+++ b/test/language/identifiers/val-function.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var function = 123;
diff --git a/test/language/identifiers/val-if-via-escape-hex.js b/test/language/identifiers/val-if-via-escape-hex.js
index 2d9b646787..80d33f6e37 100644
--- a/test/language/identifiers/val-if-via-escape-hex.js
+++ b/test/language/identifiers/val-if-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{69}\u{66} = 123;
diff --git a/test/language/identifiers/val-if-via-escape-hex4.js b/test/language/identifiers/val-if-via-escape-hex4.js
index e36a3bdc9a..69ef0882d5 100644
--- a/test/language/identifiers/val-if-via-escape-hex4.js
+++ b/test/language/identifiers/val-if-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0069\u0066 = 123;
diff --git a/test/language/identifiers/val-if.js b/test/language/identifiers/val-if.js
index d5f82f3780..2bd0e031e2 100644
--- a/test/language/identifiers/val-if.js
+++ b/test/language/identifiers/val-if.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var if = 123;
diff --git a/test/language/identifiers/val-import-via-escape-hex.js b/test/language/identifiers/val-import-via-escape-hex.js
index c0c58e0f47..a40c4772f6 100644
--- a/test/language/identifiers/val-import-via-escape-hex.js
+++ b/test/language/identifiers/val-import-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{69}\u{6d}\u{70}\u{6f}\u{72}\u{74} = 123;
diff --git a/test/language/identifiers/val-import-via-escape-hex4.js b/test/language/identifiers/val-import-via-escape-hex4.js
index 3f6f6eb709..b18c523cc2 100644
--- a/test/language/identifiers/val-import-via-escape-hex4.js
+++ b/test/language/identifiers/val-import-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0069\u006d\u0070\u006f\u0072\u0074 = 123;
diff --git a/test/language/identifiers/val-import.js b/test/language/identifiers/val-import.js
index 992285733e..b10f54f0a6 100644
--- a/test/language/identifiers/val-import.js
+++ b/test/language/identifiers/val-import.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var import = 123;
diff --git a/test/language/identifiers/val-in-via-escape-hex.js b/test/language/identifiers/val-in-via-escape-hex.js
index 57e5642474..ed656698bf 100644
--- a/test/language/identifiers/val-in-via-escape-hex.js
+++ b/test/language/identifiers/val-in-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{69}\u{6e} = 123;
diff --git a/test/language/identifiers/val-in-via-escape-hex4.js b/test/language/identifiers/val-in-via-escape-hex4.js
index 8e1c27a2b7..f3b1b260b3 100644
--- a/test/language/identifiers/val-in-via-escape-hex4.js
+++ b/test/language/identifiers/val-in-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0069\u006e = 123;
diff --git a/test/language/identifiers/val-in.js b/test/language/identifiers/val-in.js
index b0c29c7a43..1600a074b0 100644
--- a/test/language/identifiers/val-in.js
+++ b/test/language/identifiers/val-in.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var in = 123;
diff --git a/test/language/identifiers/val-instanceof-via-escape-hex.js b/test/language/identifiers/val-instanceof-via-escape-hex.js
index 7237ac3129..4caa3fbd82 100644
--- a/test/language/identifiers/val-instanceof-via-escape-hex.js
+++ b/test/language/identifiers/val-instanceof-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var insta\u{6e}ceof = 123;
diff --git a/test/language/identifiers/val-instanceof-via-escape-hex4.js b/test/language/identifiers/val-instanceof-via-escape-hex4.js
index fa8a75810a..14942260e8 100644
--- a/test/language/identifiers/val-instanceof-via-escape-hex4.js
+++ b/test/language/identifiers/val-instanceof-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var insta\u006eceof = 123;
diff --git a/test/language/identifiers/val-instanceof.js b/test/language/identifiers/val-instanceof.js
index 79403c0691..c6f5f35b63 100644
--- a/test/language/identifiers/val-instanceof.js
+++ b/test/language/identifiers/val-instanceof.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var instanceof = 123;
diff --git a/test/language/identifiers/val-new-via-escape-hex.js b/test/language/identifiers/val-new-via-escape-hex.js
index a9cc63146f..38df80753f 100644
--- a/test/language/identifiers/val-new-via-escape-hex.js
+++ b/test/language/identifiers/val-new-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var n\u{65}w = 123;
diff --git a/test/language/identifiers/val-new-via-escape-hex4.js b/test/language/identifiers/val-new-via-escape-hex4.js
index 1024e8dbb2..e19d75bcc1 100644
--- a/test/language/identifiers/val-new-via-escape-hex4.js
+++ b/test/language/identifiers/val-new-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var n\u0065w = 123;
diff --git a/test/language/identifiers/val-new.js b/test/language/identifiers/val-new.js
index 74e423a9af..2c7a12fbea 100644
--- a/test/language/identifiers/val-new.js
+++ b/test/language/identifiers/val-new.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var new = 123;
diff --git a/test/language/identifiers/val-null-via-escape-hex.js b/test/language/identifiers/val-null-via-escape-hex.js
index 3834fd0eae..7afad5d9ce 100644
--- a/test/language/identifiers/val-null-via-escape-hex.js
+++ b/test/language/identifiers/val-null-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{6e}ull = 123;
diff --git a/test/language/identifiers/val-null-via-escape-hex4.js b/test/language/identifiers/val-null-via-escape-hex4.js
index 65f7e740c1..aab4dbff8c 100644
--- a/test/language/identifiers/val-null-via-escape-hex4.js
+++ b/test/language/identifiers/val-null-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u006eull = 123;
diff --git a/test/language/identifiers/val-null.js b/test/language/identifiers/val-null.js
index 7a57c42f18..2edc6fef55 100644
--- a/test/language/identifiers/val-null.js
+++ b/test/language/identifiers/val-null.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var null = 123;
diff --git a/test/language/identifiers/val-return-via-escape-hex.js b/test/language/identifiers/val-return-via-escape-hex.js
index 39ced05524..584d234ede 100644
--- a/test/language/identifiers/val-return-via-escape-hex.js
+++ b/test/language/identifiers/val-return-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var retur\u{6e} = 123;
diff --git a/test/language/identifiers/val-return-via-escape-hex4.js b/test/language/identifiers/val-return-via-escape-hex4.js
index 2afa3ab23b..39b71e495a 100644
--- a/test/language/identifiers/val-return-via-escape-hex4.js
+++ b/test/language/identifiers/val-return-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var retur\u006e = 123;
diff --git a/test/language/identifiers/val-return.js b/test/language/identifiers/val-return.js
index 4662671705..1937772c04 100644
--- a/test/language/identifiers/val-return.js
+++ b/test/language/identifiers/val-return.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var return = 123;
diff --git a/test/language/identifiers/val-super-via-escape-hex.js b/test/language/identifiers/val-super-via-escape-hex.js
index 08b28a32ee..e36fa5bb47 100644
--- a/test/language/identifiers/val-super-via-escape-hex.js
+++ b/test/language/identifiers/val-super-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{73}uper = 123;
diff --git a/test/language/identifiers/val-super-via-escape-hex4.js b/test/language/identifiers/val-super-via-escape-hex4.js
index bdd9625489..57b5f61b3e 100644
--- a/test/language/identifiers/val-super-via-escape-hex4.js
+++ b/test/language/identifiers/val-super-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0073uper = 123;
diff --git a/test/language/identifiers/val-super.js b/test/language/identifiers/val-super.js
index e86c23dd5b..12b0527a39 100644
--- a/test/language/identifiers/val-super.js
+++ b/test/language/identifiers/val-super.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var super = 123;
diff --git a/test/language/identifiers/val-switch-via-escape-hex.js b/test/language/identifiers/val-switch-via-escape-hex.js
index 9df92f00b1..c3bf37a256 100644
--- a/test/language/identifiers/val-switch-via-escape-hex.js
+++ b/test/language/identifiers/val-switch-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var switc\u{68} = 123;
diff --git a/test/language/identifiers/val-switch-via-escape-hex4.js b/test/language/identifiers/val-switch-via-escape-hex4.js
index eefd0364e6..c142b0390b 100644
--- a/test/language/identifiers/val-switch-via-escape-hex4.js
+++ b/test/language/identifiers/val-switch-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var switc\u0068 = 123;
diff --git a/test/language/identifiers/val-switch.js b/test/language/identifiers/val-switch.js
index 8b9c70ff1b..2d82836613 100644
--- a/test/language/identifiers/val-switch.js
+++ b/test/language/identifiers/val-switch.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var switch = 123;
diff --git a/test/language/identifiers/val-this-via-escape-hex.js b/test/language/identifiers/val-this-via-escape-hex.js
index 6d1078a320..ceea7c660e 100644
--- a/test/language/identifiers/val-this-via-escape-hex.js
+++ b/test/language/identifiers/val-this-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var thi\u{73} = 123;
diff --git a/test/language/identifiers/val-this-via-escape-hex4.js b/test/language/identifiers/val-this-via-escape-hex4.js
index ca5c49515f..a68c8f7e87 100644
--- a/test/language/identifiers/val-this-via-escape-hex4.js
+++ b/test/language/identifiers/val-this-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var thi\u0073 = 123;
diff --git a/test/language/identifiers/val-this.js b/test/language/identifiers/val-this.js
index 2a9d0ea8ac..1f6851fcd4 100644
--- a/test/language/identifiers/val-this.js
+++ b/test/language/identifiers/val-this.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var this = 123;
diff --git a/test/language/identifiers/val-throw-via-escape-hex.js b/test/language/identifiers/val-throw-via-escape-hex.js
index 6c0ad92459..b039bee2b2 100644
--- a/test/language/identifiers/val-throw-via-escape-hex.js
+++ b/test/language/identifiers/val-throw-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var thro\u{77} = 123;
diff --git a/test/language/identifiers/val-throw-via-escape-hex4.js b/test/language/identifiers/val-throw-via-escape-hex4.js
index 43ca0d620c..00bab2feeb 100644
--- a/test/language/identifiers/val-throw-via-escape-hex4.js
+++ b/test/language/identifiers/val-throw-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var thro\u0077 = 123;
diff --git a/test/language/identifiers/val-throw.js b/test/language/identifiers/val-throw.js
index 6b2650c36c..84cdadbe35 100644
--- a/test/language/identifiers/val-throw.js
+++ b/test/language/identifiers/val-throw.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var throw = 123;
diff --git a/test/language/identifiers/val-true-via-escape-hex.js b/test/language/identifiers/val-true-via-escape-hex.js
index 0a7bd882b2..f85838afbf 100644
--- a/test/language/identifiers/val-true-via-escape-hex.js
+++ b/test/language/identifiers/val-true-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var tr\u{75}e = 123;
diff --git a/test/language/identifiers/val-true-via-escape-hex4.js b/test/language/identifiers/val-true-via-escape-hex4.js
index 023012f186..7908c4c02a 100644
--- a/test/language/identifiers/val-true-via-escape-hex4.js
+++ b/test/language/identifiers/val-true-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var tr\u0075e = 123;
diff --git a/test/language/identifiers/val-true.js b/test/language/identifiers/val-true.js
index fce988ed72..14f00afdba 100644
--- a/test/language/identifiers/val-true.js
+++ b/test/language/identifiers/val-true.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var true = 123;
diff --git a/test/language/identifiers/val-try-via-escape-hex.js b/test/language/identifiers/val-try-via-escape-hex.js
index 9c9fce6cbf..02ae56508a 100644
--- a/test/language/identifiers/val-try-via-escape-hex.js
+++ b/test/language/identifiers/val-try-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{74}\u{72}\u{79} = 123;
diff --git a/test/language/identifiers/val-try-via-escape-hex4.js b/test/language/identifiers/val-try-via-escape-hex4.js
index 9905f5d759..d581fc0e01 100644
--- a/test/language/identifiers/val-try-via-escape-hex4.js
+++ b/test/language/identifiers/val-try-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0074\u0072\u0079 = 123;
diff --git a/test/language/identifiers/val-try.js b/test/language/identifiers/val-try.js
index 0c1350995c..fae1ea3103 100644
--- a/test/language/identifiers/val-try.js
+++ b/test/language/identifiers/val-try.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var try = 123;
diff --git a/test/language/identifiers/val-typeof-via-escape-hex.js b/test/language/identifiers/val-typeof-via-escape-hex.js
index 60c0f9476e..a828fc202e 100644
--- a/test/language/identifiers/val-typeof-via-escape-hex.js
+++ b/test/language/identifiers/val-typeof-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var typeo\u{66} = 123;
diff --git a/test/language/identifiers/val-typeof-via-escape-hex4.js b/test/language/identifiers/val-typeof-via-escape-hex4.js
index ecadf0fa04..6dbd86d366 100644
--- a/test/language/identifiers/val-typeof-via-escape-hex4.js
+++ b/test/language/identifiers/val-typeof-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var typeo\u0066 = 123;
diff --git a/test/language/identifiers/val-typeof.js b/test/language/identifiers/val-typeof.js
index 5766bed7cd..20276745da 100644
--- a/test/language/identifiers/val-typeof.js
+++ b/test/language/identifiers/val-typeof.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var typeof = 123;
diff --git a/test/language/identifiers/val-var-via-escape-hex.js b/test/language/identifiers/val-var-via-escape-hex.js
index b9051f3db5..ced646a0e3 100644
--- a/test/language/identifiers/val-var-via-escape-hex.js
+++ b/test/language/identifiers/val-var-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var va\u{72} = 123;
diff --git a/test/language/identifiers/val-var-via-escape-hex4.js b/test/language/identifiers/val-var-via-escape-hex4.js
index 9db63b7147..0044f1582c 100644
--- a/test/language/identifiers/val-var-via-escape-hex4.js
+++ b/test/language/identifiers/val-var-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var va\u0072 = 123;
diff --git a/test/language/identifiers/val-var.js b/test/language/identifiers/val-var.js
index e1b95778ec..35d87e846e 100644
--- a/test/language/identifiers/val-var.js
+++ b/test/language/identifiers/val-var.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var var = 123;
diff --git a/test/language/identifiers/val-void-via-escape-hex.js b/test/language/identifiers/val-void-via-escape-hex.js
index c1c244cd04..397fc54c32 100644
--- a/test/language/identifiers/val-void-via-escape-hex.js
+++ b/test/language/identifiers/val-void-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{76}\u{6f}\u{69}\u{64} = 123;
diff --git a/test/language/identifiers/val-void-via-escape-hex4.js b/test/language/identifiers/val-void-via-escape-hex4.js
index 3485b6e73e..cc6e906173 100644
--- a/test/language/identifiers/val-void-via-escape-hex4.js
+++ b/test/language/identifiers/val-void-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0076\u006f\u0069\u0064 = 123;
diff --git a/test/language/identifiers/val-void.js b/test/language/identifiers/val-void.js
index ca2049119f..97761147db 100644
--- a/test/language/identifiers/val-void.js
+++ b/test/language/identifiers/val-void.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var void = 123;
diff --git a/test/language/identifiers/val-while-via-escape-hex.js b/test/language/identifiers/val-while-via-escape-hex.js
index fc8192be98..08f305dc4f 100644
--- a/test/language/identifiers/val-while-via-escape-hex.js
+++ b/test/language/identifiers/val-while-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{77}\u{68}\u{69}\u{6c}\u{65} = 123;
diff --git a/test/language/identifiers/val-while-via-escape-hex4.js b/test/language/identifiers/val-while-via-escape-hex4.js
index 9c3c751103..084bfb1354 100644
--- a/test/language/identifiers/val-while-via-escape-hex4.js
+++ b/test/language/identifiers/val-while-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0077\u0068\u0069\u006c\u0065 = 123;
diff --git a/test/language/identifiers/val-while.js b/test/language/identifiers/val-while.js
index da2dc11989..632a2960b8 100644
--- a/test/language/identifiers/val-while.js
+++ b/test/language/identifiers/val-while.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var while = 123;
diff --git a/test/language/identifiers/val-with-via-escape-hex.js b/test/language/identifiers/val-with-via-escape-hex.js
index 39c6024f83..eb8fe6e23c 100644
--- a/test/language/identifiers/val-with-via-escape-hex.js
+++ b/test/language/identifiers/val-with-via-escape-hex.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u{77}ith = 123;
diff --git a/test/language/identifiers/val-with-via-escape-hex4.js b/test/language/identifiers/val-with-via-escape-hex4.js
index eaeb3ff29c..caaed27191 100644
--- a/test/language/identifiers/val-with-via-escape-hex4.js
+++ b/test/language/identifiers/val-with-via-escape-hex4.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u0077ith = 123;
diff --git a/test/language/identifiers/val-with.js b/test/language/identifiers/val-with.js
index b0c14f52c8..514c776dc3 100644
--- a/test/language/identifiers/val-with.js
+++ b/test/language/identifiers/val-with.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var with = 123;
diff --git a/test/language/identifiers/val-yield-strict.js b/test/language/identifiers/val-yield-strict.js
index a069650dd8..b86d4bcbb1 100644
--- a/test/language/identifiers/val-yield-strict.js
+++ b/test/language/identifiers/val-yield-strict.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var yield = 13;
diff --git a/test/language/identifiers/vertical-tilde-continue-escaped.js b/test/language/identifiers/vertical-tilde-continue-escaped.js
index d17090dee0..0430ae1b52 100644
--- a/test/language/identifiers/vertical-tilde-continue-escaped.js
+++ b/test/language/identifiers/vertical-tilde-continue-escaped.js
@@ -11,6 +11,6 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var a\u2E2F;
diff --git a/test/language/identifiers/vertical-tilde-continue.js b/test/language/identifiers/vertical-tilde-continue.js
index f248768d16..aad0a5ad57 100644
--- a/test/language/identifiers/vertical-tilde-continue.js
+++ b/test/language/identifiers/vertical-tilde-continue.js
@@ -11,6 +11,6 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var aⸯ; // U+2E2F
diff --git a/test/language/identifiers/vertical-tilde-start-escaped.js b/test/language/identifiers/vertical-tilde-start-escaped.js
index f3cfbc5725..aaaf97d641 100644
--- a/test/language/identifiers/vertical-tilde-start-escaped.js
+++ b/test/language/identifiers/vertical-tilde-start-escaped.js
@@ -11,6 +11,6 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var \u2E2F;
diff --git a/test/language/identifiers/vertical-tilde-start.js b/test/language/identifiers/vertical-tilde-start.js
index d10cde8b13..1c9adf4b78 100644
--- a/test/language/identifiers/vertical-tilde-start.js
+++ b/test/language/identifiers/vertical-tilde-start.js
@@ -11,6 +11,6 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var ⸯ; // U+2E2F
diff --git a/test/language/import/dup-bound-names.js b/test/language/import/dup-bound-names.js
index 49dcc8123e..56f3cc2c8a 100644
--- a/test/language/import/dup-bound-names.js
+++ b/test/language/import/dup-bound-names.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import { x, y as x } from 'z';
diff --git a/test/language/import/escaped-as-import-specifier.js b/test/language/import/escaped-as-import-specifier.js
index 5e5e455aa0..9d8bee0db7 100644
--- a/test/language/import/escaped-as-import-specifier.js
+++ b/test/language/import/escaped-as-import-specifier.js
@@ -19,7 +19,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export var a = 0;
 
diff --git a/test/language/import/escaped-as-namespace-import.js b/test/language/import/escaped-as-namespace-import.js
index 1059f7242a..521957305a 100644
--- a/test/language/import/escaped-as-namespace-import.js
+++ b/test/language/import/escaped-as-namespace-import.js
@@ -19,6 +19,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import* \u0061s self from "./escaped-as-namespace-import.js";
diff --git a/test/language/import/escaped-from.js b/test/language/import/escaped-from.js
index 7b50e7a302..d6434ebc67 100644
--- a/test/language/import/escaped-from.js
+++ b/test/language/import/escaped-from.js
@@ -19,6 +19,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import {} \u0066rom "./escaped-from.js";
diff --git a/test/language/keywords/ident-ref-break.js b/test/language/keywords/ident-ref-break.js
index 69984152d4..04bb6104f9 100644
--- a/test/language/keywords/ident-ref-break.js
+++ b/test/language/keywords/ident-ref-break.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 break = 1;
diff --git a/test/language/keywords/ident-ref-case.js b/test/language/keywords/ident-ref-case.js
index 642b4391fc..41a6a34fe6 100644
--- a/test/language/keywords/ident-ref-case.js
+++ b/test/language/keywords/ident-ref-case.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 case = 1;
diff --git a/test/language/keywords/ident-ref-catch.js b/test/language/keywords/ident-ref-catch.js
index 1c65ed5383..e347ae88fd 100644
--- a/test/language/keywords/ident-ref-catch.js
+++ b/test/language/keywords/ident-ref-catch.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 catch = 1;
diff --git a/test/language/keywords/ident-ref-continue.js b/test/language/keywords/ident-ref-continue.js
index d090dcd2d9..b373619fd5 100644
--- a/test/language/keywords/ident-ref-continue.js
+++ b/test/language/keywords/ident-ref-continue.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 continue = 1;
diff --git a/test/language/keywords/ident-ref-default.js b/test/language/keywords/ident-ref-default.js
index d4be204b80..0bbb8a9783 100644
--- a/test/language/keywords/ident-ref-default.js
+++ b/test/language/keywords/ident-ref-default.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 default = 1;
diff --git a/test/language/keywords/ident-ref-delete.js b/test/language/keywords/ident-ref-delete.js
index fb32124ace..72d49c245f 100644
--- a/test/language/keywords/ident-ref-delete.js
+++ b/test/language/keywords/ident-ref-delete.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 delete = 1;
diff --git a/test/language/keywords/ident-ref-do.js b/test/language/keywords/ident-ref-do.js
index a47cfda93a..430281ffc7 100644
--- a/test/language/keywords/ident-ref-do.js
+++ b/test/language/keywords/ident-ref-do.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do = 1;
diff --git a/test/language/keywords/ident-ref-else.js b/test/language/keywords/ident-ref-else.js
index 1b18eded71..6535671c68 100644
--- a/test/language/keywords/ident-ref-else.js
+++ b/test/language/keywords/ident-ref-else.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 else = 1;
diff --git a/test/language/keywords/ident-ref-finally.js b/test/language/keywords/ident-ref-finally.js
index b8666f24ac..119d41c05c 100644
--- a/test/language/keywords/ident-ref-finally.js
+++ b/test/language/keywords/ident-ref-finally.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 finally = 1;
diff --git a/test/language/keywords/ident-ref-for.js b/test/language/keywords/ident-ref-for.js
index 13b07379ec..25f7d3a711 100644
--- a/test/language/keywords/ident-ref-for.js
+++ b/test/language/keywords/ident-ref-for.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for = 1;
diff --git a/test/language/keywords/ident-ref-function.js b/test/language/keywords/ident-ref-function.js
index b00e2b12c6..7b92caa0b0 100644
--- a/test/language/keywords/ident-ref-function.js
+++ b/test/language/keywords/ident-ref-function.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function = 1;
diff --git a/test/language/keywords/ident-ref-if.js b/test/language/keywords/ident-ref-if.js
index 9232342e54..151db6602e 100644
--- a/test/language/keywords/ident-ref-if.js
+++ b/test/language/keywords/ident-ref-if.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if = 1;
diff --git a/test/language/keywords/ident-ref-in.js b/test/language/keywords/ident-ref-in.js
index 2fea6e63d8..1ac8f2f20e 100644
--- a/test/language/keywords/ident-ref-in.js
+++ b/test/language/keywords/ident-ref-in.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 in = 1;
diff --git a/test/language/keywords/ident-ref-instanceof.js b/test/language/keywords/ident-ref-instanceof.js
index da48271842..0aecb056d3 100644
--- a/test/language/keywords/ident-ref-instanceof.js
+++ b/test/language/keywords/ident-ref-instanceof.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 instanceof = 1;
diff --git a/test/language/keywords/ident-ref-new.js b/test/language/keywords/ident-ref-new.js
index c4cc8d8593..66a2924771 100644
--- a/test/language/keywords/ident-ref-new.js
+++ b/test/language/keywords/ident-ref-new.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 new = 1;
diff --git a/test/language/keywords/ident-ref-return.js b/test/language/keywords/ident-ref-return.js
index b14bce2234..59bd45de96 100644
--- a/test/language/keywords/ident-ref-return.js
+++ b/test/language/keywords/ident-ref-return.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 return = 1;
diff --git a/test/language/keywords/ident-ref-switch.js b/test/language/keywords/ident-ref-switch.js
index 0ac9c702dc..e31f58b655 100644
--- a/test/language/keywords/ident-ref-switch.js
+++ b/test/language/keywords/ident-ref-switch.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch = 1;
diff --git a/test/language/keywords/ident-ref-this.js b/test/language/keywords/ident-ref-this.js
index 5d9c16db31..b4ccdd0772 100644
--- a/test/language/keywords/ident-ref-this.js
+++ b/test/language/keywords/ident-ref-this.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // It's tempting to write `this = 0`, but that'd be a test to validate `this`
 // is not a valid simple assignment target, cf. tests in language/expressions/assignment.
diff --git a/test/language/keywords/ident-ref-throw.js b/test/language/keywords/ident-ref-throw.js
index 6ba0099f71..aea07ab1d3 100644
--- a/test/language/keywords/ident-ref-throw.js
+++ b/test/language/keywords/ident-ref-throw.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 throw = 1;
diff --git a/test/language/keywords/ident-ref-try.js b/test/language/keywords/ident-ref-try.js
index 48809d8d62..0a37439c2e 100644
--- a/test/language/keywords/ident-ref-try.js
+++ b/test/language/keywords/ident-ref-try.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try = 1;
diff --git a/test/language/keywords/ident-ref-typeof.js b/test/language/keywords/ident-ref-typeof.js
index 121e0f8436..791f089b1d 100644
--- a/test/language/keywords/ident-ref-typeof.js
+++ b/test/language/keywords/ident-ref-typeof.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 typeof = 1;
diff --git a/test/language/keywords/ident-ref-var.js b/test/language/keywords/ident-ref-var.js
index 996dabe633..e9e2e83363 100644
--- a/test/language/keywords/ident-ref-var.js
+++ b/test/language/keywords/ident-ref-var.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var = 1;
diff --git a/test/language/keywords/ident-ref-void.js b/test/language/keywords/ident-ref-void.js
index fab3bfe5fc..14b8c368b7 100644
--- a/test/language/keywords/ident-ref-void.js
+++ b/test/language/keywords/ident-ref-void.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 void = 1;
diff --git a/test/language/keywords/ident-ref-while.js b/test/language/keywords/ident-ref-while.js
index 93a2afd6ff..8a5908bc5f 100644
--- a/test/language/keywords/ident-ref-while.js
+++ b/test/language/keywords/ident-ref-while.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while = 1;
diff --git a/test/language/keywords/ident-ref-with.js b/test/language/keywords/ident-ref-with.js
index 5b1a11430f..b4ae98fb7a 100644
--- a/test/language/keywords/ident-ref-with.js
+++ b/test/language/keywords/ident-ref-with.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with = 1;
diff --git a/test/language/line-terminators/S7.3_A2.1_T2.js b/test/language/line-terminators/S7.3_A2.1_T2.js
index dd248d7be7..d6a147c4f8 100644
--- a/test/language/line-terminators/S7.3_A2.1_T2.js
+++ b/test/language/line-terminators/S7.3_A2.1_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "
diff --git a/test/language/line-terminators/S7.3_A2.2_T2.js b/test/language/line-terminators/S7.3_A2.2_T2.js
index 2ec27a238a..d1224d1b1f 100644
--- a/test/language/line-terminators/S7.3_A2.2_T2.js
+++ b/test/language/line-terminators/S7.3_A2.2_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "
diff --git a/test/language/line-terminators/S7.3_A3.1_T3.js b/test/language/line-terminators/S7.3_A3.1_T3.js
index 62bd6d5ca6..196f00203e 100644
--- a/test/language/line-terminators/S7.3_A3.1_T3.js
+++ b/test/language/line-terminators/S7.3_A3.1_T3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 //single
diff --git a/test/language/line-terminators/S7.3_A3.2_T1.js b/test/language/line-terminators/S7.3_A3.2_T1.js
index 9c8afe4615..4d6e18b584 100644
--- a/test/language/line-terminators/S7.3_A3.2_T1.js
+++ b/test/language/line-terminators/S7.3_A3.2_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // single line comment
  ??? (invalid)
diff --git a/test/language/line-terminators/S7.3_A3.2_T3.js b/test/language/line-terminators/S7.3_A3.2_T3.js
index 7f8cd70303..14c6c29bb6 100644
--- a/test/language/line-terminators/S7.3_A3.2_T3.js
+++ b/test/language/line-terminators/S7.3_A3.2_T3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 //single
diff --git a/test/language/line-terminators/S7.3_A3.3_T1.js b/test/language/line-terminators/S7.3_A3.3_T1.js
index 0df9f13f21..4405e0e73c 100644
--- a/test/language/line-terminators/S7.3_A3.3_T1.js
+++ b/test/language/line-terminators/S7.3_A3.3_T1.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // single line LS>
??? (invalid)
diff --git a/test/language/line-terminators/S7.3_A3.4_T1.js b/test/language/line-terminators/S7.3_A3.4_T1.js
index 0b93b55202..54ba2571c8 100644
--- a/test/language/line-terminators/S7.3_A3.4_T1.js
+++ b/test/language/line-terminators/S7.3_A3.4_T1.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // single line PS>
??? (invalid)
diff --git a/test/language/line-terminators/S7.3_A6_T1.js b/test/language/line-terminators/S7.3_A6_T1.js
index 991ed519f3..0e7be8984a 100644
--- a/test/language/line-terminators/S7.3_A6_T1.js
+++ b/test/language/line-terminators/S7.3_A6_T1.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u000Ax;
diff --git a/test/language/line-terminators/S7.3_A6_T2.js b/test/language/line-terminators/S7.3_A6_T2.js
index 20ebaa51e3..b02afee0da 100644
--- a/test/language/line-terminators/S7.3_A6_T2.js
+++ b/test/language/line-terminators/S7.3_A6_T2.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u000Dx;
diff --git a/test/language/line-terminators/S7.3_A6_T3.js b/test/language/line-terminators/S7.3_A6_T3.js
index 2e91f0c68f..f75f3800db 100644
--- a/test/language/line-terminators/S7.3_A6_T3.js
+++ b/test/language/line-terminators/S7.3_A6_T3.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u2028x;
diff --git a/test/language/line-terminators/S7.3_A6_T4.js b/test/language/line-terminators/S7.3_A6_T4.js
index 11bb40c5d8..48968bb12f 100644
--- a/test/language/line-terminators/S7.3_A6_T4.js
+++ b/test/language/line-terminators/S7.3_A6_T4.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u2029x;
diff --git a/test/language/literals/bigint/binary-invalid-digit.js b/test/language/literals/bigint/binary-invalid-digit.js
index bee669c49e..46396daba2 100644
--- a/test/language/literals/bigint/binary-invalid-digit.js
+++ b/test/language/literals/bigint/binary-invalid-digit.js
@@ -21,6 +21,6 @@ negative:
 features: [BigInt]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0b2n;
diff --git a/test/language/literals/bigint/exponent-part.js b/test/language/literals/bigint/exponent-part.js
index 3bc0c649d4..aa2c095d1d 100644
--- a/test/language/literals/bigint/exponent-part.js
+++ b/test/language/literals/bigint/exponent-part.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0e0n;
diff --git a/test/language/literals/bigint/hexadecimal-invalid-digit.js b/test/language/literals/bigint/hexadecimal-invalid-digit.js
index 745652ad28..e0e19f6cd3 100644
--- a/test/language/literals/bigint/hexadecimal-invalid-digit.js
+++ b/test/language/literals/bigint/hexadecimal-invalid-digit.js
@@ -21,6 +21,6 @@ negative:
 features: [BigInt]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0xgn;
diff --git a/test/language/literals/bigint/mv-is-not-integer-dil-dot-dds.js b/test/language/literals/bigint/mv-is-not-integer-dil-dot-dds.js
index 19a30be8fd..683e8c1b60 100644
--- a/test/language/literals/bigint/mv-is-not-integer-dil-dot-dds.js
+++ b/test/language/literals/bigint/mv-is-not-integer-dil-dot-dds.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 2017.8n;
diff --git a/test/language/literals/bigint/mv-is-not-integer-dot-dds.js b/test/language/literals/bigint/mv-is-not-integer-dot-dds.js
index 8d3aced697..756c5d719e 100644
--- a/test/language/literals/bigint/mv-is-not-integer-dot-dds.js
+++ b/test/language/literals/bigint/mv-is-not-integer-dot-dds.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 .0000000001n;
diff --git a/test/language/literals/bigint/octal-invalid-digit.js b/test/language/literals/bigint/octal-invalid-digit.js
index 7aa0e8c5e2..13a345c159 100644
--- a/test/language/literals/bigint/octal-invalid-digit.js
+++ b/test/language/literals/bigint/octal-invalid-digit.js
@@ -21,6 +21,6 @@ negative:
 features: [BigInt]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0o9n;
diff --git a/test/language/literals/numeric/7.8.3-1gs.js b/test/language/literals/numeric/7.8.3-1gs.js
index d86f76ba09..9e509faa09 100644
--- a/test/language/literals/numeric/7.8.3-1gs.js
+++ b/test/language/literals/numeric/7.8.3-1gs.js
@@ -10,6 +10,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var y = 010;
diff --git a/test/language/literals/numeric/7.8.3-2gs.js b/test/language/literals/numeric/7.8.3-2gs.js
index 24c61d3ca1..32cc0b7f4a 100644
--- a/test/language/literals/numeric/7.8.3-2gs.js
+++ b/test/language/literals/numeric/7.8.3-2gs.js
@@ -12,7 +12,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var a;
 a = 0x1;
diff --git a/test/language/literals/numeric/S7.8.3_A6.1_T1.js b/test/language/literals/numeric/S7.8.3_A6.1_T1.js
index 459f413e38..7eb030f0b0 100644
--- a/test/language/literals/numeric/S7.8.3_A6.1_T1.js
+++ b/test/language/literals/numeric/S7.8.3_A6.1_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 0x
diff --git a/test/language/literals/numeric/S7.8.3_A6.1_T2.js b/test/language/literals/numeric/S7.8.3_A6.1_T2.js
index dee1be38d7..63fd69057d 100644
--- a/test/language/literals/numeric/S7.8.3_A6.1_T2.js
+++ b/test/language/literals/numeric/S7.8.3_A6.1_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 0X
diff --git a/test/language/literals/numeric/S7.8.3_A6.2_T1.js b/test/language/literals/numeric/S7.8.3_A6.2_T1.js
index e31a159cd2..cec76f6c90 100644
--- a/test/language/literals/numeric/S7.8.3_A6.2_T1.js
+++ b/test/language/literals/numeric/S7.8.3_A6.2_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 0xG
diff --git a/test/language/literals/numeric/S7.8.3_A6.2_T2.js b/test/language/literals/numeric/S7.8.3_A6.2_T2.js
index 49ef360539..7d1b29a034 100644
--- a/test/language/literals/numeric/S7.8.3_A6.2_T2.js
+++ b/test/language/literals/numeric/S7.8.3_A6.2_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 0xg
diff --git a/test/language/literals/numeric/binary-invalid-digit.js b/test/language/literals/numeric/binary-invalid-digit.js
index 328c0ae824..7fab44619e 100644
--- a/test/language/literals/numeric/binary-invalid-digit.js
+++ b/test/language/literals/numeric/binary-invalid-digit.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0b2;
diff --git a/test/language/literals/numeric/binary-invalid-leading.js b/test/language/literals/numeric/binary-invalid-leading.js
index 9bcfa9321c..c594c24cd0 100644
--- a/test/language/literals/numeric/binary-invalid-leading.js
+++ b/test/language/literals/numeric/binary-invalid-leading.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 00b0;
diff --git a/test/language/literals/numeric/binary-invalid-truncated.js b/test/language/literals/numeric/binary-invalid-truncated.js
index 40201e5e73..bbd1a5ee09 100644
--- a/test/language/literals/numeric/binary-invalid-truncated.js
+++ b/test/language/literals/numeric/binary-invalid-truncated.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0b;
diff --git a/test/language/literals/numeric/binary-invalid-unicode.js b/test/language/literals/numeric/binary-invalid-unicode.js
index ef69034f3a..fefe59b23d 100644
--- a/test/language/literals/numeric/binary-invalid-unicode.js
+++ b/test/language/literals/numeric/binary-invalid-unicode.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0\u00620;
diff --git a/test/language/literals/numeric/legacy-octal-integer-strict.js b/test/language/literals/numeric/legacy-octal-integer-strict.js
index 0b30e37643..a14df1e559 100644
--- a/test/language/literals/numeric/legacy-octal-integer-strict.js
+++ b/test/language/literals/numeric/legacy-octal-integer-strict.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 00;
diff --git a/test/language/literals/numeric/non-octal-decimal-integer-strict.js b/test/language/literals/numeric/non-octal-decimal-integer-strict.js
index 844ba1a9fa..d7570f6123 100644
--- a/test/language/literals/numeric/non-octal-decimal-integer-strict.js
+++ b/test/language/literals/numeric/non-octal-decimal-integer-strict.js
@@ -26,6 +26,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 08;
diff --git a/test/language/literals/numeric/numeric-followed-by-ident.js b/test/language/literals/numeric/numeric-followed-by-ident.js
index 08e9006db5..7bd59bf20c 100644
--- a/test/language/literals/numeric/numeric-followed-by-ident.js
+++ b/test/language/literals/numeric/numeric-followed-by-ident.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 3in []
diff --git a/test/language/literals/numeric/numeric-separator-literal-bil-bd-nsl-bd-err.js b/test/language/literals/numeric/numeric-separator-literal-bil-bd-nsl-bd-err.js
index 5aa40df034..7f968de9bf 100644
--- a/test/language/literals/numeric/numeric-separator-literal-bil-bd-nsl-bd-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-bil-bd-nsl-bd-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0b_1
diff --git a/test/language/literals/numeric/numeric-separator-literal-bil-nsl-bd-dunder-err.js b/test/language/literals/numeric/numeric-separator-literal-bil-nsl-bd-dunder-err.js
index b57a731fd9..eaa7eb6976 100644
--- a/test/language/literals/numeric/numeric-separator-literal-bil-nsl-bd-dunder-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-bil-nsl-bd-dunder-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0b0__0
diff --git a/test/language/literals/numeric/numeric-separator-literal-bil-nsl-bd-err.js b/test/language/literals/numeric/numeric-separator-literal-bil-nsl-bd-err.js
index 82b842e129..68d3a578cd 100644
--- a/test/language/literals/numeric/numeric-separator-literal-bil-nsl-bd-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-bil-nsl-bd-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0b0_
diff --git a/test/language/literals/numeric/numeric-separator-literal-dd-nsl-dds-dunder-err.js b/test/language/literals/numeric/numeric-separator-literal-dd-nsl-dds-dunder-err.js
index fddfd2f1a6..0ab8add16b 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dd-nsl-dds-dunder-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dd-nsl-dds-dunder-err.js
@@ -21,6 +21,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1__0123456789
diff --git a/test/language/literals/numeric/numeric-separator-literal-dd-nsl-err.js b/test/language/literals/numeric/numeric-separator-literal-dd-nsl-err.js
index 571ef347e1..1c59fa79d8 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dd-nsl-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dd-nsl-err.js
@@ -23,6 +23,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1_
diff --git a/test/language/literals/numeric/numeric-separator-literal-dds-nsl-dds-dunder-err.js b/test/language/literals/numeric/numeric-separator-literal-dds-nsl-dds-dunder-err.js
index c4f722a7e2..73cf0028d5 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dds-nsl-dds-dunder-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dds-nsl-dds-dunder-err.js
@@ -21,6 +21,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 10__0123456789
diff --git a/test/language/literals/numeric/numeric-separator-literal-dds-nsl-err.js b/test/language/literals/numeric/numeric-separator-literal-dds-nsl-err.js
index a277e2e5c4..1f581b673e 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dds-nsl-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dds-nsl-err.js
@@ -24,6 +24,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 10_
diff --git a/test/language/literals/numeric/numeric-separator-literal-dil-dot-dds-nsl-ep-dd-err.js b/test/language/literals/numeric/numeric-separator-literal-dil-dot-dds-nsl-ep-dd-err.js
index 167377281a..6d09016267 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dil-dot-dds-nsl-ep-dd-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dil-dot-dds-nsl-ep-dd-err.js
@@ -23,6 +23,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 10.0_e1
diff --git a/test/language/literals/numeric/numeric-separator-literal-dil-dot-nsl-ep-err.js b/test/language/literals/numeric/numeric-separator-literal-dil-dot-nsl-ep-err.js
index 82feb241f9..be031987d4 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dil-dot-nsl-ep-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dil-dot-nsl-ep-err.js
@@ -26,6 +26,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 10._e1
diff --git a/test/language/literals/numeric/numeric-separator-literal-dil-dot-nsl-err.js b/test/language/literals/numeric/numeric-separator-literal-dil-dot-nsl-err.js
index 73d4729cbd..513efd5c36 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dil-dot-nsl-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dil-dot-nsl-err.js
@@ -24,6 +24,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 10._
diff --git a/test/language/literals/numeric/numeric-separator-literal-dot-dds-nsl-ep-err.js b/test/language/literals/numeric/numeric-separator-literal-dot-dds-nsl-ep-err.js
index 6761ff4390..503c49ca73 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dot-dds-nsl-ep-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dot-dds-nsl-ep-err.js
@@ -25,6 +25,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 .0_e1
diff --git a/test/language/literals/numeric/numeric-separator-literal-dot-nsl-ep-err.js b/test/language/literals/numeric/numeric-separator-literal-dot-nsl-ep-err.js
index 9ce2291ba8..ec7f92ab1c 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dot-nsl-ep-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dot-nsl-ep-err.js
@@ -26,6 +26,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ._e1
diff --git a/test/language/literals/numeric/numeric-separator-literal-dot-nsl-err.js b/test/language/literals/numeric/numeric-separator-literal-dot-nsl-err.js
index 3061bfccab..63c7ed4299 100644
--- a/test/language/literals/numeric/numeric-separator-literal-dot-nsl-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-dot-nsl-err.js
@@ -24,6 +24,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ._
diff --git a/test/language/literals/numeric/numeric-separator-literal-hil-hd-nsl-hd-err.js b/test/language/literals/numeric/numeric-separator-literal-hil-hd-nsl-hd-err.js
index 3312362053..6dbca041e5 100644
--- a/test/language/literals/numeric/numeric-separator-literal-hil-hd-nsl-hd-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-hil-hd-nsl-hd-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0x_1
diff --git a/test/language/literals/numeric/numeric-separator-literal-hil-nsl-hd-dunder-err.js b/test/language/literals/numeric/numeric-separator-literal-hil-nsl-hd-dunder-err.js
index 0aa1b183b0..baa5bad9b0 100644
--- a/test/language/literals/numeric/numeric-separator-literal-hil-nsl-hd-dunder-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-hil-nsl-hd-dunder-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0x0__0
diff --git a/test/language/literals/numeric/numeric-separator-literal-hil-nsl-hd-err.js b/test/language/literals/numeric/numeric-separator-literal-hil-nsl-hd-err.js
index 8eea5e08d9..db4aa29955 100644
--- a/test/language/literals/numeric/numeric-separator-literal-hil-nsl-hd-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-hil-nsl-hd-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0x0_
diff --git a/test/language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-dunder-err.js b/test/language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-dunder-err.js
index f8b29b2b7a..779f9d9b83 100644
--- a/test/language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-dunder-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-dunder-err.js
@@ -24,6 +24,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0__0123456789
diff --git a/test/language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-leading-zero-err.js b/test/language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-leading-zero-err.js
index 2d8b534c6d..03ba357330 100644
--- a/test/language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-leading-zero-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-leading-zero-err.js
@@ -22,6 +22,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0_0123456789
diff --git a/test/language/literals/numeric/numeric-separator-literal-oil-nsl-od-dunder-err.js b/test/language/literals/numeric/numeric-separator-literal-oil-nsl-od-dunder-err.js
index 1cd25b256b..d43bf3a234 100644
--- a/test/language/literals/numeric/numeric-separator-literal-oil-nsl-od-dunder-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-oil-nsl-od-dunder-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0o0__0
diff --git a/test/language/literals/numeric/numeric-separator-literal-oil-nsl-od-err.js b/test/language/literals/numeric/numeric-separator-literal-oil-nsl-od-err.js
index d0a4ab85d0..f93df52219 100644
--- a/test/language/literals/numeric/numeric-separator-literal-oil-nsl-od-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-oil-nsl-od-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0o0_
diff --git a/test/language/literals/numeric/numeric-separator-literal-oil-od-nsl-od-err.js b/test/language/literals/numeric/numeric-separator-literal-oil-od-nsl-od-err.js
index 142ce21238..57d0a50d68 100644
--- a/test/language/literals/numeric/numeric-separator-literal-oil-od-nsl-od-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-oil-od-nsl-od-err.js
@@ -29,6 +29,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0o_1
diff --git a/test/language/literals/numeric/numeric-separator-literal-unicode-err.js b/test/language/literals/numeric/numeric-separator-literal-unicode-err.js
index 30296d3647..84f0629a5f 100644
--- a/test/language/literals/numeric/numeric-separator-literal-unicode-err.js
+++ b/test/language/literals/numeric/numeric-separator-literal-unicode-err.js
@@ -21,6 +21,6 @@ negative:
 features: [numeric-separator-literal]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1\u005F0123456789
diff --git a/test/language/literals/numeric/octal-invalid-digit.js b/test/language/literals/numeric/octal-invalid-digit.js
index 02451db8c4..08651cdddf 100644
--- a/test/language/literals/numeric/octal-invalid-digit.js
+++ b/test/language/literals/numeric/octal-invalid-digit.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0o8;
diff --git a/test/language/literals/numeric/octal-invalid-leading.js b/test/language/literals/numeric/octal-invalid-leading.js
index d35e722f63..68b27eb978 100644
--- a/test/language/literals/numeric/octal-invalid-leading.js
+++ b/test/language/literals/numeric/octal-invalid-leading.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 00o0;
diff --git a/test/language/literals/numeric/octal-invalid-truncated.js b/test/language/literals/numeric/octal-invalid-truncated.js
index 6e51e27e01..1de190703c 100644
--- a/test/language/literals/numeric/octal-invalid-truncated.js
+++ b/test/language/literals/numeric/octal-invalid-truncated.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0o;
diff --git a/test/language/literals/numeric/octal-invalid-unicode.js b/test/language/literals/numeric/octal-invalid-unicode.js
index 9d9e0cd8f2..38aa328966 100644
--- a/test/language/literals/numeric/octal-invalid-unicode.js
+++ b/test/language/literals/numeric/octal-invalid-unicode.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 0\u006f0;
diff --git a/test/language/literals/regexp/S7.8.5_A1.2_T1.js b/test/language/literals/regexp/S7.8.5_A1.2_T1.js
index dd78a7c179..e21e23cf34 100644
--- a/test/language/literals/regexp/S7.8.5_A1.2_T1.js
+++ b/test/language/literals/regexp/S7.8.5_A1.2_T1.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /*/
diff --git a/test/language/literals/regexp/S7.8.5_A1.2_T2.js b/test/language/literals/regexp/S7.8.5_A1.2_T2.js
index 14007808e1..2cf22c2ca9 100644
--- a/test/language/literals/regexp/S7.8.5_A1.2_T2.js
+++ b/test/language/literals/regexp/S7.8.5_A1.2_T2.js
@@ -21,6 +21,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\/
diff --git a/test/language/literals/regexp/S7.8.5_A1.2_T3.js b/test/language/literals/regexp/S7.8.5_A1.2_T3.js
index 07f8d7fe9e..2b6ff6d776 100644
--- a/test/language/literals/regexp/S7.8.5_A1.2_T3.js
+++ b/test/language/literals/regexp/S7.8.5_A1.2_T3.js
@@ -21,7 +21,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ///
 .source;
diff --git a/test/language/literals/regexp/S7.8.5_A1.2_T4.js b/test/language/literals/regexp/S7.8.5_A1.2_T4.js
index 7c27113b16..a3c394fce8 100644
--- a/test/language/literals/regexp/S7.8.5_A1.2_T4.js
+++ b/test/language/literals/regexp/S7.8.5_A1.2_T4.js
@@ -21,7 +21,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //
 .source;
diff --git a/test/language/literals/regexp/S7.8.5_A1.3_T1.js b/test/language/literals/regexp/S7.8.5_A1.3_T1.js
index bad11e91f7..f0be68d2b4 100644
--- a/test/language/literals/regexp/S7.8.5_A1.3_T1.js
+++ b/test/language/literals/regexp/S7.8.5_A1.3_T1.js
@@ -24,7 +24,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /
 /
diff --git a/test/language/literals/regexp/S7.8.5_A1.3_T3.js b/test/language/literals/regexp/S7.8.5_A1.3_T3.js
index 9cdd2f14ba..009060de81 100644
--- a/test/language/literals/regexp/S7.8.5_A1.3_T3.js
+++ b/test/language/literals/regexp/S7.8.5_A1.3_T3.js
@@ -24,7 +24,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /
 /
diff --git a/test/language/literals/regexp/S7.8.5_A1.5_T1.js b/test/language/literals/regexp/S7.8.5_A1.5_T1.js
index 4eb092792f..12f5e7aac3 100644
--- a/test/language/literals/regexp/S7.8.5_A1.5_T1.js
+++ b/test/language/literals/regexp/S7.8.5_A1.5_T1.js
@@ -18,7 +18,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\
 /
diff --git a/test/language/literals/regexp/S7.8.5_A1.5_T3.js b/test/language/literals/regexp/S7.8.5_A1.5_T3.js
index 850c45d59e..b62a5f3594 100644
--- a/test/language/literals/regexp/S7.8.5_A1.5_T3.js
+++ b/test/language/literals/regexp/S7.8.5_A1.5_T3.js
@@ -17,7 +17,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\
 /
diff --git a/test/language/literals/regexp/S7.8.5_A2.2_T1.js b/test/language/literals/regexp/S7.8.5_A2.2_T1.js
index 2ea4e0f67a..d88e36cadc 100644
--- a/test/language/literals/regexp/S7.8.5_A2.2_T1.js
+++ b/test/language/literals/regexp/S7.8.5_A2.2_T1.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /a\/
diff --git a/test/language/literals/regexp/S7.8.5_A2.2_T2.js b/test/language/literals/regexp/S7.8.5_A2.2_T2.js
index 2ee28b0116..4c2aa4771b 100644
--- a/test/language/literals/regexp/S7.8.5_A2.2_T2.js
+++ b/test/language/literals/regexp/S7.8.5_A2.2_T2.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /a//.source;
diff --git a/test/language/literals/regexp/S7.8.5_A2.3_T1.js b/test/language/literals/regexp/S7.8.5_A2.3_T1.js
index de5e9cb879..8174680ea0 100644
--- a/test/language/literals/regexp/S7.8.5_A2.3_T1.js
+++ b/test/language/literals/regexp/S7.8.5_A2.3_T1.js
@@ -27,7 +27,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /a
 /
diff --git a/test/language/literals/regexp/S7.8.5_A2.3_T3.js b/test/language/literals/regexp/S7.8.5_A2.3_T3.js
index 15742bfe19..69125e55af 100644
--- a/test/language/literals/regexp/S7.8.5_A2.3_T3.js
+++ b/test/language/literals/regexp/S7.8.5_A2.3_T3.js
@@ -28,7 +28,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /a
 /
diff --git a/test/language/literals/regexp/S7.8.5_A2.5_T1.js b/test/language/literals/regexp/S7.8.5_A2.5_T1.js
index df1e39375c..f365bdda77 100644
--- a/test/language/literals/regexp/S7.8.5_A2.5_T1.js
+++ b/test/language/literals/regexp/S7.8.5_A2.5_T1.js
@@ -23,7 +23,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /a\
 /
diff --git a/test/language/literals/regexp/S7.8.5_A2.5_T3.js b/test/language/literals/regexp/S7.8.5_A2.5_T3.js
index 48b7662961..cff0d72e94 100644
--- a/test/language/literals/regexp/S7.8.5_A2.5_T3.js
+++ b/test/language/literals/regexp/S7.8.5_A2.5_T3.js
@@ -23,7 +23,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /a\
 /
diff --git a/test/language/literals/regexp/early-err-bad-flag.js b/test/language/literals/regexp/early-err-bad-flag.js
index 1e0b07834a..9af46ef930 100644
--- a/test/language/literals/regexp/early-err-bad-flag.js
+++ b/test/language/literals/regexp/early-err-bad-flag.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /./G;
diff --git a/test/language/literals/regexp/early-err-dup-flag.js b/test/language/literals/regexp/early-err-dup-flag.js
index 64113a80b9..3d7cbaea63 100644
--- a/test/language/literals/regexp/early-err-dup-flag.js
+++ b/test/language/literals/regexp/early-err-dup-flag.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /./gig;
diff --git a/test/language/literals/regexp/early-err-flags-unicode-escape.js b/test/language/literals/regexp/early-err-flags-unicode-escape.js
index f8ccf2dfcb..f990569d8d 100644
--- a/test/language/literals/regexp/early-err-flags-unicode-escape.js
+++ b/test/language/literals/regexp/early-err-flags-unicode-escape.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /./\u0067;
diff --git a/test/language/literals/regexp/early-err-pattern.js b/test/language/literals/regexp/early-err-pattern.js
index 8ec9b77dcc..0ccbfc4ec8 100644
--- a/test/language/literals/regexp/early-err-pattern.js
+++ b/test/language/literals/regexp/early-err-pattern.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /?/;
diff --git a/test/language/literals/regexp/invalid-braced-quantifier-exact.js b/test/language/literals/regexp/invalid-braced-quantifier-exact.js
index d3bedeeacc..dfcb608665 100644
--- a/test/language/literals/regexp/invalid-braced-quantifier-exact.js
+++ b/test/language/literals/regexp/invalid-braced-quantifier-exact.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /{2}/;
diff --git a/test/language/literals/regexp/invalid-braced-quantifier-lower.js b/test/language/literals/regexp/invalid-braced-quantifier-lower.js
index 31ceca2264..eae3c8039c 100644
--- a/test/language/literals/regexp/invalid-braced-quantifier-lower.js
+++ b/test/language/literals/regexp/invalid-braced-quantifier-lower.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /{2,}/;
diff --git a/test/language/literals/regexp/invalid-braced-quantifier-range.js b/test/language/literals/regexp/invalid-braced-quantifier-range.js
index 2327d2421e..4f834742e5 100644
--- a/test/language/literals/regexp/invalid-braced-quantifier-range.js
+++ b/test/language/literals/regexp/invalid-braced-quantifier-range.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /{2,3}/;
diff --git a/test/language/literals/regexp/invalid-optional-lookbehind.js b/test/language/literals/regexp/invalid-optional-lookbehind.js
index e3a4a213b1..5d4469c891 100644
--- a/test/language/literals/regexp/invalid-optional-lookbehind.js
+++ b/test/language/literals/regexp/invalid-optional-lookbehind.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?<=.)?/;
diff --git a/test/language/literals/regexp/invalid-optional-negative-lookbehind.js b/test/language/literals/regexp/invalid-optional-negative-lookbehind.js
index 6b62b74df5..5a4d23da08 100644
--- a/test/language/literals/regexp/invalid-optional-negative-lookbehind.js
+++ b/test/language/literals/regexp/invalid-optional-negative-lookbehind.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?<!.)?/;
diff --git a/test/language/literals/regexp/invalid-range-lookbehind.js b/test/language/literals/regexp/invalid-range-lookbehind.js
index fd58c9cf7e..20b8fd93bf 100644
--- a/test/language/literals/regexp/invalid-range-lookbehind.js
+++ b/test/language/literals/regexp/invalid-range-lookbehind.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?<=.){2,3}/;
diff --git a/test/language/literals/regexp/invalid-range-negative-lookbehind.js b/test/language/literals/regexp/invalid-range-negative-lookbehind.js
index c10e2b7924..42f1df6cbc 100644
--- a/test/language/literals/regexp/invalid-range-negative-lookbehind.js
+++ b/test/language/literals/regexp/invalid-range-negative-lookbehind.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?<!.){2,3}/;
diff --git a/test/language/literals/regexp/regexp-first-char-no-line-separator.js b/test/language/literals/regexp/regexp-first-char-no-line-separator.js
index bb8db8e94b..7f7f7064c4 100644
--- a/test/language/literals/regexp/regexp-first-char-no-line-separator.js
+++ b/test/language/literals/regexp/regexp-first-char-no-line-separator.js
@@ -24,7 +24,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /
/
 
diff --git a/test/language/literals/regexp/regexp-first-char-no-paragraph-separator.js b/test/language/literals/regexp/regexp-first-char-no-paragraph-separator.js
index 16197c37e0..0a436bab49 100644
--- a/test/language/literals/regexp/regexp-first-char-no-paragraph-separator.js
+++ b/test/language/literals/regexp/regexp-first-char-no-paragraph-separator.js
@@ -24,7 +24,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /
/
 
diff --git a/test/language/literals/regexp/regexp-source-char-no-line-separator.js b/test/language/literals/regexp/regexp-source-char-no-line-separator.js
index 2b983a0702..aa173ec964 100644
--- a/test/language/literals/regexp/regexp-source-char-no-line-separator.js
+++ b/test/language/literals/regexp/regexp-source-char-no-line-separator.js
@@ -23,7 +23,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /a\\
/
 
diff --git a/test/language/literals/regexp/regexp-source-char-no-paragraph-separator.js b/test/language/literals/regexp/regexp-source-char-no-paragraph-separator.js
index 8b08e0560c..a970e9376a 100644
--- a/test/language/literals/regexp/regexp-source-char-no-paragraph-separator.js
+++ b/test/language/literals/regexp/regexp-source-char-no-paragraph-separator.js
@@ -24,7 +24,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /a\\

/
 
diff --git a/test/language/literals/regexp/u-dec-esc.js b/test/language/literals/regexp/u-dec-esc.js
index faa200f48f..d08a2d6326 100644
--- a/test/language/literals/regexp/u-dec-esc.js
+++ b/test/language/literals/regexp/u-dec-esc.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\1/u;
diff --git a/test/language/literals/regexp/u-invalid-class-escape.js b/test/language/literals/regexp/u-invalid-class-escape.js
index 6d50ce4762..44cf369639 100644
--- a/test/language/literals/regexp/u-invalid-class-escape.js
+++ b/test/language/literals/regexp/u-invalid-class-escape.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\c0/u;
diff --git a/test/language/literals/regexp/u-invalid-extended-pattern-char.js b/test/language/literals/regexp/u-invalid-extended-pattern-char.js
index 8745e38dd0..cafb641cda 100644
--- a/test/language/literals/regexp/u-invalid-extended-pattern-char.js
+++ b/test/language/literals/regexp/u-invalid-extended-pattern-char.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /{/u;
diff --git a/test/language/literals/regexp/u-invalid-identity-escape.js b/test/language/literals/regexp/u-invalid-identity-escape.js
index 2e614c7a48..2d88bc4636 100644
--- a/test/language/literals/regexp/u-invalid-identity-escape.js
+++ b/test/language/literals/regexp/u-invalid-identity-escape.js
@@ -17,6 +17,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\M/u;
diff --git a/test/language/literals/regexp/u-invalid-legacy-octal-escape.js b/test/language/literals/regexp/u-invalid-legacy-octal-escape.js
index ca83e19cfa..5a632914dc 100644
--- a/test/language/literals/regexp/u-invalid-legacy-octal-escape.js
+++ b/test/language/literals/regexp/u-invalid-legacy-octal-escape.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\1/u;
diff --git a/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-a.js b/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-a.js
index 80871b19cf..f09ecf1571 100644
--- a/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-a.js
+++ b/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-a.js
@@ -27,6 +27,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\d-a]/u;
diff --git a/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-ab.js b/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-ab.js
index 8a8a302c27..c4a2382265 100644
--- a/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-ab.js
+++ b/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-ab.js
@@ -27,6 +27,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[\s-\d]/u;
diff --git a/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-b.js b/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-b.js
index 55922b5c0e..8c0c39cfe0 100644
--- a/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-b.js
+++ b/test/language/literals/regexp/u-invalid-non-empty-class-ranges-no-dash-b.js
@@ -27,6 +27,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[%-\d]/u;
diff --git a/test/language/literals/regexp/u-invalid-non-empty-class-ranges.js b/test/language/literals/regexp/u-invalid-non-empty-class-ranges.js
index 15873d6b25..b68fd65719 100644
--- a/test/language/literals/regexp/u-invalid-non-empty-class-ranges.js
+++ b/test/language/literals/regexp/u-invalid-non-empty-class-ranges.js
@@ -26,6 +26,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /[--\d]/u;
diff --git a/test/language/literals/regexp/u-invalid-oob-decimal-escape.js b/test/language/literals/regexp/u-invalid-oob-decimal-escape.js
index 06d6ca1160..56f3727ac4 100644
--- a/test/language/literals/regexp/u-invalid-oob-decimal-escape.js
+++ b/test/language/literals/regexp/u-invalid-oob-decimal-escape.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\8/u;
diff --git a/test/language/literals/regexp/u-invalid-optional-lookahead.js b/test/language/literals/regexp/u-invalid-optional-lookahead.js
index 21c8dee70f..59b94337ef 100644
--- a/test/language/literals/regexp/u-invalid-optional-lookahead.js
+++ b/test/language/literals/regexp/u-invalid-optional-lookahead.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?=.)?/u;
diff --git a/test/language/literals/regexp/u-invalid-optional-lookbehind.js b/test/language/literals/regexp/u-invalid-optional-lookbehind.js
index 7e2596d8f2..f3a5e5c017 100644
--- a/test/language/literals/regexp/u-invalid-optional-lookbehind.js
+++ b/test/language/literals/regexp/u-invalid-optional-lookbehind.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?<=.)?/u;
diff --git a/test/language/literals/regexp/u-invalid-optional-negative-lookahead.js b/test/language/literals/regexp/u-invalid-optional-negative-lookahead.js
index aaf25231be..136b3238d3 100644
--- a/test/language/literals/regexp/u-invalid-optional-negative-lookahead.js
+++ b/test/language/literals/regexp/u-invalid-optional-negative-lookahead.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?!.)?/u;
diff --git a/test/language/literals/regexp/u-invalid-optional-negative-lookbehind.js b/test/language/literals/regexp/u-invalid-optional-negative-lookbehind.js
index b66aa7858a..42e5bc0713 100644
--- a/test/language/literals/regexp/u-invalid-optional-negative-lookbehind.js
+++ b/test/language/literals/regexp/u-invalid-optional-negative-lookbehind.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?<!.)?/u;
diff --git a/test/language/literals/regexp/u-invalid-range-lookahead.js b/test/language/literals/regexp/u-invalid-range-lookahead.js
index fd1f13dd53..7a104a5d6b 100644
--- a/test/language/literals/regexp/u-invalid-range-lookahead.js
+++ b/test/language/literals/regexp/u-invalid-range-lookahead.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?=.){2,3}/u;
diff --git a/test/language/literals/regexp/u-invalid-range-lookbehind.js b/test/language/literals/regexp/u-invalid-range-lookbehind.js
index ac85a6ce15..6a46077478 100644
--- a/test/language/literals/regexp/u-invalid-range-lookbehind.js
+++ b/test/language/literals/regexp/u-invalid-range-lookbehind.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?<=.){2,3}/u;
diff --git a/test/language/literals/regexp/u-invalid-range-negative-lookahead.js b/test/language/literals/regexp/u-invalid-range-negative-lookahead.js
index f322311414..e3d9f6ae4f 100644
--- a/test/language/literals/regexp/u-invalid-range-negative-lookahead.js
+++ b/test/language/literals/regexp/u-invalid-range-negative-lookahead.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?!.){2,3}/u;
diff --git a/test/language/literals/regexp/u-invalid-range-negative-lookbehind.js b/test/language/literals/regexp/u-invalid-range-negative-lookbehind.js
index 3c46cd33ca..8aab71c746 100644
--- a/test/language/literals/regexp/u-invalid-range-negative-lookbehind.js
+++ b/test/language/literals/regexp/u-invalid-range-negative-lookbehind.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /.(?<!.){2,3}/u;
diff --git a/test/language/literals/regexp/u-unicode-esc-bounds.js b/test/language/literals/regexp/u-unicode-esc-bounds.js
index e6cee72923..48d721ad8e 100644
--- a/test/language/literals/regexp/u-unicode-esc-bounds.js
+++ b/test/language/literals/regexp/u-unicode-esc-bounds.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\u{110000}/u;
diff --git a/test/language/literals/regexp/u-unicode-esc-non-hex.js b/test/language/literals/regexp/u-unicode-esc-non-hex.js
index e425b8b1d8..bb33b9d185 100644
--- a/test/language/literals/regexp/u-unicode-esc-non-hex.js
+++ b/test/language/literals/regexp/u-unicode-esc-non-hex.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\u{1,}/u;
diff --git a/test/language/literals/regexp/unicode-escape-nls-err.js b/test/language/literals/regexp/unicode-escape-nls-err.js
index 97692902dd..580c42bbd5 100644
--- a/test/language/literals/regexp/unicode-escape-nls-err.js
+++ b/test/language/literals/regexp/unicode-escape-nls-err.js
@@ -68,6 +68,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /\u{1F_639}/u;
diff --git a/test/language/literals/string/S7.8.4_A1.1_T1.js b/test/language/literals/string/S7.8.4_A1.1_T1.js
index 4f8a99994d..b056a30116 100644
--- a/test/language/literals/string/S7.8.4_A1.1_T1.js
+++ b/test/language/literals/string/S7.8.4_A1.1_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 """
diff --git a/test/language/literals/string/S7.8.4_A1.1_T2.js b/test/language/literals/string/S7.8.4_A1.1_T2.js
index 1238b39823..687056b06b 100644
--- a/test/language/literals/string/S7.8.4_A1.1_T2.js
+++ b/test/language/literals/string/S7.8.4_A1.1_T2.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "
diff --git a/test/language/literals/string/S7.8.4_A1.2_T1.js b/test/language/literals/string/S7.8.4_A1.2_T1.js
index ee99a92bf9..cf5db3fc42 100644
--- a/test/language/literals/string/S7.8.4_A1.2_T1.js
+++ b/test/language/literals/string/S7.8.4_A1.2_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 '''
diff --git a/test/language/literals/string/S7.8.4_A1.2_T2.js b/test/language/literals/string/S7.8.4_A1.2_T2.js
index ed3c52e457..3fa90f3acc 100644
--- a/test/language/literals/string/S7.8.4_A1.2_T2.js
+++ b/test/language/literals/string/S7.8.4_A1.2_T2.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 '
diff --git a/test/language/literals/string/S7.8.4_A3.1_T1.js b/test/language/literals/string/S7.8.4_A3.1_T1.js
index 014a2ee6dd..6f00caeed7 100644
--- a/test/language/literals/string/S7.8.4_A3.1_T1.js
+++ b/test/language/literals/string/S7.8.4_A3.1_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "\"
diff --git a/test/language/literals/string/S7.8.4_A3.1_T2.js b/test/language/literals/string/S7.8.4_A3.1_T2.js
index fc9da21e05..cd99d21a66 100644
--- a/test/language/literals/string/S7.8.4_A3.1_T2.js
+++ b/test/language/literals/string/S7.8.4_A3.1_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 '\'
diff --git a/test/language/literals/string/S7.8.4_A3.2_T1.js b/test/language/literals/string/S7.8.4_A3.2_T1.js
index cde0a103e8..8d82e5670b 100644
--- a/test/language/literals/string/S7.8.4_A3.2_T1.js
+++ b/test/language/literals/string/S7.8.4_A3.2_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "\\\"
diff --git a/test/language/literals/string/S7.8.4_A3.2_T2.js b/test/language/literals/string/S7.8.4_A3.2_T2.js
index 33fd00da8a..571c069292 100644
--- a/test/language/literals/string/S7.8.4_A3.2_T2.js
+++ b/test/language/literals/string/S7.8.4_A3.2_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 '\\\'
diff --git a/test/language/literals/string/S7.8.4_A4.3_T1.js b/test/language/literals/string/S7.8.4_A4.3_T1.js
index d3c8266243..6a12fb2115 100644
--- a/test/language/literals/string/S7.8.4_A4.3_T1.js
+++ b/test/language/literals/string/S7.8.4_A4.3_T1.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 "\1"
diff --git a/test/language/literals/string/S7.8.4_A4.3_T2.js b/test/language/literals/string/S7.8.4_A4.3_T2.js
index 05552ca049..cd9d50a38c 100644
--- a/test/language/literals/string/S7.8.4_A4.3_T2.js
+++ b/test/language/literals/string/S7.8.4_A4.3_T2.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 "\7"
diff --git a/test/language/literals/string/S7.8.4_A7.1_T4.js b/test/language/literals/string/S7.8.4_A7.1_T4.js
index 7a3efc281d..4f1b981fc4 100644
--- a/test/language/literals/string/S7.8.4_A7.1_T4.js
+++ b/test/language/literals/string/S7.8.4_A7.1_T4.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#
 "\u000G"
diff --git a/test/language/literals/string/S7.8.4_A7.2_T1.js b/test/language/literals/string/S7.8.4_A7.2_T1.js
index 8b7ba99a1f..2889d90f41 100644
--- a/test/language/literals/string/S7.8.4_A7.2_T1.js
+++ b/test/language/literals/string/S7.8.4_A7.2_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "\u1"
diff --git a/test/language/literals/string/S7.8.4_A7.2_T2.js b/test/language/literals/string/S7.8.4_A7.2_T2.js
index b64439cb8a..3264200c89 100644
--- a/test/language/literals/string/S7.8.4_A7.2_T2.js
+++ b/test/language/literals/string/S7.8.4_A7.2_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "\uA"
diff --git a/test/language/literals/string/S7.8.4_A7.2_T3.js b/test/language/literals/string/S7.8.4_A7.2_T3.js
index 6a0b313928..d76f4c19a7 100644
--- a/test/language/literals/string/S7.8.4_A7.2_T3.js
+++ b/test/language/literals/string/S7.8.4_A7.2_T3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "\u11"
diff --git a/test/language/literals/string/S7.8.4_A7.2_T4.js b/test/language/literals/string/S7.8.4_A7.2_T4.js
index d5ffc0e5b4..e8cbff6d51 100644
--- a/test/language/literals/string/S7.8.4_A7.2_T4.js
+++ b/test/language/literals/string/S7.8.4_A7.2_T4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "\uAA"
diff --git a/test/language/literals/string/S7.8.4_A7.2_T5.js b/test/language/literals/string/S7.8.4_A7.2_T5.js
index aa53b20fd3..d68bda6ee7 100644
--- a/test/language/literals/string/S7.8.4_A7.2_T5.js
+++ b/test/language/literals/string/S7.8.4_A7.2_T5.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "\u111"
diff --git a/test/language/literals/string/S7.8.4_A7.2_T6.js b/test/language/literals/string/S7.8.4_A7.2_T6.js
index 27e51dc885..f95a3b6bc5 100644
--- a/test/language/literals/string/S7.8.4_A7.2_T6.js
+++ b/test/language/literals/string/S7.8.4_A7.2_T6.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //CHECK#1
 "\uAAA"
diff --git a/test/language/literals/string/legacy-non-octal-escape-sequence-strict.js b/test/language/literals/string/legacy-non-octal-escape-sequence-strict.js
index 6203f9f8e6..b4cca2ddd2 100644
--- a/test/language/literals/string/legacy-non-octal-escape-sequence-strict.js
+++ b/test/language/literals/string/legacy-non-octal-escape-sequence-strict.js
@@ -33,6 +33,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 '\08';
diff --git a/test/language/literals/string/legacy-octal-escape-sequence-prologue-strict.js b/test/language/literals/string/legacy-octal-escape-sequence-prologue-strict.js
index fd2ad26f2c..21e03f6087 100644
--- a/test/language/literals/string/legacy-octal-escape-sequence-prologue-strict.js
+++ b/test/language/literals/string/legacy-octal-escape-sequence-prologue-strict.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function() {
   "asterisk: \052";
diff --git a/test/language/literals/string/legacy-octal-escape-sequence-strict.js b/test/language/literals/string/legacy-octal-escape-sequence-strict.js
index fdc57f4f4c..4eb0ef9612 100644
--- a/test/language/literals/string/legacy-octal-escape-sequence-strict.js
+++ b/test/language/literals/string/legacy-octal-escape-sequence-strict.js
@@ -33,6 +33,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 '\1';
diff --git a/test/language/literals/string/unicode-escape-nls-err-double.js b/test/language/literals/string/unicode-escape-nls-err-double.js
index d3ac10266c..f544d8b69c 100644
--- a/test/language/literals/string/unicode-escape-nls-err-double.js
+++ b/test/language/literals/string/unicode-escape-nls-err-double.js
@@ -44,6 +44,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 "\u{1F_639}"
diff --git a/test/language/literals/string/unicode-escape-nls-err-single.js b/test/language/literals/string/unicode-escape-nls-err-single.js
index 959feae347..975f51f273 100644
--- a/test/language/literals/string/unicode-escape-nls-err-single.js
+++ b/test/language/literals/string/unicode-escape-nls-err-single.js
@@ -44,6 +44,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 '\u{1F_639}';
diff --git a/test/language/module-code/comment-multi-line-html-close.js b/test/language/module-code/comment-multi-line-html-close.js
index 5eab1de435..a229d0e42d 100644
--- a/test/language/module-code/comment-multi-line-html-close.js
+++ b/test/language/module-code/comment-multi-line-html-close.js
@@ -11,7 +11,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 /*
 */-->
diff --git a/test/language/module-code/comment-single-line-html-close.js b/test/language/module-code/comment-single-line-html-close.js
index 7c1ad3e88e..a963398bc9 100644
--- a/test/language/module-code/comment-single-line-html-close.js
+++ b/test/language/module-code/comment-single-line-html-close.js
@@ -11,6 +11,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 -->
diff --git a/test/language/module-code/comment-single-line-html-open.js b/test/language/module-code/comment-single-line-html-open.js
index a75b9e0da2..de509261ea 100644
--- a/test/language/module-code/comment-single-line-html-open.js
+++ b/test/language/module-code/comment-single-line-html-open.js
@@ -11,6 +11,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 <!--
diff --git a/test/language/module-code/early-dup-export-as-star-as.js b/test/language/module-code/early-dup-export-as-star-as.js
index 30add317e3..d7bfa2b39b 100644
--- a/test/language/module-code/early-dup-export-as-star-as.js
+++ b/test/language/module-code/early-dup-export-as-star-as.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x;
 export { x as z };
diff --git a/test/language/module-code/early-dup-export-decl.js b/test/language/module-code/early-dup-export-decl.js
index a70dd7185e..93f0d1d83a 100644
--- a/test/language/module-code/early-dup-export-decl.js
+++ b/test/language/module-code/early-dup-export-decl.js
@@ -12,7 +12,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export function f() {}
 export function *f() {}
diff --git a/test/language/module-code/early-dup-export-dflt-id.js b/test/language/module-code/early-dup-export-dflt-id.js
index d47ebdd646..7a113e50cd 100644
--- a/test/language/module-code/early-dup-export-dflt-id.js
+++ b/test/language/module-code/early-dup-export-dflt-id.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x, y;
 export default x;
diff --git a/test/language/module-code/early-dup-export-dflt.js b/test/language/module-code/early-dup-export-dflt.js
index 9ddecb6dda..ce8853ef9a 100644
--- a/test/language/module-code/early-dup-export-dflt.js
+++ b/test/language/module-code/early-dup-export-dflt.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default var x = null;
 export default var x = null;
diff --git a/test/language/module-code/early-dup-export-id-as.js b/test/language/module-code/early-dup-export-id-as.js
index 03220bdc5a..0fb3b2ef4e 100644
--- a/test/language/module-code/early-dup-export-id-as.js
+++ b/test/language/module-code/early-dup-export-id-as.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x, y;
 export { x as z };
diff --git a/test/language/module-code/early-dup-export-id.js b/test/language/module-code/early-dup-export-id.js
index e11009a2ef..850970086f 100644
--- a/test/language/module-code/early-dup-export-id.js
+++ b/test/language/module-code/early-dup-export-id.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x;
 export { x };
diff --git a/test/language/module-code/early-dup-export-star-as-dflt.js b/test/language/module-code/early-dup-export-star-as-dflt.js
index 2fe0ceda58..972fb8d27c 100644
--- a/test/language/module-code/early-dup-export-star-as-dflt.js
+++ b/test/language/module-code/early-dup-export-star-as-dflt.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x;
 export default x;
diff --git a/test/language/module-code/early-dup-lables.js b/test/language/module-code/early-dup-lables.js
index e5e2575d21..b90fae3cfd 100644
--- a/test/language/module-code/early-dup-lables.js
+++ b/test/language/module-code/early-dup-lables.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 label: {
   label: 0;
diff --git a/test/language/module-code/early-dup-lex.js b/test/language/module-code/early-dup-lex.js
index 20174b5aba..89edc03e4c 100644
--- a/test/language/module-code/early-dup-lex.js
+++ b/test/language/module-code/early-dup-lex.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let x;
 const x;
diff --git a/test/language/module-code/early-export-global.js b/test/language/module-code/early-export-global.js
index d8cf880e52..95cc27a984 100644
--- a/test/language/module-code/early-export-global.js
+++ b/test/language/module-code/early-export-global.js
@@ -14,6 +14,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export { Number };
diff --git a/test/language/module-code/early-export-unresolvable.js b/test/language/module-code/early-export-unresolvable.js
index 40d88db5d2..c829390b4b 100644
--- a/test/language/module-code/early-export-unresolvable.js
+++ b/test/language/module-code/early-export-unresolvable.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export { unresolvable };
diff --git a/test/language/module-code/early-import-arguments.js b/test/language/module-code/early-import-arguments.js
index d17da4e774..f15c0630b9 100644
--- a/test/language/module-code/early-import-arguments.js
+++ b/test/language/module-code/early-import-arguments.js
@@ -24,7 +24,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // Create an appropriately-named ExportEntry in order to avoid false positives
 // (e.g. cases where the implementation does not generate the expected early
diff --git a/test/language/module-code/early-import-as-arguments.js b/test/language/module-code/early-import-as-arguments.js
index 2672eaaa7c..92af57ea9a 100644
--- a/test/language/module-code/early-import-as-arguments.js
+++ b/test/language/module-code/early-import-as-arguments.js
@@ -24,7 +24,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // Create an appropriately-named ExportEntry in order to avoid false positives
 // (e.g. cases where the implementation does not generate the expected early
diff --git a/test/language/module-code/early-import-as-eval.js b/test/language/module-code/early-import-as-eval.js
index d52570f9a0..20e5c788a3 100644
--- a/test/language/module-code/early-import-as-eval.js
+++ b/test/language/module-code/early-import-as-eval.js
@@ -24,7 +24,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // Create an appropriately-named ExportEntry in order to avoid false positives
 // (e.g. cases where the implementation does not generate the expected early
diff --git a/test/language/module-code/early-import-eval.js b/test/language/module-code/early-import-eval.js
index 80b74e77db..b4492960b0 100644
--- a/test/language/module-code/early-import-eval.js
+++ b/test/language/module-code/early-import-eval.js
@@ -24,7 +24,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // Create an appropriately-named ExportEntry in order to avoid false positives
 // (e.g. cases where the implementation does not generate the expected early
diff --git a/test/language/module-code/early-lex-and-var.js b/test/language/module-code/early-lex-and-var.js
index d311d1f87e..6ebb6a8b78 100644
--- a/test/language/module-code/early-lex-and-var.js
+++ b/test/language/module-code/early-lex-and-var.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let x;
 var x;
diff --git a/test/language/module-code/early-new-target.js b/test/language/module-code/early-new-target.js
index 32dc345281..f0a6cf57b2 100644
--- a/test/language/module-code/early-new-target.js
+++ b/test/language/module-code/early-new-target.js
@@ -11,6 +11,6 @@ negative:
 features: [new.target]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 new.target;
diff --git a/test/language/module-code/early-strict-mode.js b/test/language/module-code/early-strict-mode.js
index 73e875709b..3d38d08f05 100644
--- a/test/language/module-code/early-strict-mode.js
+++ b/test/language/module-code/early-strict-mode.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var public;
diff --git a/test/language/module-code/early-super.js b/test/language/module-code/early-super.js
index 51209eb24f..6406370dbb 100644
--- a/test/language/module-code/early-super.js
+++ b/test/language/module-code/early-super.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 super;
diff --git a/test/language/module-code/early-undef-break.js b/test/language/module-code/early-undef-break.js
index 7df3b9147a..58d2df015a 100644
--- a/test/language/module-code/early-undef-break.js
+++ b/test/language/module-code/early-undef-break.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) {
   break undef;
diff --git a/test/language/module-code/early-undef-continue.js b/test/language/module-code/early-undef-continue.js
index b4bef515d8..8a5668a208 100644
--- a/test/language/module-code/early-undef-continue.js
+++ b/test/language/module-code/early-undef-continue.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) {
   continue undef;
diff --git a/test/language/module-code/instn-resolve-empty-export.js b/test/language/module-code/instn-resolve-empty-export.js
index 4d29ee6273..6737bcee5c 100644
--- a/test/language/module-code/instn-resolve-empty-export.js
+++ b/test/language/module-code/instn-resolve-empty-export.js
@@ -35,6 +35,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export {} from './instn-resolve-empty-export_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-empty-import.js b/test/language/module-code/instn-resolve-empty-import.js
index b025ce1e28..c95732e440 100644
--- a/test/language/module-code/instn-resolve-empty-import.js
+++ b/test/language/module-code/instn-resolve-empty-import.js
@@ -41,6 +41,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import {} from './instn-resolve-empty-import_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-err-reference.js b/test/language/module-code/instn-resolve-err-reference.js
index a9fe79dc09..2efd519690 100644
--- a/test/language/module-code/instn-resolve-err-reference.js
+++ b/test/language/module-code/instn-resolve-err-reference.js
@@ -16,6 +16,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import './instn-resolve-err-reference_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-err-syntax.js b/test/language/module-code/instn-resolve-err-syntax.js
index 816ffe9bd8..7c8183ed49 100644
--- a/test/language/module-code/instn-resolve-err-syntax.js
+++ b/test/language/module-code/instn-resolve-err-syntax.js
@@ -16,6 +16,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import './instn-resolve-err-syntax_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-order-depth.js b/test/language/module-code/instn-resolve-order-depth.js
index 0015422d92..275616f4cc 100644
--- a/test/language/module-code/instn-resolve-order-depth.js
+++ b/test/language/module-code/instn-resolve-order-depth.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import './instn-resolve-order-depth-child_FIXTURE.js';
 import './instn-resolve-order-depth-syntax_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-order-src.js b/test/language/module-code/instn-resolve-order-src.js
index 755914a8bf..0880d85de5 100644
--- a/test/language/module-code/instn-resolve-order-src.js
+++ b/test/language/module-code/instn-resolve-order-src.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import './instn-resolve-order-src-valid_FIXTURE.js';
 import './instn-resolve-order-src-reference_FIXTURE.js';
diff --git a/test/language/module-code/parse-err-decl-pos-export-arrow-function.js b/test/language/module-code/parse-err-decl-pos-export-arrow-function.js
index 35278adc2a..bcb5677e5b 100644
--- a/test/language/module-code/parse-err-decl-pos-export-arrow-function.js
+++ b/test/language/module-code/parse-err-decl-pos-export-arrow-function.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 () => { export default null; };
diff --git a/test/language/module-code/parse-err-decl-pos-export-block-stmt-list.js b/test/language/module-code/parse-err-decl-pos-export-block-stmt-list.js
index dcb868ab96..17d1afbb60 100644
--- a/test/language/module-code/parse-err-decl-pos-export-block-stmt-list.js
+++ b/test/language/module-code/parse-err-decl-pos-export-block-stmt-list.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { void 0; export default null; }
diff --git a/test/language/module-code/parse-err-decl-pos-export-block-stmt.js b/test/language/module-code/parse-err-decl-pos-export-block-stmt.js
index a5f650c7e4..e3b612195d 100644
--- a/test/language/module-code/parse-err-decl-pos-export-block-stmt.js
+++ b/test/language/module-code/parse-err-decl-pos-export-block-stmt.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { export default null; }
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-decl-meth-static.js b/test/language/module-code/parse-err-decl-pos-export-class-decl-meth-static.js
index 38cf46ba31..0a0633fa6d 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-decl-meth-static.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-decl-meth-static.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { static method() { export default null; } }
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-decl-meth.js b/test/language/module-code/parse-err-decl-pos-export-class-decl-meth.js
index de6c62ece1..0f47592e89 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-decl-meth.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-decl-meth.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { method() { export default null; } }
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen-static.js b/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen-static.js
index 095948797b..65d54ced1b 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen-static.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen-static.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { static *method() { export default null; } }
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen.js b/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen.js
index 6c24a4ef04..f155884269 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *method() { export default null; } }
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen-static.js b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen-static.js
index 6f5acb1b4d..6d0e3c86d6 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen-static.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen-static.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (class { static *method() { export default null; } });
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen.js b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen.js
index 0a84c20378..c2cb048aeb 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (class { *method() { export default null; } });
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-static.js b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-static.js
index c82723c4a4..624509ff19 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-static.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-static.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (class { static method() { export default null; } });
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth.js b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth.js
index a1d9a0e0a7..9add1e9ec2 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (class { method() { export default null; } });
diff --git a/test/language/module-code/parse-err-decl-pos-export-do-while.js b/test/language/module-code/parse-err-decl-pos-export-do-while.js
index 61b33bf741..7d531b8bd4 100644
--- a/test/language/module-code/parse-err-decl-pos-export-do-while.js
+++ b/test/language/module-code/parse-err-decl-pos-export-do-while.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do export default null; while (false)
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-const.js b/test/language/module-code/parse-err-decl-pos-export-for-const.js
index d15154ec7c..c49fda2055 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-const.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-const.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const x = 0; false;)
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-in-const.js b/test/language/module-code/parse-err-decl-pos-export-for-in-const.js
index 2299a67675..8894222fc5 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-in-const.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-in-const.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const y in [])
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-in-let.js b/test/language/module-code/parse-err-decl-pos-export-for-in-let.js
index ed9c548e6c..c8b226bf80 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-in-let.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-in-let.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let y in [])
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-in-lhs.js b/test/language/module-code/parse-err-decl-pos-export-for-in-lhs.js
index 78fb3f2701..9745016ce7 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-in-lhs.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-in-lhs.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (y in [])
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-in-var.js b/test/language/module-code/parse-err-decl-pos-export-for-in-var.js
index 70b49603d6..a9c4fbd184 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-in-var.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-in-var.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var y in [])
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-let.js b/test/language/module-code/parse-err-decl-pos-export-for-let.js
index eb99f40f0f..2917f1eb80 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-let.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-let.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x = 0; false;)
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-lhs.js b/test/language/module-code/parse-err-decl-pos-export-for-lhs.js
index 7d72cd3c4e..674aad0747 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-lhs.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-lhs.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (x = 0; false;)
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-of-const.js b/test/language/module-code/parse-err-decl-pos-export-for-of-const.js
index 1e2052ebbd..97d944c140 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-of-const.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-of-const.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const y of [])
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-of-let.js b/test/language/module-code/parse-err-decl-pos-export-for-of-let.js
index 08878e7050..454896db2a 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-of-let.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-of-let.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let y of [])
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-of-lhs.js b/test/language/module-code/parse-err-decl-pos-export-for-of-lhs.js
index f8d970fdf9..39bb2ea26c 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-of-lhs.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-of-lhs.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (y of [])
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-of-var.js b/test/language/module-code/parse-err-decl-pos-export-for-of-var.js
index ff309697dc..e4a8159567 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-of-var.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-of-var.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var y of [])
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-for-var.js b/test/language/module-code/parse-err-decl-pos-export-for-var.js
index 9972370df3..b2ba4cdb33 100644
--- a/test/language/module-code/parse-err-decl-pos-export-for-var.js
+++ b/test/language/module-code/parse-err-decl-pos-export-for-var.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x = 0; false;)
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-function-decl.js b/test/language/module-code/parse-err-decl-pos-export-function-decl.js
index aadf99678e..6b567d4288 100644
--- a/test/language/module-code/parse-err-decl-pos-export-function-decl.js
+++ b/test/language/module-code/parse-err-decl-pos-export-function-decl.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() { export default null; }
diff --git a/test/language/module-code/parse-err-decl-pos-export-function-expr.js b/test/language/module-code/parse-err-decl-pos-export-function-expr.js
index 5f5ef9f7d7..0aaac80c03 100644
--- a/test/language/module-code/parse-err-decl-pos-export-function-expr.js
+++ b/test/language/module-code/parse-err-decl-pos-export-function-expr.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function() { export default null; });
diff --git a/test/language/module-code/parse-err-decl-pos-export-generator-decl.js b/test/language/module-code/parse-err-decl-pos-export-generator-decl.js
index 41f5bb871e..0c6d65a178 100644
--- a/test/language/module-code/parse-err-decl-pos-export-generator-decl.js
+++ b/test/language/module-code/parse-err-decl-pos-export-generator-decl.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() { export default null; }
diff --git a/test/language/module-code/parse-err-decl-pos-export-generator-expr.js b/test/language/module-code/parse-err-decl-pos-export-generator-expr.js
index 96e27cac05..6f856749f4 100644
--- a/test/language/module-code/parse-err-decl-pos-export-generator-expr.js
+++ b/test/language/module-code/parse-err-decl-pos-export-generator-expr.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function*() { export default null; });
diff --git a/test/language/module-code/parse-err-decl-pos-export-if-else.js b/test/language/module-code/parse-err-decl-pos-export-if-else.js
index a52c06c065..32f4d2573b 100644
--- a/test/language/module-code/parse-err-decl-pos-export-if-else.js
+++ b/test/language/module-code/parse-err-decl-pos-export-if-else.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) { } else export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-if-if.js b/test/language/module-code/parse-err-decl-pos-export-if-if.js
index ffe586505b..cd75ce9fe7 100644
--- a/test/language/module-code/parse-err-decl-pos-export-if-if.js
+++ b/test/language/module-code/parse-err-decl-pos-export-if-if.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-labeled.js b/test/language/module-code/parse-err-decl-pos-export-labeled.js
index 4bce4876a5..71173d0dc5 100644
--- a/test/language/module-code/parse-err-decl-pos-export-labeled.js
+++ b/test/language/module-code/parse-err-decl-pos-export-labeled.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 test262: export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-object-gen-method.js b/test/language/module-code/parse-err-decl-pos-export-object-gen-method.js
index b2e895dbc1..83c5feddef 100644
--- a/test/language/module-code/parse-err-decl-pos-export-object-gen-method.js
+++ b/test/language/module-code/parse-err-decl-pos-export-object-gen-method.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ *m() { export default null; } });
diff --git a/test/language/module-code/parse-err-decl-pos-export-object-getter.js b/test/language/module-code/parse-err-decl-pos-export-object-getter.js
index 39c60e364a..d1c1fef5a2 100644
--- a/test/language/module-code/parse-err-decl-pos-export-object-getter.js
+++ b/test/language/module-code/parse-err-decl-pos-export-object-getter.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ get m() { export default null; } });
diff --git a/test/language/module-code/parse-err-decl-pos-export-object-method.js b/test/language/module-code/parse-err-decl-pos-export-object-method.js
index 44a6058743..be4bd7618a 100644
--- a/test/language/module-code/parse-err-decl-pos-export-object-method.js
+++ b/test/language/module-code/parse-err-decl-pos-export-object-method.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ m() { export default null; } });
diff --git a/test/language/module-code/parse-err-decl-pos-export-object-setter.js b/test/language/module-code/parse-err-decl-pos-export-object-setter.js
index 6631ac8fad..aca30075bc 100644
--- a/test/language/module-code/parse-err-decl-pos-export-object-setter.js
+++ b/test/language/module-code/parse-err-decl-pos-export-object-setter.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ set m(x) { export default null; } });
diff --git a/test/language/module-code/parse-err-decl-pos-export-switch-case-dflt.js b/test/language/module-code/parse-err-decl-pos-export-switch-case-dflt.js
index 42c05faff4..e51f9aad7f 100644
--- a/test/language/module-code/parse-err-decl-pos-export-switch-case-dflt.js
+++ b/test/language/module-code/parse-err-decl-pos-export-switch-case-dflt.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch(0) { case 1: export default null; default: }
diff --git a/test/language/module-code/parse-err-decl-pos-export-switch-case.js b/test/language/module-code/parse-err-decl-pos-export-switch-case.js
index 0397a35aa7..a33145a5e8 100644
--- a/test/language/module-code/parse-err-decl-pos-export-switch-case.js
+++ b/test/language/module-code/parse-err-decl-pos-export-switch-case.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch(0) { case 1: export default null; }
diff --git a/test/language/module-code/parse-err-decl-pos-export-switch-dftl.js b/test/language/module-code/parse-err-decl-pos-export-switch-dftl.js
index b5346327e5..391aa2e9e6 100644
--- a/test/language/module-code/parse-err-decl-pos-export-switch-dftl.js
+++ b/test/language/module-code/parse-err-decl-pos-export-switch-dftl.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch(0) { default: export default null; }
diff --git a/test/language/module-code/parse-err-decl-pos-export-try-catch-finally.js b/test/language/module-code/parse-err-decl-pos-export-try-catch-finally.js
index 053cee3a4d..7da10ffa40 100644
--- a/test/language/module-code/parse-err-decl-pos-export-try-catch-finally.js
+++ b/test/language/module-code/parse-err-decl-pos-export-try-catch-finally.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch (err) { } finally {
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-try-catch.js b/test/language/module-code/parse-err-decl-pos-export-try-catch.js
index 92f050b866..5cfc495c8f 100644
--- a/test/language/module-code/parse-err-decl-pos-export-try-catch.js
+++ b/test/language/module-code/parse-err-decl-pos-export-try-catch.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch (err) {
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-try-finally.js b/test/language/module-code/parse-err-decl-pos-export-try-finally.js
index 4e0f6ac3fc..de9bbd88a8 100644
--- a/test/language/module-code/parse-err-decl-pos-export-try-finally.js
+++ b/test/language/module-code/parse-err-decl-pos-export-try-finally.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } finally {
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-try-try.js b/test/language/module-code/parse-err-decl-pos-export-try-try.js
index 04330bbf14..224811b4a8 100644
--- a/test/language/module-code/parse-err-decl-pos-export-try-try.js
+++ b/test/language/module-code/parse-err-decl-pos-export-try-try.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try {
   export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-export-while.js b/test/language/module-code/parse-err-decl-pos-export-while.js
index d4ed2bee81..f29f00fa80 100644
--- a/test/language/module-code/parse-err-decl-pos-export-while.js
+++ b/test/language/module-code/parse-err-decl-pos-export-while.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) export default null;
diff --git a/test/language/module-code/parse-err-decl-pos-import-arrow-function.js b/test/language/module-code/parse-err-decl-pos-import-arrow-function.js
index 99af5ede01..a7a4a52a37 100644
--- a/test/language/module-code/parse-err-decl-pos-import-arrow-function.js
+++ b/test/language/module-code/parse-err-decl-pos-import-arrow-function.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 () => { import v from './decl-pos-import-arrow-function.js'; };
diff --git a/test/language/module-code/parse-err-decl-pos-import-block-stmt-list.js b/test/language/module-code/parse-err-decl-pos-import-block-stmt-list.js
index 557dd8315c..80662daa70 100644
--- a/test/language/module-code/parse-err-decl-pos-import-block-stmt-list.js
+++ b/test/language/module-code/parse-err-decl-pos-import-block-stmt-list.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { void 0; import v from './decl-pos-import-block-stmt-list.js'; }
diff --git a/test/language/module-code/parse-err-decl-pos-import-block-stmt.js b/test/language/module-code/parse-err-decl-pos-import-block-stmt.js
index 78e15efaf6..9f485c4080 100644
--- a/test/language/module-code/parse-err-decl-pos-import-block-stmt.js
+++ b/test/language/module-code/parse-err-decl-pos-import-block-stmt.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 { import v from './decl-pos-import-block-stmt.js'; }
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-decl-meth-static.js b/test/language/module-code/parse-err-decl-pos-import-class-decl-meth-static.js
index ccc1cf9070..83d6345cb2 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-decl-meth-static.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-decl-meth-static.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { static method() { import v from './decl-pos-import-class-decl-meth-static.js'; } }
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-decl-meth.js b/test/language/module-code/parse-err-decl-pos-import-class-decl-meth.js
index c7e8b144f1..a5adea9b97 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-decl-meth.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-decl-meth.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { method() { import v from './decl-pos-import-class-decl-meth.js'; } }
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen-static.js b/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen-static.js
index ba9d91f4f2..1c22f3504f 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen-static.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen-static.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { static *method() { import v from './decl-pos-import-class-decl-method-gen-static.js'; } }
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen.js b/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen.js
index 13ea5f5dd0..709a458b17 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *method() { import v from './decl-pos-import-class-decl-method-gen.js'; } }
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen-static.js b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen-static.js
index 995bbb4295..5a6fbc9e3e 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen-static.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen-static.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (class { static *method() { import v from './decl-pos-import-class-expr-meth-gen-static.js'; } });
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen.js b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen.js
index c464189aba..c121835b84 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (class { *method() { import v from './decl-pos-import-class-expr-meth-gen.js'; } });
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-static.js b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-static.js
index 02b90222ed..ff2a060918 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-static.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-static.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (class { static method() { import v from './decl-pos-import-class-expr-meth-static.js'; } });
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth.js b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth.js
index f0be78b82d..d34d216087 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (class { method() { import v from './decl-pos-import-class-expr-meth.js'; } });
diff --git a/test/language/module-code/parse-err-decl-pos-import-do-while.js b/test/language/module-code/parse-err-decl-pos-import-do-while.js
index 9960942531..f8185d45df 100644
--- a/test/language/module-code/parse-err-decl-pos-import-do-while.js
+++ b/test/language/module-code/parse-err-decl-pos-import-do-while.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do import v from './decl-pos-import-do-while.js'; while (false)
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-const.js b/test/language/module-code/parse-err-decl-pos-import-for-const.js
index 9d3a8a5d19..e1d4dad606 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-const.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-const.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const x = 0; false;)
   import v from './decl-pos-import-for-const.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-in-const.js b/test/language/module-code/parse-err-decl-pos-import-for-in-const.js
index b4a0c2c4c2..f95c27d124 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-in-const.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-in-const.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const y in [])
   import v from './decl-pos-import-for-in-const.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-in-let.js b/test/language/module-code/parse-err-decl-pos-import-for-in-let.js
index ff6a09416b..a3cde459cf 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-in-let.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-in-let.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let y in [])
   import v from './decl-pos-import-for-in-let.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-in-lhs.js b/test/language/module-code/parse-err-decl-pos-import-for-in-lhs.js
index b7ef6bc2ba..45a6528fd6 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-in-lhs.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-in-lhs.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (y in [])
   import v from './decl-pos-import-for-in-lhs.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-in-var.js b/test/language/module-code/parse-err-decl-pos-import-for-in-var.js
index 6217cd4caa..3edd9481bb 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-in-var.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-in-var.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var y in [])
   import v from './decl-pos-import-for-in-var.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-let.js b/test/language/module-code/parse-err-decl-pos-import-for-let.js
index 939b4ae29d..b9db14e497 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-let.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-let.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x = 0; false;)
   import v from './decl-pos-import-for-let.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-lhs.js b/test/language/module-code/parse-err-decl-pos-import-for-lhs.js
index d751b8f024..c5096b9956 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-lhs.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-lhs.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (x = 0; false;)
   import v from './decl-pos-import-for-lhs.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-of-const.js b/test/language/module-code/parse-err-decl-pos-import-for-of-const.js
index 65cde252c2..489d37d055 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-of-const.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-of-const.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const y of [])
   import v from './decl-pos-import-for-of-const.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-of-let.js b/test/language/module-code/parse-err-decl-pos-import-for-of-let.js
index 9d227d2e1a..c62d334755 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-of-let.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-of-let.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let y of [])
   import v from './decl-pos-import-for-of-let.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-of-lhs.js b/test/language/module-code/parse-err-decl-pos-import-for-of-lhs.js
index 9c3d35ede0..8f69e2e4e5 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-of-lhs.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-of-lhs.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (y of [])
   import v from './decl-pos-import-for-of-lhs.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-of-var.js b/test/language/module-code/parse-err-decl-pos-import-for-of-var.js
index 8871cd02ea..6d14e31374 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-of-var.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-of-var.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var y of [])
   import v from './decl-pos-import-for-of-var.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-for-var.js b/test/language/module-code/parse-err-decl-pos-import-for-var.js
index 49d0457a21..b0511ee749 100644
--- a/test/language/module-code/parse-err-decl-pos-import-for-var.js
+++ b/test/language/module-code/parse-err-decl-pos-import-for-var.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x = 0; false;)
   import v from './decl-pos-import-for-var.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-function-decl.js b/test/language/module-code/parse-err-decl-pos-import-function-decl.js
index d3ab5c23ab..3dc38b55c2 100644
--- a/test/language/module-code/parse-err-decl-pos-import-function-decl.js
+++ b/test/language/module-code/parse-err-decl-pos-import-function-decl.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() { import v from './decl-pos-import-function-decl.js'; }
diff --git a/test/language/module-code/parse-err-decl-pos-import-function-expr.js b/test/language/module-code/parse-err-decl-pos-import-function-expr.js
index f2a94911e4..629dfb82ea 100644
--- a/test/language/module-code/parse-err-decl-pos-import-function-expr.js
+++ b/test/language/module-code/parse-err-decl-pos-import-function-expr.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function() { import v from './decl-pos-import-function-expr.js'; });
diff --git a/test/language/module-code/parse-err-decl-pos-import-generator-decl.js b/test/language/module-code/parse-err-decl-pos-import-generator-decl.js
index 5235e7f0e6..2bb8fac27f 100644
--- a/test/language/module-code/parse-err-decl-pos-import-generator-decl.js
+++ b/test/language/module-code/parse-err-decl-pos-import-generator-decl.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() { import v from './decl-pos-import-generator-decl.js'; }
diff --git a/test/language/module-code/parse-err-decl-pos-import-generator-expr.js b/test/language/module-code/parse-err-decl-pos-import-generator-expr.js
index 5bcd02343a..bffb72b57c 100644
--- a/test/language/module-code/parse-err-decl-pos-import-generator-expr.js
+++ b/test/language/module-code/parse-err-decl-pos-import-generator-expr.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function*() { import v from './decl-pos-import-generator-expr.js'; });
diff --git a/test/language/module-code/parse-err-decl-pos-import-if-else.js b/test/language/module-code/parse-err-decl-pos-import-if-else.js
index 6fb44ecbaa..c9adde7a02 100644
--- a/test/language/module-code/parse-err-decl-pos-import-if-else.js
+++ b/test/language/module-code/parse-err-decl-pos-import-if-else.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) { } else import v from './decl-pos-import-if-else.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-if-if.js b/test/language/module-code/parse-err-decl-pos-import-if-if.js
index 0d79d778ad..93cd48a226 100644
--- a/test/language/module-code/parse-err-decl-pos-import-if-if.js
+++ b/test/language/module-code/parse-err-decl-pos-import-if-if.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) import v from './decl-pos-import-if-if.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-labeled.js b/test/language/module-code/parse-err-decl-pos-import-labeled.js
index 6a66406878..0821770006 100644
--- a/test/language/module-code/parse-err-decl-pos-import-labeled.js
+++ b/test/language/module-code/parse-err-decl-pos-import-labeled.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 test262: import v from './decl-pos-import-labeled.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-object-gen-method.js b/test/language/module-code/parse-err-decl-pos-import-object-gen-method.js
index 86a2a862fb..59c1377a4c 100644
--- a/test/language/module-code/parse-err-decl-pos-import-object-gen-method.js
+++ b/test/language/module-code/parse-err-decl-pos-import-object-gen-method.js
@@ -10,6 +10,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ *m() { import v from './decl-pos-import-object-gen-method.js'; } });
diff --git a/test/language/module-code/parse-err-decl-pos-import-object-getter.js b/test/language/module-code/parse-err-decl-pos-import-object-getter.js
index 7e5f1b1c4c..7a8bfe3464 100644
--- a/test/language/module-code/parse-err-decl-pos-import-object-getter.js
+++ b/test/language/module-code/parse-err-decl-pos-import-object-getter.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ get m() { import v from './decl-pos-import-object-getter.js'; } });
diff --git a/test/language/module-code/parse-err-decl-pos-import-object-method.js b/test/language/module-code/parse-err-decl-pos-import-object-method.js
index 8ab05f5513..ca3d40847b 100644
--- a/test/language/module-code/parse-err-decl-pos-import-object-method.js
+++ b/test/language/module-code/parse-err-decl-pos-import-object-method.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ m() { import v from './decl-pos-import-object-method.js'; } });
diff --git a/test/language/module-code/parse-err-decl-pos-import-object-setter.js b/test/language/module-code/parse-err-decl-pos-import-object-setter.js
index c4b51545bd..b4f3508b6a 100644
--- a/test/language/module-code/parse-err-decl-pos-import-object-setter.js
+++ b/test/language/module-code/parse-err-decl-pos-import-object-setter.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ({ set m(x) { import v from './decl-pos-import-object-setter.js'; } });
diff --git a/test/language/module-code/parse-err-decl-pos-import-switch-case-dflt.js b/test/language/module-code/parse-err-decl-pos-import-switch-case-dflt.js
index 10591842e4..fc13783783 100644
--- a/test/language/module-code/parse-err-decl-pos-import-switch-case-dflt.js
+++ b/test/language/module-code/parse-err-decl-pos-import-switch-case-dflt.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch(0) { case 1: import v from './decl-pos-import-switch-case-dflt.js'; default: }
diff --git a/test/language/module-code/parse-err-decl-pos-import-switch-case.js b/test/language/module-code/parse-err-decl-pos-import-switch-case.js
index b2473d8e2d..260bf9df09 100644
--- a/test/language/module-code/parse-err-decl-pos-import-switch-case.js
+++ b/test/language/module-code/parse-err-decl-pos-import-switch-case.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch(0) { case 1: import v from './decl-pos-import-switch-case.js'; }
diff --git a/test/language/module-code/parse-err-decl-pos-import-switch-dftl.js b/test/language/module-code/parse-err-decl-pos-import-switch-dftl.js
index 24c9dbd06c..a09d5ba213 100644
--- a/test/language/module-code/parse-err-decl-pos-import-switch-dftl.js
+++ b/test/language/module-code/parse-err-decl-pos-import-switch-dftl.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch(0) { default: import v from './decl-pos-import-switch-dftl.js'; }
diff --git a/test/language/module-code/parse-err-decl-pos-import-try-catch-finally.js b/test/language/module-code/parse-err-decl-pos-import-try-catch-finally.js
index 45fed1f9e4..24d48e087b 100644
--- a/test/language/module-code/parse-err-decl-pos-import-try-catch-finally.js
+++ b/test/language/module-code/parse-err-decl-pos-import-try-catch-finally.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch (err) { } finally {
   import v from './decl-pos-import-try-catch-finally.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-try-catch.js b/test/language/module-code/parse-err-decl-pos-import-try-catch.js
index 1b0e69d678..0c0e68a536 100644
--- a/test/language/module-code/parse-err-decl-pos-import-try-catch.js
+++ b/test/language/module-code/parse-err-decl-pos-import-try-catch.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch (err) {
   import v from './decl-pos-import-try-catch.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-try-finally.js b/test/language/module-code/parse-err-decl-pos-import-try-finally.js
index 339ee8ea58..86344ef090 100644
--- a/test/language/module-code/parse-err-decl-pos-import-try-finally.js
+++ b/test/language/module-code/parse-err-decl-pos-import-try-finally.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } finally {
   import v from './decl-pos-import-try-finally.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-try-try.js b/test/language/module-code/parse-err-decl-pos-import-try-try.js
index 5b629ea167..96003fc2c0 100644
--- a/test/language/module-code/parse-err-decl-pos-import-try-try.js
+++ b/test/language/module-code/parse-err-decl-pos-import-try-try.js
@@ -9,7 +9,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try {
   import v from './decl-pos-import-try-try.js';
diff --git a/test/language/module-code/parse-err-decl-pos-import-while.js b/test/language/module-code/parse-err-decl-pos-import-while.js
index 39084d617b..f5c35298d6 100644
--- a/test/language/module-code/parse-err-decl-pos-import-while.js
+++ b/test/language/module-code/parse-err-decl-pos-import-while.js
@@ -9,6 +9,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) import v from './decl-pos-import-while.js';
diff --git a/test/language/module-code/parse-err-export-dflt-const.js b/test/language/module-code/parse-err-export-dflt-const.js
index e46d3e432f..d2c5ccaede 100644
--- a/test/language/module-code/parse-err-export-dflt-const.js
+++ b/test/language/module-code/parse-err-export-dflt-const.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default const x = null;
diff --git a/test/language/module-code/parse-err-export-dflt-expr.js b/test/language/module-code/parse-err-export-dflt-expr.js
index d952f3c3f6..14bac036b3 100644
--- a/test/language/module-code/parse-err-export-dflt-expr.js
+++ b/test/language/module-code/parse-err-export-dflt-expr.js
@@ -21,6 +21,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default null, null;
diff --git a/test/language/module-code/parse-err-export-dflt-let.js b/test/language/module-code/parse-err-export-dflt-let.js
index a7261aae00..69ec198112 100644
--- a/test/language/module-code/parse-err-export-dflt-let.js
+++ b/test/language/module-code/parse-err-export-dflt-let.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default let x;
diff --git a/test/language/module-code/parse-err-export-dflt-var.js b/test/language/module-code/parse-err-export-dflt-var.js
index 57ee63aab1..a642c9cc71 100644
--- a/test/language/module-code/parse-err-export-dflt-var.js
+++ b/test/language/module-code/parse-err-export-dflt-var.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default var x;
diff --git a/test/language/module-code/parse-err-hoist-lex-fun.js b/test/language/module-code/parse-err-hoist-lex-fun.js
index 68d92e2510..0c5bc22501 100644
--- a/test/language/module-code/parse-err-hoist-lex-fun.js
+++ b/test/language/module-code/parse-err-hoist-lex-fun.js
@@ -19,7 +19,7 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var f;
 function f() {}
diff --git a/test/language/module-code/parse-err-hoist-lex-gen.js b/test/language/module-code/parse-err-hoist-lex-gen.js
index 4b5158e029..50440f8bcd 100644
--- a/test/language/module-code/parse-err-hoist-lex-gen.js
+++ b/test/language/module-code/parse-err-hoist-lex-gen.js
@@ -21,7 +21,7 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var g;
 function* g() {}
diff --git a/test/language/module-code/parse-err-invoke-anon-fun-decl.js b/test/language/module-code/parse-err-invoke-anon-fun-decl.js
index 06cd1ce0b5..6ea62527eb 100644
--- a/test/language/module-code/parse-err-invoke-anon-fun-decl.js
+++ b/test/language/module-code/parse-err-invoke-anon-fun-decl.js
@@ -21,6 +21,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default function() {}();
diff --git a/test/language/module-code/parse-err-invoke-anon-gen-decl.js b/test/language/module-code/parse-err-invoke-anon-gen-decl.js
index ba4303576f..aa61b9b701 100644
--- a/test/language/module-code/parse-err-invoke-anon-gen-decl.js
+++ b/test/language/module-code/parse-err-invoke-anon-gen-decl.js
@@ -23,6 +23,6 @@ flags: [module]
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default function* () {}();
diff --git a/test/language/module-code/parse-err-reference.js b/test/language/module-code/parse-err-reference.js
index 32f1ad4144..9a96e685ad 100644
--- a/test/language/module-code/parse-err-reference.js
+++ b/test/language/module-code/parse-err-reference.js
@@ -17,6 +17,6 @@ info: |
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1++;
diff --git a/test/language/module-code/parse-err-return.js b/test/language/module-code/parse-err-return.js
index 84be4c4538..f05ec37e4d 100644
--- a/test/language/module-code/parse-err-return.js
+++ b/test/language/module-code/parse-err-return.js
@@ -27,6 +27,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 return;
diff --git a/test/language/module-code/parse-err-semi-dflt-expr.js b/test/language/module-code/parse-err-semi-dflt-expr.js
index 52807357aa..89f92c2df9 100644
--- a/test/language/module-code/parse-err-semi-dflt-expr.js
+++ b/test/language/module-code/parse-err-semi-dflt-expr.js
@@ -22,6 +22,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export default null null;
diff --git a/test/language/module-code/parse-err-semi-export-star.js b/test/language/module-code/parse-err-semi-export-star.js
index 5fe050f20a..7cb6bbd532 100644
--- a/test/language/module-code/parse-err-semi-export-star.js
+++ b/test/language/module-code/parse-err-semi-export-star.js
@@ -22,6 +22,6 @@ flags: [module]
 features: [export-star-as-namespace-from-module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export * from './parse-err-semi-export-star.js' null;
diff --git a/test/language/module-code/parse-err-semi-name-space-export.js b/test/language/module-code/parse-err-semi-name-space-export.js
index 5261e2f1bc..5e6cc51b15 100644
--- a/test/language/module-code/parse-err-semi-name-space-export.js
+++ b/test/language/module-code/parse-err-semi-name-space-export.js
@@ -23,6 +23,6 @@ flags: [module]
 features: [export-star-as-namespace-from-module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export * as namespace from './parse-err-semi-name-space-export.js' null;
diff --git a/test/language/module-code/parse-err-semi-named-export-from.js b/test/language/module-code/parse-err-semi-named-export-from.js
index c95acc6651..a085832d72 100644
--- a/test/language/module-code/parse-err-semi-named-export-from.js
+++ b/test/language/module-code/parse-err-semi-named-export-from.js
@@ -22,6 +22,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export {} from './parse-err-semi-export-clause-from.js' null;
diff --git a/test/language/module-code/parse-err-semi-named-export.js b/test/language/module-code/parse-err-semi-named-export.js
index 8f60433fd9..c8fd62dfaa 100644
--- a/test/language/module-code/parse-err-semi-named-export.js
+++ b/test/language/module-code/parse-err-semi-named-export.js
@@ -22,6 +22,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 export {} null;
diff --git a/test/language/module-code/parse-err-syntax.js b/test/language/module-code/parse-err-syntax.js
index 7043d35cfe..96b79a2553 100644
--- a/test/language/module-code/parse-err-syntax.js
+++ b/test/language/module-code/parse-err-syntax.js
@@ -17,6 +17,6 @@ info: |
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 ?
diff --git a/test/language/module-code/parse-err-yield.js b/test/language/module-code/parse-err-yield.js
index fce8877a57..2d0942dea8 100644
--- a/test/language/module-code/parse-err-yield.js
+++ b/test/language/module-code/parse-err-yield.js
@@ -27,6 +27,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 yield;
diff --git a/test/language/module-code/privatename-not-valid-earlyerr-module-1.js b/test/language/module-code/privatename-not-valid-earlyerr-module-1.js
index d117e581d9..ef282ca1a6 100644
--- a/test/language/module-code/privatename-not-valid-earlyerr-module-1.js
+++ b/test/language/module-code/privatename-not-valid-earlyerr-module-1.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   constructor() {
diff --git a/test/language/module-code/privatename-not-valid-earlyerr-module-2.js b/test/language/module-code/privatename-not-valid-earlyerr-module-2.js
index 34f8218e28..72b2563842 100644
--- a/test/language/module-code/privatename-not-valid-earlyerr-module-2.js
+++ b/test/language/module-code/privatename-not-valid-earlyerr-module-2.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   f() {
diff --git a/test/language/module-code/privatename-not-valid-earlyerr-module-3.js b/test/language/module-code/privatename-not-valid-earlyerr-module-3.js
index d3678e9d75..36414c9006 100644
--- a/test/language/module-code/privatename-not-valid-earlyerr-module-3.js
+++ b/test/language/module-code/privatename-not-valid-earlyerr-module-3.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   y = this.#x;
diff --git a/test/language/module-code/privatename-not-valid-earlyerr-module-4.js b/test/language/module-code/privatename-not-valid-earlyerr-module-4.js
index bd3f29633d..ecfd3bd5ba 100644
--- a/test/language/module-code/privatename-not-valid-earlyerr-module-4.js
+++ b/test/language/module-code/privatename-not-valid-earlyerr-module-4.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   f() {
diff --git a/test/language/module-code/privatename-not-valid-earlyerr-module-5.js b/test/language/module-code/privatename-not-valid-earlyerr-module-5.js
index 4c20970c24..2c55e648ef 100644
--- a/test/language/module-code/privatename-not-valid-earlyerr-module-5.js
+++ b/test/language/module-code/privatename-not-valid-earlyerr-module-5.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/module-code/privatename-not-valid-earlyerr-module-6.js b/test/language/module-code/privatename-not-valid-earlyerr-module-6.js
index ead329a1c2..ed8702013c 100644
--- a/test/language/module-code/privatename-not-valid-earlyerr-module-6.js
+++ b/test/language/module-code/privatename-not-valid-earlyerr-module-6.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {}
 
diff --git a/test/language/module-code/privatename-not-valid-earlyerr-module-7.js b/test/language/module-code/privatename-not-valid-earlyerr-module-7.js
index fb0f571b6f..c7d7dd97d3 100644
--- a/test/language/module-code/privatename-not-valid-earlyerr-module-7.js
+++ b/test/language/module-code/privatename-not-valid-earlyerr-module-7.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 obj = {};
 
diff --git a/test/language/module-code/privatename-not-valid-earlyerr-module-8.js b/test/language/module-code/privatename-not-valid-earlyerr-module-8.js
index 090e4cfeeb..6530c6ba2d 100644
--- a/test/language/module-code/privatename-not-valid-earlyerr-module-8.js
+++ b/test/language/module-code/privatename-not-valid-earlyerr-module-8.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   this.#x;
diff --git a/test/language/punctuators/S7.7_A2_T1.js b/test/language/punctuators/S7.7_A2_T1.js
index a7b5978d23..8cb4482243 100644
--- a/test/language/punctuators/S7.7_A2_T1.js
+++ b/test/language/punctuators/S7.7_A2_T1.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 \u007B\u007D;
diff --git a/test/language/punctuators/S7.7_A2_T10.js b/test/language/punctuators/S7.7_A2_T10.js
index 8147742d29..f1160b1689 100644
--- a/test/language/punctuators/S7.7_A2_T10.js
+++ b/test/language/punctuators/S7.7_A2_T10.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1\u002F2;
diff --git a/test/language/punctuators/S7.7_A2_T2.js b/test/language/punctuators/S7.7_A2_T2.js
index ce7ec5c779..751812b6b8 100644
--- a/test/language/punctuators/S7.7_A2_T2.js
+++ b/test/language/punctuators/S7.7_A2_T2.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 \u00281\u0029;
diff --git a/test/language/punctuators/S7.7_A2_T3.js b/test/language/punctuators/S7.7_A2_T3.js
index 5dc0e915e6..c015e9ec0b 100644
--- a/test/language/punctuators/S7.7_A2_T3.js
+++ b/test/language/punctuators/S7.7_A2_T3.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 \u005B\u005D;
diff --git a/test/language/punctuators/S7.7_A2_T4.js b/test/language/punctuators/S7.7_A2_T4.js
index 0e396dcca2..194619edd4 100644
--- a/test/language/punctuators/S7.7_A2_T4.js
+++ b/test/language/punctuators/S7.7_A2_T4.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 \u003B;
diff --git a/test/language/punctuators/S7.7_A2_T5.js b/test/language/punctuators/S7.7_A2_T5.js
index 1b63cbbd9b..d485732356 100644
--- a/test/language/punctuators/S7.7_A2_T5.js
+++ b/test/language/punctuators/S7.7_A2_T5.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x = 1;
 this\u002Ex;
diff --git a/test/language/punctuators/S7.7_A2_T6.js b/test/language/punctuators/S7.7_A2_T6.js
index 2388c48ddc..72d8774149 100644
--- a/test/language/punctuators/S7.7_A2_T6.js
+++ b/test/language/punctuators/S7.7_A2_T6.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1\u002C2;
diff --git a/test/language/punctuators/S7.7_A2_T7.js b/test/language/punctuators/S7.7_A2_T7.js
index d903f95f4c..8c0811f2cf 100644
--- a/test/language/punctuators/S7.7_A2_T7.js
+++ b/test/language/punctuators/S7.7_A2_T7.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1\u002B2;
diff --git a/test/language/punctuators/S7.7_A2_T8.js b/test/language/punctuators/S7.7_A2_T8.js
index 8a5b86e562..f4a893358d 100644
--- a/test/language/punctuators/S7.7_A2_T8.js
+++ b/test/language/punctuators/S7.7_A2_T8.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1\u002D2;
diff --git a/test/language/punctuators/S7.7_A2_T9.js b/test/language/punctuators/S7.7_A2_T9.js
index 1f42f38bee..45e179a6a2 100644
--- a/test/language/punctuators/S7.7_A2_T9.js
+++ b/test/language/punctuators/S7.7_A2_T9.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1\u002A2;
diff --git a/test/language/reserved-words/await-module.js b/test/language/reserved-words/await-module.js
index 1243ec9f06..6d8c875816 100644
--- a/test/language/reserved-words/await-module.js
+++ b/test/language/reserved-words/await-module.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var await;
diff --git a/test/language/reserved-words/ident-reference-false-escaped.js b/test/language/reserved-words/ident-reference-false-escaped.js
index 3d75bad40e..971314e681 100644
--- a/test/language/reserved-words/ident-reference-false-escaped.js
+++ b/test/language/reserved-words/ident-reference-false-escaped.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 f\u0061lse = 0;
diff --git a/test/language/reserved-words/ident-reference-false.js b/test/language/reserved-words/ident-reference-false.js
index 9709c36984..f45d879dbe 100644
--- a/test/language/reserved-words/ident-reference-false.js
+++ b/test/language/reserved-words/ident-reference-false.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // It's tempting to write `false = 0`, but that'd be a test to validate `false`
 // is not a valid simple assignment target, cf. tests in language/expressions/assignment.
diff --git a/test/language/reserved-words/ident-reference-null-escaped.js b/test/language/reserved-words/ident-reference-null-escaped.js
index 66f39b2c57..79414d64f6 100644
--- a/test/language/reserved-words/ident-reference-null-escaped.js
+++ b/test/language/reserved-words/ident-reference-null-escaped.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 nul\u006c = 0;
diff --git a/test/language/reserved-words/ident-reference-null.js b/test/language/reserved-words/ident-reference-null.js
index b01c92bedc..b3aaea14a4 100644
--- a/test/language/reserved-words/ident-reference-null.js
+++ b/test/language/reserved-words/ident-reference-null.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // It's tempting to write `null = 0`, but that'd be a test to validate `null`
 // is not a valid simple assignment target, cf. tests in language/expressions/assignment.
diff --git a/test/language/reserved-words/ident-reference-true-escaped.js b/test/language/reserved-words/ident-reference-true-escaped.js
index 48b72dfc2d..7bff8204f7 100644
--- a/test/language/reserved-words/ident-reference-true-escaped.js
+++ b/test/language/reserved-words/ident-reference-true-escaped.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 tru\u0065 = 0;
diff --git a/test/language/reserved-words/ident-reference-true.js b/test/language/reserved-words/ident-reference-true.js
index 8870d07135..a3d5828974 100644
--- a/test/language/reserved-words/ident-reference-true.js
+++ b/test/language/reserved-words/ident-reference-true.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // It's tempting to write `true = 0`, but that'd be a test to validate `true`
 // is not a valid simple assignment target, cf. tests in language/expressions/assignment.
diff --git a/test/language/reserved-words/label-ident-false-escaped.js b/test/language/reserved-words/label-ident-false-escaped.js
index 8bd94be9c2..e2555ea95e 100644
--- a/test/language/reserved-words/label-ident-false-escaped.js
+++ b/test/language/reserved-words/label-ident-false-escaped.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 f\u0061lse: ;
diff --git a/test/language/reserved-words/label-ident-false.js b/test/language/reserved-words/label-ident-false.js
index 9dfbfe9aa1..6b791228a8 100644
--- a/test/language/reserved-words/label-ident-false.js
+++ b/test/language/reserved-words/label-ident-false.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 false: ;
diff --git a/test/language/reserved-words/label-ident-null-escaped.js b/test/language/reserved-words/label-ident-null-escaped.js
index 911f5c08bb..14560f8228 100644
--- a/test/language/reserved-words/label-ident-null-escaped.js
+++ b/test/language/reserved-words/label-ident-null-escaped.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 nul\u006c: ;
diff --git a/test/language/reserved-words/label-ident-null.js b/test/language/reserved-words/label-ident-null.js
index e958e92b96..2c2fdbfc28 100644
--- a/test/language/reserved-words/label-ident-null.js
+++ b/test/language/reserved-words/label-ident-null.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 null: ;
diff --git a/test/language/reserved-words/label-ident-true-escaped.js b/test/language/reserved-words/label-ident-true-escaped.js
index 5be2b2c2dd..b5a984f91d 100644
--- a/test/language/reserved-words/label-ident-true-escaped.js
+++ b/test/language/reserved-words/label-ident-true-escaped.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 tru\u0065: ;
diff --git a/test/language/reserved-words/label-ident-true.js b/test/language/reserved-words/label-ident-true.js
index 9dbd89b49d..d9afef85f8 100644
--- a/test/language/reserved-words/label-ident-true.js
+++ b/test/language/reserved-words/label-ident-true.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 true: ;
diff --git a/test/language/rest-parameters/position-invalid.js b/test/language/rest-parameters/position-invalid.js
index 2bd25d8569..35539ece7d 100644
--- a/test/language/rest-parameters/position-invalid.js
+++ b/test/language/rest-parameters/position-invalid.js
@@ -9,5 +9,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 function f(a, ...b, c) {}
diff --git a/test/language/statements/async-function/await-as-binding-identifier-escaped.js b/test/language/statements/async-function/await-as-binding-identifier-escaped.js
index ecad1ae934..8fb5f39789 100644
--- a/test/language/statements/async-function/await-as-binding-identifier-escaped.js
+++ b/test/language/statements/async-function/await-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function fn() {
diff --git a/test/language/statements/async-function/await-as-binding-identifier.js b/test/language/statements/async-function/await-as-binding-identifier.js
index c822b41bff..7928c5169e 100644
--- a/test/language/statements/async-function/await-as-binding-identifier.js
+++ b/test/language/statements/async-function/await-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function fn() {
diff --git a/test/language/statements/async-function/await-as-identifier-reference-escaped.js b/test/language/statements/async-function/await-as-identifier-reference-escaped.js
index d23c08f60e..7083085ef5 100644
--- a/test/language/statements/async-function/await-as-identifier-reference-escaped.js
+++ b/test/language/statements/async-function/await-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function fn() {
diff --git a/test/language/statements/async-function/await-as-identifier-reference.js b/test/language/statements/async-function/await-as-identifier-reference.js
index 6958d0837c..b6063bfd63 100644
--- a/test/language/statements/async-function/await-as-identifier-reference.js
+++ b/test/language/statements/async-function/await-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function fn() {
diff --git a/test/language/statements/async-function/await-as-label-identifier-escaped.js b/test/language/statements/async-function/await-as-label-identifier-escaped.js
index 4559089887..605f337c16 100644
--- a/test/language/statements/async-function/await-as-label-identifier-escaped.js
+++ b/test/language/statements/async-function/await-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function fn() {
diff --git a/test/language/statements/async-function/await-as-label-identifier.js b/test/language/statements/async-function/await-as-label-identifier.js
index 71594893a5..bfbfe7c3c0 100644
--- a/test/language/statements/async-function/await-as-label-identifier.js
+++ b/test/language/statements/async-function/await-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function fn() {
diff --git a/test/language/statements/async-function/dflt-params-duplicates.js b/test/language/statements/async-function/dflt-params-duplicates.js
index 9937c6a912..fff0a2ae4d 100644
--- a/test/language/statements/async-function/dflt-params-duplicates.js
+++ b/test/language/statements/async-function/dflt-params-duplicates.js
@@ -30,7 +30,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function f(x = 0, x) {
diff --git a/test/language/statements/async-function/dflt-params-rest.js b/test/language/statements/async-function/dflt-params-rest.js
index 6517d9787b..d0558c5bd7 100644
--- a/test/language/statements/async-function/dflt-params-rest.js
+++ b/test/language/statements/async-function/dflt-params-rest.js
@@ -34,7 +34,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function f(...x = []) {
diff --git a/test/language/statements/async-function/early-errors-declaration-NSPL-with-USD.js b/test/language/statements/async-function/early-errors-declaration-NSPL-with-USD.js
index 9ee0445f20..14d65053a0 100644
--- a/test/language/statements/async-function/early-errors-declaration-NSPL-with-USD.js
+++ b/test/language/statements/async-function/early-errors-declaration-NSPL-with-USD.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo(x = 1){"use strict"}
diff --git a/test/language/statements/async-function/early-errors-declaration-arguments-in-formal-parameters.js b/test/language/statements/async-function/early-errors-declaration-arguments-in-formal-parameters.js
index 6fe735329d..b318c041be 100644
--- a/test/language/statements/async-function/early-errors-declaration-arguments-in-formal-parameters.js
+++ b/test/language/statements/async-function/early-errors-declaration-arguments-in-formal-parameters.js
@@ -11,7 +11,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo (arguments) {  }
 
diff --git a/test/language/statements/async-function/early-errors-declaration-await-in-formals-default.js b/test/language/statements/async-function/early-errors-declaration-await-in-formals-default.js
index 6e1450df3a..447230e509 100644
--- a/test/language/statements/async-function/early-errors-declaration-await-in-formals-default.js
+++ b/test/language/statements/async-function/early-errors-declaration-await-in-formals-default.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 async function foo (x = await) {  }
diff --git a/test/language/statements/async-function/early-errors-declaration-await-in-formals.js b/test/language/statements/async-function/early-errors-declaration-await-in-formals.js
index 02962a2450..cfda26cb94 100644
--- a/test/language/statements/async-function/early-errors-declaration-await-in-formals.js
+++ b/test/language/statements/async-function/early-errors-declaration-await-in-formals.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 async function foo (await) {  }
diff --git a/test/language/statements/async-function/early-errors-declaration-binding-identifier-arguments.js b/test/language/statements/async-function/early-errors-declaration-binding-identifier-arguments.js
index faa24174a5..034657434b 100644
--- a/test/language/statements/async-function/early-errors-declaration-binding-identifier-arguments.js
+++ b/test/language/statements/async-function/early-errors-declaration-binding-identifier-arguments.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 async function arguments () {  }
 
diff --git a/test/language/statements/async-function/early-errors-declaration-binding-identifier-eval.js b/test/language/statements/async-function/early-errors-declaration-binding-identifier-eval.js
index 5ef37c5c4b..ee207c00f6 100644
--- a/test/language/statements/async-function/early-errors-declaration-binding-identifier-eval.js
+++ b/test/language/statements/async-function/early-errors-declaration-binding-identifier-eval.js
@@ -12,5 +12,5 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 async function eval () {  }
diff --git a/test/language/statements/async-function/early-errors-declaration-body-contains-super-call.js b/test/language/statements/async-function/early-errors-declaration-body-contains-super-call.js
index c579542594..50a630cc7e 100644
--- a/test/language/statements/async-function/early-errors-declaration-body-contains-super-call.js
+++ b/test/language/statements/async-function/early-errors-declaration-body-contains-super-call.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo (foo) { super() };
diff --git a/test/language/statements/async-function/early-errors-declaration-body-contains-super-property.js b/test/language/statements/async-function/early-errors-declaration-body-contains-super-property.js
index 6742ed0db3..623070e7ad 100644
--- a/test/language/statements/async-function/early-errors-declaration-body-contains-super-property.js
+++ b/test/language/statements/async-function/early-errors-declaration-body-contains-super-property.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo (foo) { super.prop };
diff --git a/test/language/statements/async-function/early-errors-declaration-duplicate-parameters.js b/test/language/statements/async-function/early-errors-declaration-duplicate-parameters.js
index 5a14900ff1..606a15bf2f 100644
--- a/test/language/statements/async-function/early-errors-declaration-duplicate-parameters.js
+++ b/test/language/statements/async-function/early-errors-declaration-duplicate-parameters.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo(a, a) { }
diff --git a/test/language/statements/async-function/early-errors-declaration-eval-in-formal-parameters.js b/test/language/statements/async-function/early-errors-declaration-eval-in-formal-parameters.js
index 03b4d0d31e..7605c30efd 100644
--- a/test/language/statements/async-function/early-errors-declaration-eval-in-formal-parameters.js
+++ b/test/language/statements/async-function/early-errors-declaration-eval-in-formal-parameters.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo (eval) {  }
diff --git a/test/language/statements/async-function/early-errors-declaration-formals-body-duplicate.js b/test/language/statements/async-function/early-errors-declaration-formals-body-duplicate.js
index 767e9523a6..4197b12ab3 100644
--- a/test/language/statements/async-function/early-errors-declaration-formals-body-duplicate.js
+++ b/test/language/statements/async-function/early-errors-declaration-formals-body-duplicate.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo (bar) { let bar; }
diff --git a/test/language/statements/async-function/early-errors-declaration-formals-contains-super-call.js b/test/language/statements/async-function/early-errors-declaration-formals-contains-super-call.js
index 7cd2677036..7881e7e254 100644
--- a/test/language/statements/async-function/early-errors-declaration-formals-contains-super-call.js
+++ b/test/language/statements/async-function/early-errors-declaration-formals-contains-super-call.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo (foo = super()) { let bar; }
diff --git a/test/language/statements/async-function/early-errors-declaration-formals-contains-super-property.js b/test/language/statements/async-function/early-errors-declaration-formals-contains-super-property.js
index 3898921fb5..ae8e814704 100644
--- a/test/language/statements/async-function/early-errors-declaration-formals-contains-super-property.js
+++ b/test/language/statements/async-function/early-errors-declaration-formals-contains-super-property.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function foo (foo = super.foo) { let bar; }
diff --git a/test/language/statements/async-function/escaped-async.js b/test/language/statements/async-function/escaped-async.js
index ce0c6229a1..bdb27220e4 100644
--- a/test/language/statements/async-function/escaped-async.js
+++ b/test/language/statements/async-function/escaped-async.js
@@ -19,6 +19,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 \u0061sync function f(){}
diff --git a/test/language/statements/async-function/let-newline-await-in-async-function.js b/test/language/statements/async-function/let-newline-await-in-async-function.js
index c8e6792101..2dfc83ea24 100644
--- a/test/language/statements/async-function/let-newline-await-in-async-function.js
+++ b/test/language/statements/async-function/let-newline-await-in-async-function.js
@@ -16,7 +16,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function f() {
     let
diff --git a/test/language/statements/async-function/rest-params-trailing-comma-early-error.js b/test/language/statements/async-function/rest-params-trailing-comma-early-error.js
index 75df79f287..263b6b5609 100644
--- a/test/language/statements/async-function/rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/async-function/rest-params-trailing-comma-early-error.js
@@ -27,7 +27,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function f(...a,) {
diff --git a/test/language/statements/async-generator/await-as-binding-identifier-escaped.js b/test/language/statements/async-generator/await-as-binding-identifier-escaped.js
index 605ad068a7..f77c2decfa 100644
--- a/test/language/statements/async-generator/await-as-binding-identifier-escaped.js
+++ b/test/language/statements/async-generator/await-as-binding-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/await-as-binding-identifier.js b/test/language/statements/async-generator/await-as-binding-identifier.js
index 7b148ec30c..d67d2b3384 100644
--- a/test/language/statements/async-generator/await-as-binding-identifier.js
+++ b/test/language/statements/async-generator/await-as-binding-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/await-as-identifier-reference-escaped.js b/test/language/statements/async-generator/await-as-identifier-reference-escaped.js
index 3cd1e596c5..8583a4de5a 100644
--- a/test/language/statements/async-generator/await-as-identifier-reference-escaped.js
+++ b/test/language/statements/async-generator/await-as-identifier-reference-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/await-as-identifier-reference.js b/test/language/statements/async-generator/await-as-identifier-reference.js
index cb8d1dc4dd..82962c464e 100644
--- a/test/language/statements/async-generator/await-as-identifier-reference.js
+++ b/test/language/statements/async-generator/await-as-identifier-reference.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/await-as-label-identifier-escaped.js b/test/language/statements/async-generator/await-as-label-identifier-escaped.js
index 74b11f8802..f7c1d9b885 100644
--- a/test/language/statements/async-generator/await-as-label-identifier-escaped.js
+++ b/test/language/statements/async-generator/await-as-label-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/await-as-label-identifier.js b/test/language/statements/async-generator/await-as-label-identifier.js
index 020b1cd15a..7a572d519e 100644
--- a/test/language/statements/async-generator/await-as-label-identifier.js
+++ b/test/language/statements/async-generator/await-as-label-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/dflt-params-duplicates.js b/test/language/statements/async-generator/dflt-params-duplicates.js
index aaaa142544..eb0b78f395 100644
--- a/test/language/statements/async-generator/dflt-params-duplicates.js
+++ b/test/language/statements/async-generator/dflt-params-duplicates.js
@@ -33,7 +33,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function* f(x = 0, x) {
diff --git a/test/language/statements/async-generator/dflt-params-rest.js b/test/language/statements/async-generator/dflt-params-rest.js
index f93fcff4e7..53acbcd19f 100644
--- a/test/language/statements/async-generator/dflt-params-rest.js
+++ b/test/language/statements/async-generator/dflt-params-rest.js
@@ -37,7 +37,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function* f(...x = []) {
diff --git a/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-ary.js b/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-ary.js
index b17ef3a01d..b9f9bb3b7d 100644
--- a/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-id.js b/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-id.js
index 234ca32fd6..eb6926be1c 100644
--- a/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-obj.js b/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-obj.js
index c75b5813d7..873e755550 100644
--- a/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/async-generator/dstr-ary-ptrn-rest-init-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-ary.js
index 5737f58b77..082ac99930 100644
--- a/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-id.js b/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-id.js
index 8448589982..6c186931ea 100644
--- a/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-obj.js
index 06811794d5..d17bb38957 100644
--- a/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/async-generator/dstr-ary-ptrn-rest-not-final-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-ary.js
index 675c095938..0a1c882078 100644
--- a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-id.js
index 3d5816aa1d..934c22e768 100644
--- a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-obj.js
index 233c086c6c..5688a0cbbe 100644
--- a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-init-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-ary.js
index dc31417e4c..75f9d5cc5d 100644
--- a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-id.js
index bab834d6bc..bc5cf5080a 100644
--- a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-obj.js
index ed2fa43ce3..a2c354a2c4 100644
--- a/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/async-generator/dstr-dflt-ary-ptrn-rest-not-final-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/escaped-async.js b/test/language/statements/async-generator/escaped-async.js
index 7a35a2df3d..3324869528 100644
--- a/test/language/statements/async-generator/escaped-async.js
+++ b/test/language/statements/async-generator/escaped-async.js
@@ -19,6 +19,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 \u0061sync function* f(){}
diff --git a/test/language/statements/async-generator/rest-params-trailing-comma-early-error.js b/test/language/statements/async-generator/rest-params-trailing-comma-early-error.js
index 7714510607..ceca4e5215 100644
--- a/test/language/statements/async-generator/rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/async-generator/rest-params-trailing-comma-early-error.js
@@ -30,7 +30,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function* f(...a,) {
diff --git a/test/language/statements/async-generator/yield-as-binding-identifier-escaped.js b/test/language/statements/async-generator/yield-as-binding-identifier-escaped.js
index bc82211e65..5418c0d910 100644
--- a/test/language/statements/async-generator/yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/async-generator/yield-as-binding-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/yield-as-binding-identifier.js b/test/language/statements/async-generator/yield-as-binding-identifier.js
index 8a71d75000..ec3e0de2d2 100644
--- a/test/language/statements/async-generator/yield-as-binding-identifier.js
+++ b/test/language/statements/async-generator/yield-as-binding-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/yield-as-identifier-reference-escaped.js b/test/language/statements/async-generator/yield-as-identifier-reference-escaped.js
index b73578bfcd..103614cee7 100644
--- a/test/language/statements/async-generator/yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/async-generator/yield-as-identifier-reference-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/yield-as-identifier-reference.js b/test/language/statements/async-generator/yield-as-identifier-reference.js
index fe749abd3e..9a92851431 100644
--- a/test/language/statements/async-generator/yield-as-identifier-reference.js
+++ b/test/language/statements/async-generator/yield-as-identifier-reference.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/yield-as-label-identifier-escaped.js b/test/language/statements/async-generator/yield-as-label-identifier-escaped.js
index ac67a13a38..9936ec87f0 100644
--- a/test/language/statements/async-generator/yield-as-label-identifier-escaped.js
+++ b/test/language/statements/async-generator/yield-as-label-identifier-escaped.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/yield-as-label-identifier.js b/test/language/statements/async-generator/yield-as-label-identifier.js
index 96d1707e12..ee12c1233d 100644
--- a/test/language/statements/async-generator/yield-as-label-identifier.js
+++ b/test/language/statements/async-generator/yield-as-label-identifier.js
@@ -23,7 +23,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 async function *gen() {
diff --git a/test/language/statements/async-generator/yield-identifier-spread-strict.js b/test/language/statements/async-generator/yield-identifier-spread-strict.js
index c0e8b956f8..a65b082ebd 100644
--- a/test/language/statements/async-generator/yield-identifier-spread-strict.js
+++ b/test/language/statements/async-generator/yield-identifier-spread-strict.js
@@ -24,7 +24,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/async-generator/yield-identifier-strict.js b/test/language/statements/async-generator/yield-identifier-strict.js
index 5a1556c608..699274cc61 100644
--- a/test/language/statements/async-generator/yield-identifier-strict.js
+++ b/test/language/statements/async-generator/yield-identifier-strict.js
@@ -17,7 +17,7 @@ info: |
         AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/block/S12.1_A4_T1.js b/test/language/statements/block/S12.1_A4_T1.js
index e6fe0e3b9b..d289130010 100644
--- a/test/language/statements/block/S12.1_A4_T1.js
+++ b/test/language/statements/block/S12.1_A4_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function __func(){};
 
diff --git a/test/language/statements/block/S12.1_A4_T2.js b/test/language/statements/block/S12.1_A4_T2.js
index ed4936cf4a..092b2c92fc 100644
--- a/test/language/statements/block/S12.1_A4_T2.js
+++ b/test/language/statements/block/S12.1_A4_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 x=1;
 
diff --git a/test/language/statements/break/S12.8_A1_T1.js b/test/language/statements/break/S12.8_A1_T1.js
index 3278f18610..02c1d33362 100644
--- a/test/language/statements/break/S12.8_A1_T1.js
+++ b/test/language/statements/break/S12.8_A1_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/break/S12.8_A1_T2.js b/test/language/statements/break/S12.8_A1_T2.js
index 0abd100db5..8f2902f7f0 100644
--- a/test/language/statements/break/S12.8_A1_T2.js
+++ b/test/language/statements/break/S12.8_A1_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 LABEL : x=3.14;
 
diff --git a/test/language/statements/break/S12.8_A1_T3.js b/test/language/statements/break/S12.8_A1_T3.js
index ba924de047..7ca592b4f2 100644
--- a/test/language/statements/break/S12.8_A1_T3.js
+++ b/test/language/statements/break/S12.8_A1_T3.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/break/S12.8_A1_T4.js b/test/language/statements/break/S12.8_A1_T4.js
index 5f808e09db..287541c17a 100644
--- a/test/language/statements/break/S12.8_A1_T4.js
+++ b/test/language/statements/break/S12.8_A1_T4.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 LABEL : x=3.14;
 
diff --git a/test/language/statements/break/S12.8_A5_T1.js b/test/language/statements/break/S12.8_A5_T1.js
index 33f039ca93..777f6ff621 100644
--- a/test/language/statements/break/S12.8_A5_T1.js
+++ b/test/language/statements/break/S12.8_A5_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function(){
     LABEL_OUT : var x=0, y=0;
diff --git a/test/language/statements/break/S12.8_A5_T2.js b/test/language/statements/break/S12.8_A5_T2.js
index f2757476a1..6f9454686a 100644
--- a/test/language/statements/break/S12.8_A5_T2.js
+++ b/test/language/statements/break/S12.8_A5_T2.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function(){
     LABEL_OUT : var x=0, y=0;
diff --git a/test/language/statements/break/S12.8_A5_T3.js b/test/language/statements/break/S12.8_A5_T3.js
index 094f7bba95..523fb6069d 100644
--- a/test/language/statements/break/S12.8_A5_T3.js
+++ b/test/language/statements/break/S12.8_A5_T3.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (function(){
     LABEL_OUT : var x=0, y=0;
diff --git a/test/language/statements/break/S12.8_A6.js b/test/language/statements/break/S12.8_A6.js
index dda34c0878..51db7ff718 100644
--- a/test/language/statements/break/S12.8_A6.js
+++ b/test/language/statements/break/S12.8_A6.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x=0,y=0;
 
diff --git a/test/language/statements/break/S12.8_A8_T1.js b/test/language/statements/break/S12.8_A8_T1.js
index 50edd4968a..42f03266f4 100644
--- a/test/language/statements/break/S12.8_A8_T1.js
+++ b/test/language/statements/break/S12.8_A8_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try{
 } catch(e){
diff --git a/test/language/statements/break/S12.8_A8_T2.js b/test/language/statements/break/S12.8_A8_T2.js
index 3bf515ed91..b301ead27a 100644
--- a/test/language/statements/break/S12.8_A8_T2.js
+++ b/test/language/statements/break/S12.8_A8_T2.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try{
 } catch(e){
diff --git a/test/language/statements/class/async-gen-meth-dflt-params-duplicates.js b/test/language/statements/class/async-gen-meth-dflt-params-duplicates.js
index 3dae89f9a7..d8b22c29ca 100644
--- a/test/language/statements/class/async-gen-meth-dflt-params-duplicates.js
+++ b/test/language/statements/class/async-gen-meth-dflt-params-duplicates.js
@@ -56,7 +56,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   async *method(x = 0, x) {
diff --git a/test/language/statements/class/async-gen-meth-dflt-params-rest.js b/test/language/statements/class/async-gen-meth-dflt-params-rest.js
index b5d6d0b6db..513c893b4c 100644
--- a/test/language/statements/class/async-gen-meth-dflt-params-rest.js
+++ b/test/language/statements/class/async-gen-meth-dflt-params-rest.js
@@ -60,7 +60,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   async *method(...x = []) {
diff --git a/test/language/statements/class/async-gen-meth-escaped-async.js b/test/language/statements/class/async-gen-meth-escaped-async.js
index b88ca38931..138800515d 100644
--- a/test/language/statements/class/async-gen-meth-escaped-async.js
+++ b/test/language/statements/class/async-gen-meth-escaped-async.js
@@ -19,7 +19,7 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
     \u0061sync* m(){}
diff --git a/test/language/statements/class/async-gen-meth-rest-params-trailing-comma-early-error.js b/test/language/statements/class/async-gen-meth-rest-params-trailing-comma-early-error.js
index fdf3d0fc0d..8039866a93 100644
--- a/test/language/statements/class/async-gen-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/class/async-gen-meth-rest-params-trailing-comma-early-error.js
@@ -53,7 +53,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   async *method(...a,) {
diff --git a/test/language/statements/class/async-gen-meth-static-dflt-params-duplicates.js b/test/language/statements/class/async-gen-meth-static-dflt-params-duplicates.js
index f7c04c50c4..637facbbdc 100644
--- a/test/language/statements/class/async-gen-meth-static-dflt-params-duplicates.js
+++ b/test/language/statements/class/async-gen-meth-static-dflt-params-duplicates.js
@@ -56,7 +56,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-gen-meth-static-dflt-params-rest.js b/test/language/statements/class/async-gen-meth-static-dflt-params-rest.js
index dcb69769d4..d038f894a8 100644
--- a/test/language/statements/class/async-gen-meth-static-dflt-params-rest.js
+++ b/test/language/statements/class/async-gen-meth-static-dflt-params-rest.js
@@ -60,7 +60,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-gen-meth-static-rest-params-trailing-comma-early-error.js b/test/language/statements/class/async-gen-meth-static-rest-params-trailing-comma-early-error.js
index ea56c04a14..912525e5a1 100644
--- a/test/language/statements/class/async-gen-meth-static-rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/class/async-gen-meth-static-rest-params-trailing-comma-early-error.js
@@ -53,7 +53,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-gen-method-await-as-binding-identifier-escaped.js b/test/language/statements/class/async-gen-method-await-as-binding-identifier-escaped.js
index b3b93fcc34..e9580318f5 100644
--- a/test/language/statements/class/async-gen-method-await-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-method-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-await-as-binding-identifier.js b/test/language/statements/class/async-gen-method-await-as-binding-identifier.js
index 9338cb2dd9..ac51fe002d 100644
--- a/test/language/statements/class/async-gen-method-await-as-binding-identifier.js
+++ b/test/language/statements/class/async-gen-method-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-await-as-identifier-reference-escaped.js b/test/language/statements/class/async-gen-method-await-as-identifier-reference-escaped.js
index 1aef25a159..d797449e33 100644
--- a/test/language/statements/class/async-gen-method-await-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-gen-method-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-await-as-identifier-reference.js b/test/language/statements/class/async-gen-method-await-as-identifier-reference.js
index f1e80f03f5..af9d8de4d5 100644
--- a/test/language/statements/class/async-gen-method-await-as-identifier-reference.js
+++ b/test/language/statements/class/async-gen-method-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-await-as-label-identifier-escaped.js b/test/language/statements/class/async-gen-method-await-as-label-identifier-escaped.js
index c220ceddfa..80f1f4e9cc 100644
--- a/test/language/statements/class/async-gen-method-await-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-method-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-await-as-label-identifier.js b/test/language/statements/class/async-gen-method-await-as-label-identifier.js
index 1907672020..37254838b7 100644
--- a/test/language/statements/class/async-gen-method-await-as-label-identifier.js
+++ b/test/language/statements/class/async-gen-method-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-await-as-binding-identifier-escaped.js b/test/language/statements/class/async-gen-method-static-await-as-binding-identifier-escaped.js
index da272c6185..bb46964a69 100644
--- a/test/language/statements/class/async-gen-method-static-await-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-method-static-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-await-as-binding-identifier.js b/test/language/statements/class/async-gen-method-static-await-as-binding-identifier.js
index 5e51aa8afa..1ed4aec842 100644
--- a/test/language/statements/class/async-gen-method-static-await-as-binding-identifier.js
+++ b/test/language/statements/class/async-gen-method-static-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-await-as-identifier-reference-escaped.js b/test/language/statements/class/async-gen-method-static-await-as-identifier-reference-escaped.js
index 15bc94c3dd..61f164c416 100644
--- a/test/language/statements/class/async-gen-method-static-await-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-gen-method-static-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-await-as-identifier-reference.js b/test/language/statements/class/async-gen-method-static-await-as-identifier-reference.js
index 1e99ee7cb8..8714798fa7 100644
--- a/test/language/statements/class/async-gen-method-static-await-as-identifier-reference.js
+++ b/test/language/statements/class/async-gen-method-static-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-await-as-label-identifier-escaped.js b/test/language/statements/class/async-gen-method-static-await-as-label-identifier-escaped.js
index 856f915f44..16f50a4d31 100644
--- a/test/language/statements/class/async-gen-method-static-await-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-method-static-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-await-as-label-identifier.js b/test/language/statements/class/async-gen-method-static-await-as-label-identifier.js
index 3eab7b12e3..60895b3512 100644
--- a/test/language/statements/class/async-gen-method-static-await-as-label-identifier.js
+++ b/test/language/statements/class/async-gen-method-static-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-yield-as-binding-identifier-escaped.js b/test/language/statements/class/async-gen-method-static-yield-as-binding-identifier-escaped.js
index a2dc05dfb1..c1bfbd70fe 100644
--- a/test/language/statements/class/async-gen-method-static-yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-method-static-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-yield-as-binding-identifier.js b/test/language/statements/class/async-gen-method-static-yield-as-binding-identifier.js
index 4d2efa394d..16ab953958 100644
--- a/test/language/statements/class/async-gen-method-static-yield-as-binding-identifier.js
+++ b/test/language/statements/class/async-gen-method-static-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-yield-as-identifier-reference-escaped.js b/test/language/statements/class/async-gen-method-static-yield-as-identifier-reference-escaped.js
index 989211de96..ee5c93e89f 100644
--- a/test/language/statements/class/async-gen-method-static-yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-gen-method-static-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-yield-as-identifier-reference.js b/test/language/statements/class/async-gen-method-static-yield-as-identifier-reference.js
index 08a500e925..e068371d79 100644
--- a/test/language/statements/class/async-gen-method-static-yield-as-identifier-reference.js
+++ b/test/language/statements/class/async-gen-method-static-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-yield-as-label-identifier-escaped.js b/test/language/statements/class/async-gen-method-static-yield-as-label-identifier-escaped.js
index 3fb879b5db..f247014055 100644
--- a/test/language/statements/class/async-gen-method-static-yield-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-method-static-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-yield-as-label-identifier.js b/test/language/statements/class/async-gen-method-static-yield-as-label-identifier.js
index 6ab526d5d4..ca91365076 100644
--- a/test/language/statements/class/async-gen-method-static-yield-as-label-identifier.js
+++ b/test/language/statements/class/async-gen-method-static-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *gen() {
diff --git a/test/language/statements/class/async-gen-method-static-yield-identifier-spread-strict.js b/test/language/statements/class/async-gen-method-static-yield-identifier-spread-strict.js
index 49c4fc2f1a..49fa62d465 100644
--- a/test/language/statements/class/async-gen-method-static-yield-identifier-spread-strict.js
+++ b/test/language/statements/class/async-gen-method-static-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/async-gen-method-static-yield-identifier-strict.js b/test/language/statements/class/async-gen-method-static-yield-identifier-strict.js
index 3daa313dcf..11f4a08c0b 100644
--- a/test/language/statements/class/async-gen-method-static-yield-identifier-strict.js
+++ b/test/language/statements/class/async-gen-method-static-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/async-gen-method-yield-as-binding-identifier-escaped.js b/test/language/statements/class/async-gen-method-yield-as-binding-identifier-escaped.js
index 6a71bbbabb..7be08e488e 100644
--- a/test/language/statements/class/async-gen-method-yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-method-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-yield-as-binding-identifier.js b/test/language/statements/class/async-gen-method-yield-as-binding-identifier.js
index c52634380d..7efd6a69cf 100644
--- a/test/language/statements/class/async-gen-method-yield-as-binding-identifier.js
+++ b/test/language/statements/class/async-gen-method-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-yield-as-identifier-reference-escaped.js b/test/language/statements/class/async-gen-method-yield-as-identifier-reference-escaped.js
index 38b319e95c..73e0f6e3a8 100644
--- a/test/language/statements/class/async-gen-method-yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-gen-method-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-yield-as-identifier-reference.js b/test/language/statements/class/async-gen-method-yield-as-identifier-reference.js
index 3c5a48801e..6cafe883f0 100644
--- a/test/language/statements/class/async-gen-method-yield-as-identifier-reference.js
+++ b/test/language/statements/class/async-gen-method-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-yield-as-label-identifier-escaped.js b/test/language/statements/class/async-gen-method-yield-as-label-identifier-escaped.js
index 4365d886f4..889388b150 100644
--- a/test/language/statements/class/async-gen-method-yield-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-method-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-yield-as-label-identifier.js b/test/language/statements/class/async-gen-method-yield-as-label-identifier.js
index 36f9d02086..7f0a02efca 100644
--- a/test/language/statements/class/async-gen-method-yield-as-label-identifier.js
+++ b/test/language/statements/class/async-gen-method-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *gen() {
diff --git a/test/language/statements/class/async-gen-method-yield-identifier-spread-strict.js b/test/language/statements/class/async-gen-method-yield-identifier-spread-strict.js
index dd82bf66a0..62c45edcdf 100644
--- a/test/language/statements/class/async-gen-method-yield-identifier-spread-strict.js
+++ b/test/language/statements/class/async-gen-method-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/async-gen-method-yield-identifier-strict.js b/test/language/statements/class/async-gen-method-yield-identifier-strict.js
index 158942f7cd..8b0c1e4853 100644
--- a/test/language/statements/class/async-gen-method-yield-identifier-strict.js
+++ b/test/language/statements/class/async-gen-method-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/async-gen-private-method-await-as-binding-identifier-escaped.js b/test/language/statements/class/async-gen-private-method-await-as-binding-identifier-escaped.js
index 9a59c2247b..2117096f57 100644
--- a/test/language/statements/class/async-gen-private-method-await-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-await-as-binding-identifier.js b/test/language/statements/class/async-gen-private-method-await-as-binding-identifier.js
index 066fe0f564..719680c7cd 100644
--- a/test/language/statements/class/async-gen-private-method-await-as-binding-identifier.js
+++ b/test/language/statements/class/async-gen-private-method-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-await-as-identifier-reference-escaped.js b/test/language/statements/class/async-gen-private-method-await-as-identifier-reference-escaped.js
index 028f02df78..d89be03d43 100644
--- a/test/language/statements/class/async-gen-private-method-await-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-await-as-identifier-reference.js b/test/language/statements/class/async-gen-private-method-await-as-identifier-reference.js
index 618477c53b..81a459de89 100644
--- a/test/language/statements/class/async-gen-private-method-await-as-identifier-reference.js
+++ b/test/language/statements/class/async-gen-private-method-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-await-as-label-identifier-escaped.js b/test/language/statements/class/async-gen-private-method-await-as-label-identifier-escaped.js
index 4cb5748af1..0c966f7770 100644
--- a/test/language/statements/class/async-gen-private-method-await-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-await-as-label-identifier.js b/test/language/statements/class/async-gen-private-method-await-as-label-identifier.js
index 1197671793..c7c8ea98e9 100644
--- a/test/language/statements/class/async-gen-private-method-await-as-label-identifier.js
+++ b/test/language/statements/class/async-gen-private-method-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-await-as-binding-identifier-escaped.js b/test/language/statements/class/async-gen-private-method-static-await-as-binding-identifier-escaped.js
index ce494f7c6c..3a8d2c5baf 100644
--- a/test/language/statements/class/async-gen-private-method-static-await-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-static-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-await-as-binding-identifier.js b/test/language/statements/class/async-gen-private-method-static-await-as-binding-identifier.js
index 88589e3886..6c539d9b2a 100644
--- a/test/language/statements/class/async-gen-private-method-static-await-as-binding-identifier.js
+++ b/test/language/statements/class/async-gen-private-method-static-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-await-as-identifier-reference-escaped.js b/test/language/statements/class/async-gen-private-method-static-await-as-identifier-reference-escaped.js
index 66b216b576..a3d67d0395 100644
--- a/test/language/statements/class/async-gen-private-method-static-await-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-static-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-await-as-identifier-reference.js b/test/language/statements/class/async-gen-private-method-static-await-as-identifier-reference.js
index 6dc1720f4e..01d663beb9 100644
--- a/test/language/statements/class/async-gen-private-method-static-await-as-identifier-reference.js
+++ b/test/language/statements/class/async-gen-private-method-static-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-await-as-label-identifier-escaped.js b/test/language/statements/class/async-gen-private-method-static-await-as-label-identifier-escaped.js
index 8f6f8b740f..ec5be03b35 100644
--- a/test/language/statements/class/async-gen-private-method-static-await-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-static-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-await-as-label-identifier.js b/test/language/statements/class/async-gen-private-method-static-await-as-label-identifier.js
index 28840fb4b6..913279b67b 100644
--- a/test/language/statements/class/async-gen-private-method-static-await-as-label-identifier.js
+++ b/test/language/statements/class/async-gen-private-method-static-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-yield-as-binding-identifier-escaped.js b/test/language/statements/class/async-gen-private-method-static-yield-as-binding-identifier-escaped.js
index e21a3974e3..ab4ef62134 100644
--- a/test/language/statements/class/async-gen-private-method-static-yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-static-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-yield-as-binding-identifier.js b/test/language/statements/class/async-gen-private-method-static-yield-as-binding-identifier.js
index a7ed1bdde6..30c295470a 100644
--- a/test/language/statements/class/async-gen-private-method-static-yield-as-binding-identifier.js
+++ b/test/language/statements/class/async-gen-private-method-static-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-yield-as-identifier-reference-escaped.js b/test/language/statements/class/async-gen-private-method-static-yield-as-identifier-reference-escaped.js
index 46f65f71e2..80ad64ad88 100644
--- a/test/language/statements/class/async-gen-private-method-static-yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-static-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-yield-as-identifier-reference.js b/test/language/statements/class/async-gen-private-method-static-yield-as-identifier-reference.js
index bb6337e032..83ad1f89ca 100644
--- a/test/language/statements/class/async-gen-private-method-static-yield-as-identifier-reference.js
+++ b/test/language/statements/class/async-gen-private-method-static-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-yield-as-label-identifier-escaped.js b/test/language/statements/class/async-gen-private-method-static-yield-as-label-identifier-escaped.js
index 41509b462a..19d1469c6a 100644
--- a/test/language/statements/class/async-gen-private-method-static-yield-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-static-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-yield-as-label-identifier.js b/test/language/statements/class/async-gen-private-method-static-yield-as-label-identifier.js
index fce8f96228..53ab1104ec 100644
--- a/test/language/statements/class/async-gen-private-method-static-yield-as-label-identifier.js
+++ b/test/language/statements/class/async-gen-private-method-static-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-static-yield-identifier-spread-strict.js b/test/language/statements/class/async-gen-private-method-static-yield-identifier-spread-strict.js
index 0a140ade57..6404349375 100644
--- a/test/language/statements/class/async-gen-private-method-static-yield-identifier-spread-strict.js
+++ b/test/language/statements/class/async-gen-private-method-static-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/async-gen-private-method-static-yield-identifier-strict.js b/test/language/statements/class/async-gen-private-method-static-yield-identifier-strict.js
index d9f7a12b15..243d5414f4 100644
--- a/test/language/statements/class/async-gen-private-method-static-yield-identifier-strict.js
+++ b/test/language/statements/class/async-gen-private-method-static-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/async-gen-private-method-yield-as-binding-identifier-escaped.js b/test/language/statements/class/async-gen-private-method-yield-as-binding-identifier-escaped.js
index 6080545e16..8bf4d8c18a 100644
--- a/test/language/statements/class/async-gen-private-method-yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-yield-as-binding-identifier.js b/test/language/statements/class/async-gen-private-method-yield-as-binding-identifier.js
index 5c638e84ae..1583005cef 100644
--- a/test/language/statements/class/async-gen-private-method-yield-as-binding-identifier.js
+++ b/test/language/statements/class/async-gen-private-method-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-yield-as-identifier-reference-escaped.js b/test/language/statements/class/async-gen-private-method-yield-as-identifier-reference-escaped.js
index b4ca742df1..4aa60eb779 100644
--- a/test/language/statements/class/async-gen-private-method-yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-yield-as-identifier-reference.js b/test/language/statements/class/async-gen-private-method-yield-as-identifier-reference.js
index 858378d153..9fd5859085 100644
--- a/test/language/statements/class/async-gen-private-method-yield-as-identifier-reference.js
+++ b/test/language/statements/class/async-gen-private-method-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-yield-as-label-identifier-escaped.js b/test/language/statements/class/async-gen-private-method-yield-as-label-identifier-escaped.js
index b951d3a20d..52a1c1fa5c 100644
--- a/test/language/statements/class/async-gen-private-method-yield-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-gen-private-method-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-yield-as-label-identifier.js b/test/language/statements/class/async-gen-private-method-yield-as-label-identifier.js
index 2b761f675d..00a555b395 100644
--- a/test/language/statements/class/async-gen-private-method-yield-as-label-identifier.js
+++ b/test/language/statements/class/async-gen-private-method-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async *#gen() {
diff --git a/test/language/statements/class/async-gen-private-method-yield-identifier-spread-strict.js b/test/language/statements/class/async-gen-private-method-yield-identifier-spread-strict.js
index d25d9c4d39..97613d2c26 100644
--- a/test/language/statements/class/async-gen-private-method-yield-identifier-spread-strict.js
+++ b/test/language/statements/class/async-gen-private-method-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/async-gen-private-method-yield-identifier-strict.js b/test/language/statements/class/async-gen-private-method-yield-identifier-strict.js
index 2c0528686b..22a4f66432 100644
--- a/test/language/statements/class/async-gen-private-method-yield-identifier-strict.js
+++ b/test/language/statements/class/async-gen-private-method-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       async [no LineTerminator here] * PropertyName ( UniqueFormalParameters ) { AsyncGeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/async-meth-dflt-params-duplicates.js b/test/language/statements/class/async-meth-dflt-params-duplicates.js
index 143350984c..42ad6449de 100644
--- a/test/language/statements/class/async-meth-dflt-params-duplicates.js
+++ b/test/language/statements/class/async-meth-dflt-params-duplicates.js
@@ -54,7 +54,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-meth-dflt-params-rest.js b/test/language/statements/class/async-meth-dflt-params-rest.js
index 954a7cc1ea..52e240298b 100644
--- a/test/language/statements/class/async-meth-dflt-params-rest.js
+++ b/test/language/statements/class/async-meth-dflt-params-rest.js
@@ -58,7 +58,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-meth-escaped-async.js b/test/language/statements/class/async-meth-escaped-async.js
index f14a43a024..1d890c3242 100644
--- a/test/language/statements/class/async-meth-escaped-async.js
+++ b/test/language/statements/class/async-meth-escaped-async.js
@@ -19,7 +19,7 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
     \u0061sync m(){}
diff --git a/test/language/statements/class/async-meth-rest-params-trailing-comma-early-error.js b/test/language/statements/class/async-meth-rest-params-trailing-comma-early-error.js
index d37fe3c402..c6ca7d2d69 100644
--- a/test/language/statements/class/async-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/class/async-meth-rest-params-trailing-comma-early-error.js
@@ -50,7 +50,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-meth-static-dflt-params-duplicates.js b/test/language/statements/class/async-meth-static-dflt-params-duplicates.js
index 27d2b26b0b..5b8d2a2371 100644
--- a/test/language/statements/class/async-meth-static-dflt-params-duplicates.js
+++ b/test/language/statements/class/async-meth-static-dflt-params-duplicates.js
@@ -53,7 +53,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-meth-static-dflt-params-rest.js b/test/language/statements/class/async-meth-static-dflt-params-rest.js
index e91aa731c6..98540b6634 100644
--- a/test/language/statements/class/async-meth-static-dflt-params-rest.js
+++ b/test/language/statements/class/async-meth-static-dflt-params-rest.js
@@ -57,7 +57,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-meth-static-rest-params-trailing-comma-early-error.js b/test/language/statements/class/async-meth-static-rest-params-trailing-comma-early-error.js
index 0b46f99982..9702aa79b8 100644
--- a/test/language/statements/class/async-meth-static-rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/class/async-meth-static-rest-params-trailing-comma-early-error.js
@@ -49,7 +49,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C {
diff --git a/test/language/statements/class/async-method-await-as-binding-identifier-escaped.js b/test/language/statements/class/async-method-await-as-binding-identifier-escaped.js
index 5542a1649e..b7b7d0c6be 100644
--- a/test/language/statements/class/async-method-await-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-method-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async method() {
diff --git a/test/language/statements/class/async-method-await-as-binding-identifier.js b/test/language/statements/class/async-method-await-as-binding-identifier.js
index 27d98bfb6d..eb7f00a18a 100644
--- a/test/language/statements/class/async-method-await-as-binding-identifier.js
+++ b/test/language/statements/class/async-method-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async method() {
diff --git a/test/language/statements/class/async-method-await-as-identifier-reference-escaped.js b/test/language/statements/class/async-method-await-as-identifier-reference-escaped.js
index eb8186647a..9b652afdc0 100644
--- a/test/language/statements/class/async-method-await-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-method-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async method() {
diff --git a/test/language/statements/class/async-method-await-as-identifier-reference.js b/test/language/statements/class/async-method-await-as-identifier-reference.js
index 5e6926a283..23e263e917 100644
--- a/test/language/statements/class/async-method-await-as-identifier-reference.js
+++ b/test/language/statements/class/async-method-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async method() {
diff --git a/test/language/statements/class/async-method-await-as-label-identifier-escaped.js b/test/language/statements/class/async-method-await-as-label-identifier-escaped.js
index 654b183ce7..cb734592ea 100644
--- a/test/language/statements/class/async-method-await-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-method-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async method() {
diff --git a/test/language/statements/class/async-method-await-as-label-identifier.js b/test/language/statements/class/async-method-await-as-label-identifier.js
index ab3a0b32c1..4f33aff4e6 100644
--- a/test/language/statements/class/async-method-await-as-label-identifier.js
+++ b/test/language/statements/class/async-method-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async method() {
diff --git a/test/language/statements/class/async-method-static-await-as-binding-identifier-escaped.js b/test/language/statements/class/async-method-static-await-as-binding-identifier-escaped.js
index 3eafe99fea..e36f9de4f5 100644
--- a/test/language/statements/class/async-method-static-await-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-method-static-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async method() {
diff --git a/test/language/statements/class/async-method-static-await-as-binding-identifier.js b/test/language/statements/class/async-method-static-await-as-binding-identifier.js
index ad65c02f60..2bd87d530e 100644
--- a/test/language/statements/class/async-method-static-await-as-binding-identifier.js
+++ b/test/language/statements/class/async-method-static-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async method() {
diff --git a/test/language/statements/class/async-method-static-await-as-identifier-reference-escaped.js b/test/language/statements/class/async-method-static-await-as-identifier-reference-escaped.js
index f47204f83b..47f1313e7a 100644
--- a/test/language/statements/class/async-method-static-await-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-method-static-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async method() {
diff --git a/test/language/statements/class/async-method-static-await-as-identifier-reference.js b/test/language/statements/class/async-method-static-await-as-identifier-reference.js
index 4013a35951..d9e2606f4b 100644
--- a/test/language/statements/class/async-method-static-await-as-identifier-reference.js
+++ b/test/language/statements/class/async-method-static-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async method() {
diff --git a/test/language/statements/class/async-method-static-await-as-label-identifier-escaped.js b/test/language/statements/class/async-method-static-await-as-label-identifier-escaped.js
index 75b81f9f39..61bcc73101 100644
--- a/test/language/statements/class/async-method-static-await-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-method-static-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async method() {
diff --git a/test/language/statements/class/async-method-static-await-as-label-identifier.js b/test/language/statements/class/async-method-static-await-as-label-identifier.js
index be628b1449..88a67040bd 100644
--- a/test/language/statements/class/async-method-static-await-as-label-identifier.js
+++ b/test/language/statements/class/async-method-static-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async method() {
diff --git a/test/language/statements/class/async-private-method-await-as-binding-identifier-escaped.js b/test/language/statements/class/async-private-method-await-as-binding-identifier-escaped.js
index 2be243c897..324e842e00 100644
--- a/test/language/statements/class/async-private-method-await-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-private-method-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async #method() {
diff --git a/test/language/statements/class/async-private-method-await-as-binding-identifier.js b/test/language/statements/class/async-private-method-await-as-binding-identifier.js
index 3a62a0019c..4cc5f43a0a 100644
--- a/test/language/statements/class/async-private-method-await-as-binding-identifier.js
+++ b/test/language/statements/class/async-private-method-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async #method() {
diff --git a/test/language/statements/class/async-private-method-await-as-identifier-reference-escaped.js b/test/language/statements/class/async-private-method-await-as-identifier-reference-escaped.js
index edd259fed1..525db4d019 100644
--- a/test/language/statements/class/async-private-method-await-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-private-method-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async #method() {
diff --git a/test/language/statements/class/async-private-method-await-as-identifier-reference.js b/test/language/statements/class/async-private-method-await-as-identifier-reference.js
index 1bfa76d821..fc0540a16b 100644
--- a/test/language/statements/class/async-private-method-await-as-identifier-reference.js
+++ b/test/language/statements/class/async-private-method-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async #method() {
diff --git a/test/language/statements/class/async-private-method-await-as-label-identifier-escaped.js b/test/language/statements/class/async-private-method-await-as-label-identifier-escaped.js
index abb011bfb4..9120e2e1d3 100644
--- a/test/language/statements/class/async-private-method-await-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-private-method-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async #method() {
diff --git a/test/language/statements/class/async-private-method-await-as-label-identifier.js b/test/language/statements/class/async-private-method-await-as-label-identifier.js
index 27a7deb59e..dd0c4d676a 100644
--- a/test/language/statements/class/async-private-method-await-as-label-identifier.js
+++ b/test/language/statements/class/async-private-method-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { async #method() {
diff --git a/test/language/statements/class/async-private-method-static-await-as-binding-identifier-escaped.js b/test/language/statements/class/async-private-method-static-await-as-binding-identifier-escaped.js
index 093ff9c3a2..86dc746a6f 100644
--- a/test/language/statements/class/async-private-method-static-await-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/async-private-method-static-await-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async #method() {
diff --git a/test/language/statements/class/async-private-method-static-await-as-binding-identifier.js b/test/language/statements/class/async-private-method-static-await-as-binding-identifier.js
index a6628fb527..80225fe3ae 100644
--- a/test/language/statements/class/async-private-method-static-await-as-binding-identifier.js
+++ b/test/language/statements/class/async-private-method-static-await-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async #method() {
diff --git a/test/language/statements/class/async-private-method-static-await-as-identifier-reference-escaped.js b/test/language/statements/class/async-private-method-static-await-as-identifier-reference-escaped.js
index 4e5f1c375b..8c918a74ec 100644
--- a/test/language/statements/class/async-private-method-static-await-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/async-private-method-static-await-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async #method() {
diff --git a/test/language/statements/class/async-private-method-static-await-as-identifier-reference.js b/test/language/statements/class/async-private-method-static-await-as-identifier-reference.js
index f6b58621d2..43e3005dbe 100644
--- a/test/language/statements/class/async-private-method-static-await-as-identifier-reference.js
+++ b/test/language/statements/class/async-private-method-static-await-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async #method() {
diff --git a/test/language/statements/class/async-private-method-static-await-as-label-identifier-escaped.js b/test/language/statements/class/async-private-method-static-await-as-label-identifier-escaped.js
index fb8bf6d56c..168af54c71 100644
--- a/test/language/statements/class/async-private-method-static-await-as-label-identifier-escaped.js
+++ b/test/language/statements/class/async-private-method-static-await-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async #method() {
diff --git a/test/language/statements/class/async-private-method-static-await-as-label-identifier.js b/test/language/statements/class/async-private-method-static-await-as-label-identifier.js
index 146e5a2655..60efe52a5b 100644
--- a/test/language/statements/class/async-private-method-static-await-as-label-identifier.js
+++ b/test/language/statements/class/async-private-method-static-await-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "await".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 class C { static async #method() {
diff --git a/test/language/statements/class/class-name-ident-await-escaped-module.js b/test/language/statements/class/class-name-ident-await-escaped-module.js
index de5fbc3994..7920c40a7d 100644
--- a/test/language/statements/class/class-name-ident-await-escaped-module.js
+++ b/test/language/statements/class/class-name-ident-await-escaped-module.js
@@ -18,6 +18,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class aw\u0061it {}
diff --git a/test/language/statements/class/class-name-ident-await-module.js b/test/language/statements/class/class-name-ident-await-module.js
index bf5fec7215..47c30e3bcb 100644
--- a/test/language/statements/class/class-name-ident-await-module.js
+++ b/test/language/statements/class/class-name-ident-await-module.js
@@ -17,6 +17,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class await {}
diff --git a/test/language/statements/class/class-name-ident-let-escaped.js b/test/language/statements/class/class-name-ident-let-escaped.js
index 5b8200c743..381779183e 100644
--- a/test/language/statements/class/class-name-ident-let-escaped.js
+++ b/test/language/statements/class/class-name-ident-let-escaped.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class l\u0065t {}
diff --git a/test/language/statements/class/class-name-ident-let.js b/test/language/statements/class/class-name-ident-let.js
index b5df0b08c9..97189a08e4 100644
--- a/test/language/statements/class/class-name-ident-let.js
+++ b/test/language/statements/class/class-name-ident-let.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class let {}
diff --git a/test/language/statements/class/class-name-ident-static-escaped.js b/test/language/statements/class/class-name-ident-static-escaped.js
index 7f32c743fe..f21044c927 100644
--- a/test/language/statements/class/class-name-ident-static-escaped.js
+++ b/test/language/statements/class/class-name-ident-static-escaped.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class st\u0061tic {}
diff --git a/test/language/statements/class/class-name-ident-static.js b/test/language/statements/class/class-name-ident-static.js
index f15c2be10b..7bbbf7da5c 100644
--- a/test/language/statements/class/class-name-ident-static.js
+++ b/test/language/statements/class/class-name-ident-static.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class static {}
diff --git a/test/language/statements/class/class-name-ident-yield-escaped.js b/test/language/statements/class/class-name-ident-yield-escaped.js
index f286b729ec..f32cfcc883 100644
--- a/test/language/statements/class/class-name-ident-yield-escaped.js
+++ b/test/language/statements/class/class-name-ident-yield-escaped.js
@@ -22,6 +22,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class yi\u0065ld {}
diff --git a/test/language/statements/class/class-name-ident-yield.js b/test/language/statements/class/class-name-ident-yield.js
index 6617221d51..bd12ed2b4c 100644
--- a/test/language/statements/class/class-name-ident-yield.js
+++ b/test/language/statements/class/class-name-ident-yield.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class yield {}
diff --git a/test/language/statements/class/definition/early-errors-class-method-NSPL-with-USD.js b/test/language/statements/class/definition/early-errors-class-method-NSPL-with-USD.js
index 04fde72047..7863bf7fcd 100644
--- a/test/language/statements/class/definition/early-errors-class-method-NSPL-with-USD.js
+++ b/test/language/statements/class/definition/early-errors-class-method-NSPL-with-USD.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 class Foo {
   async bar(x = 1) {"use strict"}
 }
diff --git a/test/language/statements/class/definition/early-errors-class-method-arguments-in-formal-parameters.js b/test/language/statements/class/definition/early-errors-class-method-arguments-in-formal-parameters.js
index ac26114536..272eb39fc8 100644
--- a/test/language/statements/class/definition/early-errors-class-method-arguments-in-formal-parameters.js
+++ b/test/language/statements/class/definition/early-errors-class-method-arguments-in-formal-parameters.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 class Foo {
   async foo (arguments) { }
 }
diff --git a/test/language/statements/class/definition/early-errors-class-method-await-in-formals-default.js b/test/language/statements/class/definition/early-errors-class-method-await-in-formals-default.js
index 71fb66a11e..559c0dcaf7 100644
--- a/test/language/statements/class/definition/early-errors-class-method-await-in-formals-default.js
+++ b/test/language/statements/class/definition/early-errors-class-method-await-in-formals-default.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 class Foo {
   async foo (x = await) {  }
 }
diff --git a/test/language/statements/class/definition/early-errors-class-method-await-in-formals.js b/test/language/statements/class/definition/early-errors-class-method-await-in-formals.js
index 6f14e0a062..e4421cec35 100644
--- a/test/language/statements/class/definition/early-errors-class-method-await-in-formals.js
+++ b/test/language/statements/class/definition/early-errors-class-method-await-in-formals.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 class Foo {
   async foo (await) {  }
 }
diff --git a/test/language/statements/class/definition/early-errors-class-method-body-contains-super-call.js b/test/language/statements/class/definition/early-errors-class-method-body-contains-super-call.js
index 0af69879e2..a5d07cf43c 100644
--- a/test/language/statements/class/definition/early-errors-class-method-body-contains-super-call.js
+++ b/test/language/statements/class/definition/early-errors-class-method-body-contains-super-call.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 class Foo {
   async foo () { super() }
 }
diff --git a/test/language/statements/class/definition/early-errors-class-method-duplicate-parameters.js b/test/language/statements/class/definition/early-errors-class-method-duplicate-parameters.js
index 022f873123..8187b54e95 100644
--- a/test/language/statements/class/definition/early-errors-class-method-duplicate-parameters.js
+++ b/test/language/statements/class/definition/early-errors-class-method-duplicate-parameters.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class Foo {
   async foo(a, a) { }
diff --git a/test/language/statements/class/definition/early-errors-class-method-eval-in-formal-parameters.js b/test/language/statements/class/definition/early-errors-class-method-eval-in-formal-parameters.js
index cd876c60fb..dd4693b156 100644
--- a/test/language/statements/class/definition/early-errors-class-method-eval-in-formal-parameters.js
+++ b/test/language/statements/class/definition/early-errors-class-method-eval-in-formal-parameters.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 class Foo {
   async foo(eval) { }
 }
diff --git a/test/language/statements/class/definition/early-errors-class-method-formals-body-duplicate.js b/test/language/statements/class/definition/early-errors-class-method-formals-body-duplicate.js
index 037ae975f6..a82d2d4114 100644
--- a/test/language/statements/class/definition/early-errors-class-method-formals-body-duplicate.js
+++ b/test/language/statements/class/definition/early-errors-class-method-formals-body-duplicate.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class Foo {
   async function foo(bar) { let bar; }
diff --git a/test/language/statements/class/definition/early-errors-class-method-formals-contains-super-call.js b/test/language/statements/class/definition/early-errors-class-method-formals-contains-super-call.js
index 1b27562083..a40ccd1013 100644
--- a/test/language/statements/class/definition/early-errors-class-method-formals-contains-super-call.js
+++ b/test/language/statements/class/definition/early-errors-class-method-formals-contains-super-call.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 class Foo {
   async foo(foo = super()) { }
 }
diff --git a/test/language/statements/class/definition/methods-gen-yield-as-function-expression-binding-identifier.js b/test/language/statements/class/definition/methods-gen-yield-as-function-expression-binding-identifier.js
index a7a9f190e8..a2aa30dff8 100644
--- a/test/language/statements/class/definition/methods-gen-yield-as-function-expression-binding-identifier.js
+++ b/test/language/statements/class/definition/methods-gen-yield-as-function-expression-binding-identifier.js
@@ -12,7 +12,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class A {
   *g() {
diff --git a/test/language/statements/class/definition/methods-gen-yield-as-identifier-in-nested-function.js b/test/language/statements/class/definition/methods-gen-yield-as-identifier-in-nested-function.js
index 2674102084..1b19a16b49 100644
--- a/test/language/statements/class/definition/methods-gen-yield-as-identifier-in-nested-function.js
+++ b/test/language/statements/class/definition/methods-gen-yield-as-identifier-in-nested-function.js
@@ -12,7 +12,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class A {
   *g() {
diff --git a/test/language/statements/class/definition/methods-gen-yield-as-logical-or-expression.js b/test/language/statements/class/definition/methods-gen-yield-as-logical-or-expression.js
index 8cb91c2642..793c5eaa55 100644
--- a/test/language/statements/class/definition/methods-gen-yield-as-logical-or-expression.js
+++ b/test/language/statements/class/definition/methods-gen-yield-as-logical-or-expression.js
@@ -11,7 +11,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class A {
   *g() {
diff --git a/test/language/statements/class/definition/methods-gen-yield-as-parameter.js b/test/language/statements/class/definition/methods-gen-yield-as-parameter.js
index 8d05b54aa9..47b9a3a42b 100644
--- a/test/language/statements/class/definition/methods-gen-yield-as-parameter.js
+++ b/test/language/statements/class/definition/methods-gen-yield-as-parameter.js
@@ -12,7 +12,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class A {
   *g(yield) {}
diff --git a/test/language/statements/class/definition/methods-gen-yield-star-after-newline.js b/test/language/statements/class/definition/methods-gen-yield-star-after-newline.js
index 9ceccbf013..46ba1149ef 100644
--- a/test/language/statements/class/definition/methods-gen-yield-star-after-newline.js
+++ b/test/language/statements/class/definition/methods-gen-yield-star-after-newline.js
@@ -11,7 +11,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class A {
   *g() {
diff --git a/test/language/statements/class/definition/methods-gen-yield-weak-binding.js b/test/language/statements/class/definition/methods-gen-yield-weak-binding.js
index 9718fabb96..47a2fedcfb 100644
--- a/test/language/statements/class/definition/methods-gen-yield-weak-binding.js
+++ b/test/language/statements/class/definition/methods-gen-yield-weak-binding.js
@@ -11,7 +11,7 @@
     type: SyntaxError
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class A {
   *g() { yield 3 + yield 4; }
diff --git a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
index 87af46c2a3..c6256a469d 100644
--- a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
index ca8a76b67c..b7553b2a77 100644
--- a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
index 594bb08c9e..9bd848fbb4 100644
--- a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
index fad6f2f493..a8b84ab684 100644
--- a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
index 06e6327dee..e95dff47b5 100644
--- a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
index e498ee291b..f1723e7535 100644
--- a/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-async-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index 69122b654e..827a4f178c 100644
--- a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
index 29be4d85b4..6ea2764bfc 100644
--- a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index 5b9cee64e6..e8e07eb8b8 100644
--- a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 1804eacca8..fa278934be 100644
--- a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index f2ad9fa735..21f65df4b0 100644
--- a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 303b62103e..cb714da1d8 100644
--- a/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-async-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-ary.js
index 348fa2eba0..a22ea06edb 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-id.js
index b61ba72a7e..8962280eb5 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-obj.js
index 88895c3719..d716bb2375 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-ary.js
index 4170f0e1fb..07b8ec378d 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-id.js
index 29c283814b..5b8070ff16 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-obj.js
index 758a5c66fb..1bdd74ffc2 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
index 8866c9ec8e..ee5d3beaf8 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
index 4751a69619..51e395a4f9 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
index e80852df9c..fabdf14c19 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index a421645d2e..1bd9749bee 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index 6223158ecb..9214fcf3c2 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index 8f3213bfaf..720ae34ecc 100644
--- a/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-async-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-ary.js
index 1d987b2739..eab5e4c17a 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-id.js
index a90b6d51a1..6acfaeb718 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-obj.js
index 8427951e5a..ba11862aaa 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-ary.js
index 20ab3f25ff..9de5c76d41 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-id.js
index 9ae8ddbe98..81095da558 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-obj.js
index da15408611..1827c57d91 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index f5fd0e7715..a736ada835 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
index 831574426a..1aced039bf 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index 20dc97714d..9d9fbfeae9 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index d56837d123..78c072f98f 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index 9fefdda25b..d3fd45260d 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index ff3c13bd7e..94fab73a4e 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-ary.js
index f7e2cf5107..87cad57fa6 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-id.js
index f4720c982e..36acbe3168 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-obj.js
index 170f8c6fcb..c176fc81eb 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
index 8962a5b97d..d7a9e70d59 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
index b1f32ca59f..7015551f91 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
index f4216774bc..57506db17e 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
index a163fcd1cc..75c54adbb6 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
index 0efaf5ca2a..2ec636a6e2 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
index cd8649acbd..f8281672e9 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index b2fe5ee81d..4fc37caa6d 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index fa9f6d7011..5d45f3ecd5 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index a874317486..13496f095a 100644
--- a/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-async-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 var callCount = 0;
diff --git a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-ary.js
index 9e653041dd..f4be97b7b1 100644
--- a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-ary.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-id.js
index 6be76be8e6..5bf65c33d2 100644
--- a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-id.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-obj.js
index 1b9dfb117d..f676c65d3d 100644
--- a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-init-obj.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
index 16e4cee0e3..fd4f8946e7 100644
--- a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
index fa0634a5c3..382c0a8a4f 100644
--- a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
index 49eaaf1c29..9bbe942cd6 100644
--- a/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index 07776cfe9e..e2cbb059ac 100644
--- a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
index c77e2e9a89..26a0589c8b 100644
--- a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index 868cf5ffe2..be7356e096 100644
--- a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index d4b2982345..f8b42a6c2d 100644
--- a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index e628cf563f..06f6314856 100644
--- a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 0cf43096af..41a4aef6b7 100644
--- a/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-ary.js
index dca90da53c..6d6bf54f45 100644
--- a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-ary.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-id.js
index 354f33c8f8..76859f0735 100644
--- a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-id.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-obj.js
index 2b1f39f7e0..7bc7a6d80c 100644
--- a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-init-obj.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-ary.js
index 5669c1c27c..0e529341b3 100644
--- a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-id.js
index 4043469048..90117ac8b4 100644
--- a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-id.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-obj.js
index d1aead4950..123ad581ce 100644
--- a/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-gen-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
index 6f85a12ef9..a61319df3c 100644
--- a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
index 1f0666192d..bb69d9a763 100644
--- a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
index 942b724f4e..c7953a0182 100644
--- a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index 66bccac42e..24a974a61e 100644
--- a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index 1a62b6d777..5e8fd23b56 100644
--- a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index b86e7558b6..64f5d5b52f 100644
--- a/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -68,7 +68,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-ary.js
index 2e5f2649c0..9a7cf01bff 100644
--- a/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-id.js
index b981702b7c..65db43a76e 100644
--- a/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-obj.js
index cf92982fd6..4061762779 100644
--- a/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-meth-ary-ptrn-rest-init-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-ary.js
index 9b21cab758..9a31816cf6 100644
--- a/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-id.js
index 7a5d641671..62b0c664b6 100644
--- a/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-obj.js
index 1827993df6..cf673d689b 100644
--- a/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-meth-ary-ptrn-rest-not-final-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
index 552fe363ad..7a3d640d56 100644
--- a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-id.js
index ea30a988b3..db1fdc67bb 100644
--- a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
index a223e1543c..1385323d0e 100644
--- a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 6eb495d566..44d38f4c0d 100644
--- a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
index 29e7fa0fc6..8415d56341 100644
--- a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 007970d151..644a249f36 100644
--- a/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-ary.js
index 2000590367..aa9dcb18aa 100644
--- a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-id.js
index c1ff228509..de1e1a9963 100644
--- a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-obj.js
index 7a680744b1..4b8efc6370 100644
--- a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-init-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-ary.js
index a221902a30..ef0979a9d9 100644
--- a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-id.js
index dbac9d9074..ef4b15c43d 100644
--- a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-obj.js
index 4fb507ea38..e81836796e 100644
--- a/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-ary.js
index 8228677a8d..bc997007bc 100644
--- a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-id.js
index ddd75cbfd0..85d4a4c33b 100644
--- a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-obj.js
index 0b7f70a187..02fa4a85da 100644
--- a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index f32a4dc65f..2f39c2aca8 100644
--- a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index b2548b236e..3838d78bc6 100644
--- a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index 0a0da912b1..35ca6791bf 100644
--- a/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -66,7 +66,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-ary.js
index 1eb3d411ee..e22c2c982c 100644
--- a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-id.js
index d711557ead..24b4394b00 100644
--- a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-obj.js
index 40722171ea..82340b7b1f 100644
--- a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-init-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-ary.js
index f16e30b702..2e1c5935cb 100644
--- a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-id.js
index 92554df2d6..154ba8996b 100644
--- a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-obj.js
index 1708097692..556cce1cbe 100644
--- a/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-private-gen-meth-ary-ptrn-rest-not-final-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
index bff9df4074..3744074211 100644
--- a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
index 6008f25cfc..2e1351080c 100644
--- a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
index 53863c1bdd..ee4cc4d761 100644
--- a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 2681c8b1bc..1d89cc1f79 100644
--- a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
index a070ab1258..7ce341dc72 100644
--- a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 8fa403eb01..e0145a117f 100644
--- a/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-private-gen-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-ary.js
index c52faa52ce..14734e0884 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-id.js
index b578f1ffb5..8eff94554c 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-obj.js
index 2c9f63f6dc..797da6ae67 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-init-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
index 33d0e8eaf3..99161618c0 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
index 07052b7b3f..cfd95e7879 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
index 7d90383aad..7481b82ab3 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
index 200cf3b260..eb4b02f202 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
index 9d87fa6802..ea0ca766ee 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
index 1454a47465..98df787d75 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index 8bb3268e5c..0849114db3 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index 2104f06d0d..175c1ebe1d 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index 188225be93..836b8ea1f7 100644
--- a/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-private-gen-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -67,7 +67,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-ary.js
index a1891e50b8..8ab71e34aa 100644
--- a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-ary.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-id.js
index f599a621fc..d76eda307b 100644
--- a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-id.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-obj.js
index 2bf7f9b9d5..5bc22221af 100644
--- a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-init-obj.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-ary.js
index 0a437a0a62..67ff7d583b 100644
--- a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-ary.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-id.js
index b2e7562d58..82a9f4e38d 100644
--- a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-id.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-obj.js
index d268392f15..ade33d3c22 100644
--- a/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-private-meth-ary-ptrn-rest-not-final-obj.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-ary.js
index ad8cbba85d..8b75312625 100644
--- a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-ary.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-id.js
index 48d552cc4a..41cdcd14da 100644
--- a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-id.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-obj.js
index 0259cdccef..801abac066 100644
--- a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-init-obj.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-ary.js
index 1132016839..b98082a7c5 100644
--- a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-ary.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-id.js
index c301cd4205..b2359f0a89 100644
--- a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-id.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-obj.js
index 0600c094b6..e81ac1e1b5 100644
--- a/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-private-meth-dflt-ary-ptrn-rest-not-final-obj.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-ary.js
index 34f18a4cd5..bd81a92b71 100644
--- a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-ary.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-id.js
index 616fb81b0b..635149f1c5 100644
--- a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-id.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-obj.js
index 0e8599f2ea..7bf9cacb66 100644
--- a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-init-obj.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-ary.js
index 53a5a0d671..564562ec73 100644
--- a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-ary.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-id.js
index f6be8a5d6c..18ddba2032 100644
--- a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-id.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-obj.js
index 6e0bdc0958..8ede380717 100644
--- a/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-private-meth-static-ary-ptrn-rest-not-final-obj.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-ary.js
index b8a543c4c0..9388a32dde 100644
--- a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-ary.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-id.js
index 2975796516..6d1c9ad131 100644
--- a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-id.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-obj.js
index bd342f6005..2d23abac26 100644
--- a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-init-obj.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
index 5d63d66028..3acb4f7832 100644
--- a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-ary.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-id.js
index e8ae10ea9d..c6e61806f5 100644
--- a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-id.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
index 9ed360e27b..d6de8d0da1 100644
--- a/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/class/dstr-private-meth-static-dflt-ary-ptrn-rest-not-final-obj.js
@@ -65,7 +65,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 class C {
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-async-gen.js b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-async-gen.js
index 8a6b407bbd..2d2e6c4cc4 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-async.js b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-async.js
index e1ed6237be..97d7c015d4 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-async.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-gen.js b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-gen.js
index 2c86256e17..b83efd60a7 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-gen.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method.js b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method.js
index dfbf4227bd..f6d74bf693 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-privatename.js b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-privatename.js
index 507208c23a..f6f7b999e1 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-call-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-async-gen.js b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-async-gen.js
index b22fe17b6b..d52a17b76f 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-async.js b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-async.js
index c823c64e07..fdbc3b4df4 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-async.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-gen.js b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-gen.js
index 023dd6b2eb..c3176dd381 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-gen.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method.js b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method.js
index dad2869b84..d48f407471 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-privatename.js b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-privatename.js
index 350edd3d69..0d9525d041 100644
--- a/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-covered-err-delete-member-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-async-gen.js b/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-async-gen.js
index b40ccdfa61..062f3cf756 100644
--- a/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-async-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-async.js b/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-async.js
index ef0f88632d..59f56cdae9 100644
--- a/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-async.js
+++ b/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-async.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-gen.js b/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-gen.js
index 9f4f322864..97ab28bbec 100644
--- a/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-gen.js
+++ b/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method.js b/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method.js
index 213f683e13..60929f1d85 100644
--- a/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method.js
+++ b/test/language/statements/class/err-field-delete-err-delete-call-expression-private-method.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-call-expression-privatename.js b/test/language/statements/class/err-field-delete-err-delete-call-expression-privatename.js
index e1e169779c..3d0159db62 100644
--- a/test/language/statements/class/err-field-delete-err-delete-call-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-err-delete-call-expression-privatename.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-async-gen.js b/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-async-gen.js
index 21a065eae1..d871a0ca83 100644
--- a/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-async-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-async.js b/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-async.js
index dbe1543221..8184ae838b 100644
--- a/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-async.js
+++ b/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-async.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-gen.js b/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-gen.js
index bce497d152..8d018d5b2f 100644
--- a/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-gen.js
+++ b/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method.js b/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method.js
index f82018f6ff..465abbb386 100644
--- a/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method.js
+++ b/test/language/statements/class/err-field-delete-err-delete-member-expression-private-method.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-err-delete-member-expression-privatename.js b/test/language/statements/class/err-field-delete-err-delete-member-expression-privatename.js
index 2ac9dfa4d5..2b58d8ddb9 100644
--- a/test/language/statements/class/err-field-delete-err-delete-member-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-err-delete-member-expression-privatename.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
index 487ffc6394..5401c658e8 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async.js
index 4c68a30fec..87aedd27d1 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-gen.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-gen.js
index ac44170786..c3ef53430d 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-gen.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method.js
index 6c27f833e1..1ba0303c73 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-privatename.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-privatename.js
index 05c99a150a..a625a2688f 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-call-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
index 5d210439cb..2f5077c343 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async.js
index 9afdccbbf5..8d20348a49 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-gen.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-gen.js
index aa7b522686..0208c72940 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-gen.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method.js
index b89f624458..d4200f1081 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-privatename.js b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-privatename.js
index fe0198bca5..63b0d55da8 100644
--- a/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-privatename.js
+++ b/test/language/statements/class/err-field-delete-twice-covered-err-delete-member-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-async-gen.js b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-async-gen.js
index 94ff844ac4..92dca7c8f0 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-async.js b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-async.js
index 7c8a8c7bde..dc7a659645 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-async.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-gen.js b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-gen.js
index 193778fab3..faeaffc6a7 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-gen.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method.js b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method.js
index 0dbabe9e36..3e5bd75028 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-privatename.js b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-privatename.js
index 75020c1f8b..02a0955182 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-call-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-async-gen.js b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-async-gen.js
index 7feb0395c7..931bc09a41 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-async.js b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-async.js
index 2320769bd5..516ffa9df2 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-async.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-gen.js b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-gen.js
index 3fa4fed0a2..641decb4fd 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-gen.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method.js b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method.js
index 1e9f71756f..bb1d7fa31f 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-privatename.js b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-privatename.js
index ea5d1fdfce..fd2ced4d3c 100644
--- a/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-covered-err-delete-member-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-async-gen.js b/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-async-gen.js
index 514e3b6dd2..949a8636ac 100644
--- a/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-async-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-async.js b/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-async.js
index 51640775c0..a8f6cee74a 100644
--- a/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-async.js
+++ b/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-async.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-gen.js b/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-gen.js
index 79a94ae590..b8f10c4991 100644
--- a/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-gen.js
+++ b/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method.js b/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method.js
index a96a853e2b..259e5ede8f 100644
--- a/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method.js
+++ b/test/language/statements/class/err-method-delete-err-delete-call-expression-private-method.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-call-expression-privatename.js b/test/language/statements/class/err-method-delete-err-delete-call-expression-privatename.js
index 00be4aac34..0ca5c056b9 100644
--- a/test/language/statements/class/err-method-delete-err-delete-call-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-err-delete-call-expression-privatename.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-async-gen.js b/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-async-gen.js
index feb953f991..677a116249 100644
--- a/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-async-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-async.js b/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-async.js
index 8add12ce8f..3a68b051bb 100644
--- a/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-async.js
+++ b/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-async.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-gen.js b/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-gen.js
index 5a927e666e..06b065f834 100644
--- a/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-gen.js
+++ b/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method-gen.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method.js b/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method.js
index aedb170ba0..c32d662170 100644
--- a/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method.js
+++ b/test/language/statements/class/err-method-delete-err-delete-member-expression-private-method.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-err-delete-member-expression-privatename.js b/test/language/statements/class/err-method-delete-err-delete-member-expression-privatename.js
index 5aa4c92f05..3a5947f3f7 100644
--- a/test/language/statements/class/err-method-delete-err-delete-member-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-err-delete-member-expression-privatename.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
index 48eb225744..095e49fab9 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async.js
index 660db0de92..2f77dab3a6 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-gen.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-gen.js
index e76c2b1a53..4ee1112a1c 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-gen.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method.js
index 4bd6e21b2a..b9797584c5 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-privatename.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-privatename.js
index c88e90108e..1af3b8353d 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-call-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
index 7f04ddf3aa..0a656f6a3d 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async.js
index e11fc81f79..0770b60eff 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-async.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-gen.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-gen.js
index 3b9677a45d..0aa68fa26e 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-gen.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method-gen.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method.js
index 3901c7e900..8a0cdcbe6a 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-private-method.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-privatename.js b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-privatename.js
index 7a0e9ec5b4..6b4e616a88 100644
--- a/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-privatename.js
+++ b/test/language/statements/class/err-method-delete-twice-covered-err-delete-member-expression-privatename.js
@@ -29,7 +29,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/fields-arrow-fnc-init-err-contains-arguments.js b/test/language/statements/class/fields-arrow-fnc-init-err-contains-arguments.js
index de0ff209ca..bbf5f44cc7 100644
--- a/test/language/statements/class/fields-arrow-fnc-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-arrow-fnc-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = () => arguments;
diff --git a/test/language/statements/class/fields-arrow-fnc-init-err-contains-super.js b/test/language/statements/class/fields-arrow-fnc-init-err-contains-super.js
index 53d7013741..db382637a8 100644
--- a/test/language/statements/class/fields-arrow-fnc-init-err-contains-super.js
+++ b/test/language/statements/class/fields-arrow-fnc-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = () => super();
diff --git a/test/language/statements/class/fields-asi-3.js b/test/language/statements/class/fields-asi-3.js
index 6202db3971..e0673f5b77 100644
--- a/test/language/statements/class/fields-asi-3.js
+++ b/test/language/statements/class/fields-asi-3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = "string"
diff --git a/test/language/statements/class/fields-asi-4.js b/test/language/statements/class/fields-asi-4.js
index 9580823c39..6555fb9f0a 100644
--- a/test/language/statements/class/fields-asi-4.js
+++ b/test/language/statements/class/fields-asi-4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = 42
diff --git a/test/language/statements/class/fields-comp-name-init-err-contains-arguments.js b/test/language/statements/class/fields-comp-name-init-err-contains-arguments.js
index 44e048c54d..4e181b2f9e 100644
--- a/test/language/statements/class/fields-comp-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-comp-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 class C {
diff --git a/test/language/statements/class/fields-comp-name-init-err-contains-super.js b/test/language/statements/class/fields-comp-name-init-err-contains-super.js
index 08f87a2f7d..57ea2988a9 100644
--- a/test/language/statements/class/fields-comp-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-comp-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 class C {
diff --git a/test/language/statements/class/fields-duplicate-privatenames.js b/test/language/statements/class/fields-duplicate-privatenames.js
index f11b917e19..df1fa5340d 100644
--- a/test/language/statements/class/fields-duplicate-privatenames.js
+++ b/test/language/statements/class/fields-duplicate-privatenames.js
@@ -16,7 +16,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/fields-equality-init-err-contains-arguments.js b/test/language/statements/class/fields-equality-init-err-contains-arguments.js
index c67c8f549d..788c8eae00 100644
--- a/test/language/statements/class/fields-equality-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-equality-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = {} == arguments;
diff --git a/test/language/statements/class/fields-equality-init-err-contains-super.js b/test/language/statements/class/fields-equality-init-err-contains-super.js
index a54a5f6b7c..b62b3e6573 100644
--- a/test/language/statements/class/fields-equality-init-err-contains-super.js
+++ b/test/language/statements/class/fields-equality-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = {} == super();
diff --git a/test/language/statements/class/fields-literal-name-init-err-contains-arguments.js b/test/language/statements/class/fields-literal-name-init-err-contains-arguments.js
index ac99fcf317..c25eea3d83 100644
--- a/test/language/statements/class/fields-literal-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-literal-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = arguments;
diff --git a/test/language/statements/class/fields-literal-name-init-err-contains-super.js b/test/language/statements/class/fields-literal-name-init-err-contains-super.js
index 3fe2478729..21a6837656 100644
--- a/test/language/statements/class/fields-literal-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-literal-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = super();
diff --git a/test/language/statements/class/fields-literal-name-propname-constructor.js b/test/language/statements/class/fields-literal-name-propname-constructor.js
index 0444f0320a..94ef349aa1 100644
--- a/test/language/statements/class/fields-literal-name-propname-constructor.js
+++ b/test/language/statements/class/fields-literal-name-propname-constructor.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   constructor;
diff --git a/test/language/statements/class/fields-literal-name-static-propname-constructor.js b/test/language/statements/class/fields-literal-name-static-propname-constructor.js
index 567974edbb..e06ebc9eb9 100644
--- a/test/language/statements/class/fields-literal-name-static-propname-constructor.js
+++ b/test/language/statements/class/fields-literal-name-static-propname-constructor.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static constructor;
diff --git a/test/language/statements/class/fields-literal-name-static-propname-prototype.js b/test/language/statements/class/fields-literal-name-static-propname-prototype.js
index 3dc0065a76..82bc7c1346 100644
--- a/test/language/statements/class/fields-literal-name-static-propname-prototype.js
+++ b/test/language/statements/class/fields-literal-name-static-propname-prototype.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static prototype;
diff --git a/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-arguments.js b/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-arguments.js
index 561821ccde..4ee33a1b32 100644
--- a/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = () => arguments;
diff --git a/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-super.js b/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-super.js
index 28497ddf37..6f4aeb6925 100644
--- a/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-super.js
+++ b/test/language/statements/class/fields-private-arrow-fnc-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = () => super();
diff --git a/test/language/statements/class/fields-private-literal-name-init-err-contains-arguments.js b/test/language/statements/class/fields-private-literal-name-init-err-contains-arguments.js
index 92f4e36759..ed7106f6ed 100644
--- a/test/language/statements/class/fields-private-literal-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-private-literal-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = arguments;
diff --git a/test/language/statements/class/fields-private-literal-name-init-err-contains-super.js b/test/language/statements/class/fields-private-literal-name-init-err-contains-super.js
index 198e10a91c..acec2e90b7 100644
--- a/test/language/statements/class/fields-private-literal-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-private-literal-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = super();
diff --git a/test/language/statements/class/fields-private-ternary-init-err-contains-arguments.js b/test/language/statements/class/fields-private-ternary-init-err-contains-arguments.js
index f607fffc48..3cada56c08 100644
--- a/test/language/statements/class/fields-private-ternary-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-private-ternary-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = false ? {} : arguments;
diff --git a/test/language/statements/class/fields-private-ternary-init-err-contains-super.js b/test/language/statements/class/fields-private-ternary-init-err-contains-super.js
index 9804cee83a..4dbb05dabf 100644
--- a/test/language/statements/class/fields-private-ternary-init-err-contains-super.js
+++ b/test/language/statements/class/fields-private-ternary-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = false ? {} : super();
diff --git a/test/language/statements/class/fields-private-typeof-init-err-contains-arguments.js b/test/language/statements/class/fields-private-typeof-init-err-contains-arguments.js
index ed44a615b3..086c2e6ac8 100644
--- a/test/language/statements/class/fields-private-typeof-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-private-typeof-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = typeof arguments;
diff --git a/test/language/statements/class/fields-private-typeof-init-err-contains-super.js b/test/language/statements/class/fields-private-typeof-init-err-contains-super.js
index bf04170208..1eb8cdf702 100644
--- a/test/language/statements/class/fields-private-typeof-init-err-contains-super.js
+++ b/test/language/statements/class/fields-private-typeof-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x = typeof super();
diff --git a/test/language/statements/class/fields-static-comp-name-init-err-contains-arguments.js b/test/language/statements/class/fields-static-comp-name-init-err-contains-arguments.js
index 145338bcb9..e7e429c8e9 100644
--- a/test/language/statements/class/fields-static-comp-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-static-comp-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 class C {
diff --git a/test/language/statements/class/fields-static-comp-name-init-err-contains-super.js b/test/language/statements/class/fields-static-comp-name-init-err-contains-super.js
index 41398aae9d..d6393750b0 100644
--- a/test/language/statements/class/fields-static-comp-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-static-comp-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x = "string";
 class C {
diff --git a/test/language/statements/class/fields-static-literal-init-err-contains-arguments.js b/test/language/statements/class/fields-static-literal-init-err-contains-arguments.js
index 727648cbc1..27f0b3fef8 100644
--- a/test/language/statements/class/fields-static-literal-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-static-literal-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static x = arguments;
diff --git a/test/language/statements/class/fields-static-literal-init-err-contains-super.js b/test/language/statements/class/fields-static-literal-init-err-contains-super.js
index ba59cfd1ad..4ec490388d 100644
--- a/test/language/statements/class/fields-static-literal-init-err-contains-super.js
+++ b/test/language/statements/class/fields-static-literal-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static x = super();
diff --git a/test/language/statements/class/fields-static-private-init-err-contains-arguments.js b/test/language/statements/class/fields-static-private-init-err-contains-arguments.js
index b58178c03e..21ce89787e 100644
--- a/test/language/statements/class/fields-static-private-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-static-private-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static #x = arguments;
diff --git a/test/language/statements/class/fields-static-private-init-err-contains-super.js b/test/language/statements/class/fields-static-private-init-err-contains-super.js
index af8d7e99c0..874914a686 100644
--- a/test/language/statements/class/fields-static-private-init-err-contains-super.js
+++ b/test/language/statements/class/fields-static-private-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static #x = super();
diff --git a/test/language/statements/class/fields-static-string-literal-name-init-err-contains-arguments.js b/test/language/statements/class/fields-static-string-literal-name-init-err-contains-arguments.js
index 134b38f256..5167f90360 100644
--- a/test/language/statements/class/fields-static-string-literal-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-static-string-literal-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static 'x' = arguments;
diff --git a/test/language/statements/class/fields-static-string-literal-name-init-err-contains-super.js b/test/language/statements/class/fields-static-string-literal-name-init-err-contains-super.js
index 5cf1963ff7..8d74dedd99 100644
--- a/test/language/statements/class/fields-static-string-literal-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-static-string-literal-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static 'x' = super();
diff --git a/test/language/statements/class/fields-string-literal-name-init-err-contains-arguments.js b/test/language/statements/class/fields-string-literal-name-init-err-contains-arguments.js
index 149c2e3f50..95dd4ca9ab 100644
--- a/test/language/statements/class/fields-string-literal-name-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-string-literal-name-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   'x' = arguments;
diff --git a/test/language/statements/class/fields-string-literal-name-init-err-contains-super.js b/test/language/statements/class/fields-string-literal-name-init-err-contains-super.js
index 1bf053181c..e1a5353a93 100644
--- a/test/language/statements/class/fields-string-literal-name-init-err-contains-super.js
+++ b/test/language/statements/class/fields-string-literal-name-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   'x' = super();
diff --git a/test/language/statements/class/fields-string-name-propname-constructor.js b/test/language/statements/class/fields-string-name-propname-constructor.js
index 3ee5366bfa..fdaec48a6d 100644
--- a/test/language/statements/class/fields-string-name-propname-constructor.js
+++ b/test/language/statements/class/fields-string-name-propname-constructor.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   'constructor';
diff --git a/test/language/statements/class/fields-string-name-static-propname-constructor.js b/test/language/statements/class/fields-string-name-static-propname-constructor.js
index 180a470787..45ce2a99c6 100644
--- a/test/language/statements/class/fields-string-name-static-propname-constructor.js
+++ b/test/language/statements/class/fields-string-name-static-propname-constructor.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static 'constructor';
diff --git a/test/language/statements/class/fields-string-name-static-propname-prototype.js b/test/language/statements/class/fields-string-name-static-propname-prototype.js
index 0762500d4a..1ffe87e982 100644
--- a/test/language/statements/class/fields-string-name-static-propname-prototype.js
+++ b/test/language/statements/class/fields-string-name-static-propname-prototype.js
@@ -23,7 +23,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static 'prototype';
diff --git a/test/language/statements/class/fields-ternary-init-err-contains-arguments.js b/test/language/statements/class/fields-ternary-init-err-contains-arguments.js
index fbdf2ffd07..724cb15ee0 100644
--- a/test/language/statements/class/fields-ternary-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-ternary-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = false ? {} : arguments;
diff --git a/test/language/statements/class/fields-ternary-init-err-contains-super.js b/test/language/statements/class/fields-ternary-init-err-contains-super.js
index f82522e69f..188572eba1 100644
--- a/test/language/statements/class/fields-ternary-init-err-contains-super.js
+++ b/test/language/statements/class/fields-ternary-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = false ? {} : super();
diff --git a/test/language/statements/class/fields-typeof-init-err-contains-arguments.js b/test/language/statements/class/fields-typeof-init-err-contains-arguments.js
index ddbaa283a0..1aa6a00d17 100644
--- a/test/language/statements/class/fields-typeof-init-err-contains-arguments.js
+++ b/test/language/statements/class/fields-typeof-init-err-contains-arguments.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = typeof arguments;
diff --git a/test/language/statements/class/fields-typeof-init-err-contains-super.js b/test/language/statements/class/fields-typeof-init-err-contains-super.js
index cc30095958..25770876ac 100644
--- a/test/language/statements/class/fields-typeof-init-err-contains-super.js
+++ b/test/language/statements/class/fields-typeof-init-err-contains-super.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x = typeof super();
diff --git a/test/language/statements/class/gen-meth-dflt-params-duplicates.js b/test/language/statements/class/gen-meth-dflt-params-duplicates.js
index 9f41bc0526..d84ad36b36 100644
--- a/test/language/statements/class/gen-meth-dflt-params-duplicates.js
+++ b/test/language/statements/class/gen-meth-dflt-params-duplicates.js
@@ -76,7 +76,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   *method(x = 0, x) {
diff --git a/test/language/statements/class/gen-meth-dflt-params-rest.js b/test/language/statements/class/gen-meth-dflt-params-rest.js
index f2a770a4f4..c0f93f96cd 100644
--- a/test/language/statements/class/gen-meth-dflt-params-rest.js
+++ b/test/language/statements/class/gen-meth-dflt-params-rest.js
@@ -80,7 +80,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   *method(...x = []) {
diff --git a/test/language/statements/class/gen-meth-rest-params-trailing-comma-early-error.js b/test/language/statements/class/gen-meth-rest-params-trailing-comma-early-error.js
index 298f05b1f0..9ed392cd54 100644
--- a/test/language/statements/class/gen-meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/class/gen-meth-rest-params-trailing-comma-early-error.js
@@ -73,7 +73,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   *method(...a,) {
diff --git a/test/language/statements/class/gen-meth-static-dflt-params-duplicates.js b/test/language/statements/class/gen-meth-static-dflt-params-duplicates.js
index b43da3b4cd..56655b074b 100644
--- a/test/language/statements/class/gen-meth-static-dflt-params-duplicates.js
+++ b/test/language/statements/class/gen-meth-static-dflt-params-duplicates.js
@@ -76,7 +76,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static *method(x = 0, x) {
diff --git a/test/language/statements/class/gen-meth-static-dflt-params-rest.js b/test/language/statements/class/gen-meth-static-dflt-params-rest.js
index c052573269..ed91739784 100644
--- a/test/language/statements/class/gen-meth-static-dflt-params-rest.js
+++ b/test/language/statements/class/gen-meth-static-dflt-params-rest.js
@@ -80,7 +80,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static *method(...x = []) {
diff --git a/test/language/statements/class/gen-meth-static-rest-params-trailing-comma-early-error.js b/test/language/statements/class/gen-meth-static-rest-params-trailing-comma-early-error.js
index 95c054e52a..15696ef5df 100644
--- a/test/language/statements/class/gen-meth-static-rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/class/gen-meth-static-rest-params-trailing-comma-early-error.js
@@ -73,7 +73,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static *method(...a,) {
diff --git a/test/language/statements/class/gen-method-param-dflt-yield.js b/test/language/statements/class/gen-method-param-dflt-yield.js
index dfb543578d..5d86d28e81 100644
--- a/test/language/statements/class/gen-method-param-dflt-yield.js
+++ b/test/language/statements/class/gen-method-param-dflt-yield.js
@@ -20,7 +20,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   *g(x = yield) {}
diff --git a/test/language/statements/class/gen-method-static-yield-as-binding-identifier-escaped.js b/test/language/statements/class/gen-method-static-yield-as-binding-identifier-escaped.js
index c6eede6b26..489eb88615 100644
--- a/test/language/statements/class/gen-method-static-yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/gen-method-static-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *gen() {
     var yi\u0065ld;
diff --git a/test/language/statements/class/gen-method-static-yield-as-binding-identifier.js b/test/language/statements/class/gen-method-static-yield-as-binding-identifier.js
index 7e482b305c..3bb41c49b9 100644
--- a/test/language/statements/class/gen-method-static-yield-as-binding-identifier.js
+++ b/test/language/statements/class/gen-method-static-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *gen() {
     var yield;
diff --git a/test/language/statements/class/gen-method-static-yield-as-identifier-reference-escaped.js b/test/language/statements/class/gen-method-static-yield-as-identifier-reference-escaped.js
index 59f717b15c..d0e2034eb4 100644
--- a/test/language/statements/class/gen-method-static-yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/gen-method-static-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *gen() {
     void yi\u0065ld;
diff --git a/test/language/statements/class/gen-method-static-yield-as-identifier-reference.js b/test/language/statements/class/gen-method-static-yield-as-identifier-reference.js
index 72da5e23f5..d2f5c1c2e4 100644
--- a/test/language/statements/class/gen-method-static-yield-as-identifier-reference.js
+++ b/test/language/statements/class/gen-method-static-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *gen() {
     void yield;
diff --git a/test/language/statements/class/gen-method-static-yield-as-label-identifier-escaped.js b/test/language/statements/class/gen-method-static-yield-as-label-identifier-escaped.js
index 37fb0bfb64..352c04052c 100644
--- a/test/language/statements/class/gen-method-static-yield-as-label-identifier-escaped.js
+++ b/test/language/statements/class/gen-method-static-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *gen() {
     yi\u0065ld: ;
diff --git a/test/language/statements/class/gen-method-static-yield-as-label-identifier.js b/test/language/statements/class/gen-method-static-yield-as-label-identifier.js
index fd75ee7159..5acb8db9c4 100644
--- a/test/language/statements/class/gen-method-static-yield-as-label-identifier.js
+++ b/test/language/statements/class/gen-method-static-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *gen() {
     yield: ;
diff --git a/test/language/statements/class/gen-method-static-yield-identifier-spread-strict.js b/test/language/statements/class/gen-method-static-yield-identifier-spread-strict.js
index 2203feeb3d..44127bcce8 100644
--- a/test/language/statements/class/gen-method-static-yield-identifier-spread-strict.js
+++ b/test/language/statements/class/gen-method-static-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/class/gen-method-static-yield-identifier-strict.js b/test/language/statements/class/gen-method-static-yield-identifier-strict.js
index ddb5f40ad2..79944724b9 100644
--- a/test/language/statements/class/gen-method-static-yield-identifier-strict.js
+++ b/test/language/statements/class/gen-method-static-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/class/gen-method-yield-as-binding-identifier-escaped.js b/test/language/statements/class/gen-method-yield-as-binding-identifier-escaped.js
index 42b6805914..b899fc36f2 100644
--- a/test/language/statements/class/gen-method-yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/gen-method-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *gen() {
     var yi\u0065ld;
diff --git a/test/language/statements/class/gen-method-yield-as-binding-identifier.js b/test/language/statements/class/gen-method-yield-as-binding-identifier.js
index 8d8cfdedd3..05acb05469 100644
--- a/test/language/statements/class/gen-method-yield-as-binding-identifier.js
+++ b/test/language/statements/class/gen-method-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *gen() {
     var yield;
diff --git a/test/language/statements/class/gen-method-yield-as-identifier-reference-escaped.js b/test/language/statements/class/gen-method-yield-as-identifier-reference-escaped.js
index 1f4671d6d3..1d23221a01 100644
--- a/test/language/statements/class/gen-method-yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/gen-method-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *gen() {
     void yi\u0065ld;
diff --git a/test/language/statements/class/gen-method-yield-as-identifier-reference.js b/test/language/statements/class/gen-method-yield-as-identifier-reference.js
index 3c77eb5ea4..a94c061ba6 100644
--- a/test/language/statements/class/gen-method-yield-as-identifier-reference.js
+++ b/test/language/statements/class/gen-method-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *gen() {
     void yield;
diff --git a/test/language/statements/class/gen-method-yield-as-label-identifier-escaped.js b/test/language/statements/class/gen-method-yield-as-label-identifier-escaped.js
index 0d4cf302d2..de0dee6304 100644
--- a/test/language/statements/class/gen-method-yield-as-label-identifier-escaped.js
+++ b/test/language/statements/class/gen-method-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *gen() {
     yi\u0065ld: ;
diff --git a/test/language/statements/class/gen-method-yield-as-label-identifier.js b/test/language/statements/class/gen-method-yield-as-label-identifier.js
index de704cb37f..f0241d4cbd 100644
--- a/test/language/statements/class/gen-method-yield-as-label-identifier.js
+++ b/test/language/statements/class/gen-method-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *gen() {
     yield: ;
diff --git a/test/language/statements/class/gen-method-yield-identifier-spread-strict.js b/test/language/statements/class/gen-method-yield-identifier-spread-strict.js
index 39daaabc69..654bb6b86f 100644
--- a/test/language/statements/class/gen-method-yield-identifier-spread-strict.js
+++ b/test/language/statements/class/gen-method-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/class/gen-method-yield-identifier-strict.js b/test/language/statements/class/gen-method-yield-identifier-strict.js
index 6463f9d395..5f9701c29e 100644
--- a/test/language/statements/class/gen-method-yield-identifier-strict.js
+++ b/test/language/statements/class/gen-method-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/class/gen-private-method-static-yield-as-binding-identifier-escaped.js b/test/language/statements/class/gen-private-method-static-yield-as-binding-identifier-escaped.js
index b83baa3279..33669d4d01 100644
--- a/test/language/statements/class/gen-private-method-static-yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/gen-private-method-static-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *#gen() {
     var yi\u0065ld;
diff --git a/test/language/statements/class/gen-private-method-static-yield-as-binding-identifier.js b/test/language/statements/class/gen-private-method-static-yield-as-binding-identifier.js
index c0f3b95d0c..3a0c7321c8 100644
--- a/test/language/statements/class/gen-private-method-static-yield-as-binding-identifier.js
+++ b/test/language/statements/class/gen-private-method-static-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *#gen() {
     var yield;
diff --git a/test/language/statements/class/gen-private-method-static-yield-as-identifier-reference-escaped.js b/test/language/statements/class/gen-private-method-static-yield-as-identifier-reference-escaped.js
index fca84cfda8..f5c134dbc7 100644
--- a/test/language/statements/class/gen-private-method-static-yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/gen-private-method-static-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *#gen() {
     void yi\u0065ld;
diff --git a/test/language/statements/class/gen-private-method-static-yield-as-identifier-reference.js b/test/language/statements/class/gen-private-method-static-yield-as-identifier-reference.js
index 81aadc554e..69464a528f 100644
--- a/test/language/statements/class/gen-private-method-static-yield-as-identifier-reference.js
+++ b/test/language/statements/class/gen-private-method-static-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *#gen() {
     void yield;
diff --git a/test/language/statements/class/gen-private-method-static-yield-as-label-identifier-escaped.js b/test/language/statements/class/gen-private-method-static-yield-as-label-identifier-escaped.js
index 5f7aa8595a..966805bb54 100644
--- a/test/language/statements/class/gen-private-method-static-yield-as-label-identifier-escaped.js
+++ b/test/language/statements/class/gen-private-method-static-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *#gen() {
     yi\u0065ld: ;
diff --git a/test/language/statements/class/gen-private-method-static-yield-as-label-identifier.js b/test/language/statements/class/gen-private-method-static-yield-as-label-identifier.js
index 9fabc993c9..9203464498 100644
--- a/test/language/statements/class/gen-private-method-static-yield-as-label-identifier.js
+++ b/test/language/statements/class/gen-private-method-static-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {static *#gen() {
     yield: ;
diff --git a/test/language/statements/class/gen-private-method-static-yield-identifier-spread-strict.js b/test/language/statements/class/gen-private-method-static-yield-identifier-spread-strict.js
index 7f7f9ac7cd..6505041bd9 100644
--- a/test/language/statements/class/gen-private-method-static-yield-identifier-spread-strict.js
+++ b/test/language/statements/class/gen-private-method-static-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/class/gen-private-method-static-yield-identifier-strict.js b/test/language/statements/class/gen-private-method-static-yield-identifier-strict.js
index 058e56cb2a..56982df2a5 100644
--- a/test/language/statements/class/gen-private-method-static-yield-identifier-strict.js
+++ b/test/language/statements/class/gen-private-method-static-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/class/gen-private-method-yield-as-binding-identifier-escaped.js b/test/language/statements/class/gen-private-method-yield-as-binding-identifier-escaped.js
index 133e8cb786..52fc26c2b7 100644
--- a/test/language/statements/class/gen-private-method-yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/class/gen-private-method-yield-as-binding-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *#gen() {
     var yi\u0065ld;
diff --git a/test/language/statements/class/gen-private-method-yield-as-binding-identifier.js b/test/language/statements/class/gen-private-method-yield-as-binding-identifier.js
index 6c74085389..0993a44d17 100644
--- a/test/language/statements/class/gen-private-method-yield-as-binding-identifier.js
+++ b/test/language/statements/class/gen-private-method-yield-as-binding-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *#gen() {
     var yield;
diff --git a/test/language/statements/class/gen-private-method-yield-as-identifier-reference-escaped.js b/test/language/statements/class/gen-private-method-yield-as-identifier-reference-escaped.js
index 7ad7f3efd9..c6267f5c1b 100644
--- a/test/language/statements/class/gen-private-method-yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/class/gen-private-method-yield-as-identifier-reference-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *#gen() {
     void yi\u0065ld;
diff --git a/test/language/statements/class/gen-private-method-yield-as-identifier-reference.js b/test/language/statements/class/gen-private-method-yield-as-identifier-reference.js
index 3696b4e090..0844e9c233 100644
--- a/test/language/statements/class/gen-private-method-yield-as-identifier-reference.js
+++ b/test/language/statements/class/gen-private-method-yield-as-identifier-reference.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *#gen() {
     void yield;
diff --git a/test/language/statements/class/gen-private-method-yield-as-label-identifier-escaped.js b/test/language/statements/class/gen-private-method-yield-as-label-identifier-escaped.js
index 04624607f6..3016bd3dfc 100644
--- a/test/language/statements/class/gen-private-method-yield-as-label-identifier-escaped.js
+++ b/test/language/statements/class/gen-private-method-yield-as-label-identifier-escaped.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *#gen() {
     yi\u0065ld: ;
diff --git a/test/language/statements/class/gen-private-method-yield-as-label-identifier.js b/test/language/statements/class/gen-private-method-yield-as-label-identifier.js
index fc5882a031..1714ffdace 100644
--- a/test/language/statements/class/gen-private-method-yield-as-label-identifier.js
+++ b/test/language/statements/class/gen-private-method-yield-as-label-identifier.js
@@ -28,7 +28,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { *#gen() {
     yield: ;
diff --git a/test/language/statements/class/gen-private-method-yield-identifier-spread-strict.js b/test/language/statements/class/gen-private-method-yield-identifier-spread-strict.js
index f02de26683..9e29ca671b 100644
--- a/test/language/statements/class/gen-private-method-yield-identifier-spread-strict.js
+++ b/test/language/statements/class/gen-private-method-yield-identifier-spread-strict.js
@@ -29,7 +29,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/class/gen-private-method-yield-identifier-strict.js b/test/language/statements/class/gen-private-method-yield-identifier-strict.js
index be941e5d79..06c84b9a7a 100644
--- a/test/language/statements/class/gen-private-method-yield-identifier-strict.js
+++ b/test/language/statements/class/gen-private-method-yield-identifier-strict.js
@@ -22,7 +22,7 @@ info: |
       * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/class/getter-param-dflt.js b/test/language/statements/class/getter-param-dflt.js
index 8f620611a6..a6bbd1d98e 100644
--- a/test/language/statements/class/getter-param-dflt.js
+++ b/test/language/statements/class/getter-param-dflt.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C { get a(param = null) {} }
diff --git a/test/language/statements/class/meth-dflt-params-duplicates.js b/test/language/statements/class/meth-dflt-params-duplicates.js
index 00aa22e295..fd62ecafc8 100644
--- a/test/language/statements/class/meth-dflt-params-duplicates.js
+++ b/test/language/statements/class/meth-dflt-params-duplicates.js
@@ -73,7 +73,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   method(x = 0, x) {
diff --git a/test/language/statements/class/meth-dflt-params-rest.js b/test/language/statements/class/meth-dflt-params-rest.js
index 667bec8370..678b00377a 100644
--- a/test/language/statements/class/meth-dflt-params-rest.js
+++ b/test/language/statements/class/meth-dflt-params-rest.js
@@ -77,7 +77,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   method(...x = []) {
diff --git a/test/language/statements/class/meth-rest-params-trailing-comma-early-error.js b/test/language/statements/class/meth-rest-params-trailing-comma-early-error.js
index a3dc745a5b..e9e44b744a 100644
--- a/test/language/statements/class/meth-rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/class/meth-rest-params-trailing-comma-early-error.js
@@ -69,7 +69,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   method(...a,) {
diff --git a/test/language/statements/class/meth-static-dflt-params-duplicates.js b/test/language/statements/class/meth-static-dflt-params-duplicates.js
index 8e23c65ae9..e9b5e534c8 100644
--- a/test/language/statements/class/meth-static-dflt-params-duplicates.js
+++ b/test/language/statements/class/meth-static-dflt-params-duplicates.js
@@ -73,7 +73,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static method(x = 0, x) {
diff --git a/test/language/statements/class/meth-static-dflt-params-rest.js b/test/language/statements/class/meth-static-dflt-params-rest.js
index d81f9d6bd4..b213a94a54 100644
--- a/test/language/statements/class/meth-static-dflt-params-rest.js
+++ b/test/language/statements/class/meth-static-dflt-params-rest.js
@@ -77,7 +77,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static method(...x = []) {
diff --git a/test/language/statements/class/meth-static-rest-params-trailing-comma-early-error.js b/test/language/statements/class/meth-static-rest-params-trailing-comma-early-error.js
index ffcdde7f1d..92e53d893b 100644
--- a/test/language/statements/class/meth-static-rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/class/meth-static-rest-params-trailing-comma-early-error.js
@@ -69,7 +69,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static method(...a,) {
diff --git a/test/language/statements/class/method-param-yield.js b/test/language/statements/class/method-param-yield.js
index a0f2a0bb81..4d36107757 100644
--- a/test/language/statements/class/method-param-yield.js
+++ b/test/language/statements/class/method-param-yield.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   m(x = yield) {}
diff --git a/test/language/statements/class/privatename-not-valid-earlyerr-script-1.js b/test/language/statements/class/privatename-not-valid-earlyerr-script-1.js
index 0cf870c660..4ae78c8820 100644
--- a/test/language/statements/class/privatename-not-valid-earlyerr-script-1.js
+++ b/test/language/statements/class/privatename-not-valid-earlyerr-script-1.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   constructor() {
diff --git a/test/language/statements/class/privatename-not-valid-earlyerr-script-2.js b/test/language/statements/class/privatename-not-valid-earlyerr-script-2.js
index d7b520143b..29662b9873 100644
--- a/test/language/statements/class/privatename-not-valid-earlyerr-script-2.js
+++ b/test/language/statements/class/privatename-not-valid-earlyerr-script-2.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   f() {
diff --git a/test/language/statements/class/privatename-not-valid-earlyerr-script-3.js b/test/language/statements/class/privatename-not-valid-earlyerr-script-3.js
index d6b67b3323..b75c130513 100644
--- a/test/language/statements/class/privatename-not-valid-earlyerr-script-3.js
+++ b/test/language/statements/class/privatename-not-valid-earlyerr-script-3.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   y = this.#x;
diff --git a/test/language/statements/class/privatename-not-valid-earlyerr-script-4.js b/test/language/statements/class/privatename-not-valid-earlyerr-script-4.js
index 5514db3a55..cb0bbf8b57 100644
--- a/test/language/statements/class/privatename-not-valid-earlyerr-script-4.js
+++ b/test/language/statements/class/privatename-not-valid-earlyerr-script-4.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   f() {
diff --git a/test/language/statements/class/privatename-not-valid-earlyerr-script-5.js b/test/language/statements/class/privatename-not-valid-earlyerr-script-5.js
index c5ecd15a75..f4367ef08a 100644
--- a/test/language/statements/class/privatename-not-valid-earlyerr-script-5.js
+++ b/test/language/statements/class/privatename-not-valid-earlyerr-script-5.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/privatename-not-valid-earlyerr-script-6.js b/test/language/statements/class/privatename-not-valid-earlyerr-script-6.js
index ba766384b4..450a54ed93 100644
--- a/test/language/statements/class/privatename-not-valid-earlyerr-script-6.js
+++ b/test/language/statements/class/privatename-not-valid-earlyerr-script-6.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {}
 
diff --git a/test/language/statements/class/privatename-not-valid-earlyerr-script-7.js b/test/language/statements/class/privatename-not-valid-earlyerr-script-7.js
index 20782464d6..8165b268b7 100644
--- a/test/language/statements/class/privatename-not-valid-earlyerr-script-7.js
+++ b/test/language/statements/class/privatename-not-valid-earlyerr-script-7.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 obj = {};
 
diff --git a/test/language/statements/class/privatename-not-valid-earlyerr-script-8.js b/test/language/statements/class/privatename-not-valid-earlyerr-script-8.js
index 53d66afa9e..d6921de769 100644
--- a/test/language/statements/class/privatename-not-valid-earlyerr-script-8.js
+++ b/test/language/statements/class/privatename-not-valid-earlyerr-script-8.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   this.#x;
diff --git a/test/language/statements/class/static-gen-method-param-dflt-yield.js b/test/language/statements/class/static-gen-method-param-dflt-yield.js
index 278a34549c..95bbefe3e2 100644
--- a/test/language/statements/class/static-gen-method-param-dflt-yield.js
+++ b/test/language/statements/class/static-gen-method-param-dflt-yield.js
@@ -20,7 +20,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static *g(x = yield) {}
diff --git a/test/language/statements/class/static-method-param-yield.js b/test/language/statements/class/static-method-param-yield.js
index a09044b8c6..03aa07de37 100644
--- a/test/language/statements/class/static-method-param-yield.js
+++ b/test/language/statements/class/static-method-param-yield.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static m(x = yield) {}
diff --git a/test/language/statements/class/strict-mode/with.js b/test/language/statements/class/strict-mode/with.js
index b37ee9cf79..9bb227a4de 100644
--- a/test/language/statements/class/strict-mode/with.js
+++ b/test/language/statements/class/strict-mode/with.js
@@ -9,7 +9,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends (function B() { with ({}); return B; }()) {}
 
diff --git a/test/language/statements/class/syntax/early-errors/class-definition-evaluation-block-duplicate-binding.js b/test/language/statements/class/syntax/early-errors/class-definition-evaluation-block-duplicate-binding.js
index ad9ec7d0e9..88b96c6219 100644
--- a/test/language/statements/class/syntax/early-errors/class-definition-evaluation-block-duplicate-binding.js
+++ b/test/language/statements/class/syntax/early-errors/class-definition-evaluation-block-duplicate-binding.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 {
   class A {}
   class A {}
diff --git a/test/language/statements/class/syntax/early-errors/class-definition-evaluation-scriptbody-duplicate-binding.js b/test/language/statements/class/syntax/early-errors/class-definition-evaluation-scriptbody-duplicate-binding.js
index 570ba862c8..c5f3dff7cc 100644
--- a/test/language/statements/class/syntax/early-errors/class-definition-evaluation-scriptbody-duplicate-binding.js
+++ b/test/language/statements/class/syntax/early-errors/class-definition-evaluation-scriptbody-duplicate-binding.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 class A {}
 class A {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-class-body-ctor-duplicate.js b/test/language/statements/class/syntax/early-errors/grammar-class-body-ctor-duplicate.js
index 574e7b9a66..78c3789330 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-class-body-ctor-duplicate.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-class-body-ctor-duplicate.js
@@ -17,7 +17,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-ctor-super-no-heritage.js b/test/language/statements/class/syntax/early-errors/grammar-ctor-super-no-heritage.js
index e7584c9a60..1594641061 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-ctor-super-no-heritage.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-ctor-super-no-heritage.js
@@ -20,7 +20,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   constructor() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-ues-error.js b/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-ues-error.js
index 62a9f44d99..6bb8e9598d 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-ues-error.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-ues-error.js
@@ -64,7 +64,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   \u0000;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-zwj-error.js b/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-zwj-error.js
index 6b34317554..1a85d0c446 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-zwj-error.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-zwj-error.js
@@ -64,7 +64,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   \u200D_ZWJ;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-zwnj-error.js b/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-zwnj-error.js
index eeb17eb099..b382bdf367 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-zwnj-error.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-field-identifier-invalid-zwnj-error.js
@@ -64,7 +64,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   \u200C_ZWNJ;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-fields-same-line-error.js b/test/language/statements/class/syntax/early-errors/grammar-fields-same-line-error.js
index 37e8ee7ebb..31c417b384 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-fields-same-line-error.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-fields-same-line-error.js
@@ -27,7 +27,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   x y
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js
index e8e6374483..4305e08287 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #m;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js
index 7b7f065f7e..eb4ca21c04 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   get #m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js
index 84f933e6d9..9412291b95 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #m;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js
index 4d26cd2559..bd5f95e6ec 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   get #m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js
index 1c656f170b..66194fa59b 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js
index 35f9d2ce9d..a535fc445c 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   set #m(_) {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js
index 2afc1ab11f..d45004881b 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static #m;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js
index a9a7a04749..0d70423589 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static #m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js
index bc268b1cdc..acb281b257 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #m;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js
index 66f075e908..6958b9ddac 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   set #m(_) {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-constructor.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-constructor.js
index fcc5505835..32d351b8e9 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-constructor.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #constructor
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-error.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-error.js
index a1dca39601..14fd88078e 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-error.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-error.js
@@ -30,7 +30,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   # x
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-ues.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-ues.js
index b1ff6cbc5a..8e9a05e3cc 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-ues.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-ues.js
@@ -58,7 +58,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #\u0000;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwj-error.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwj-error.js
index 540a3f4dda..b51aa5dbcc 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwj-error.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwj-error.js
@@ -58,7 +58,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #\u200D_ZWJ;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwnj-error.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwnj-error.js
index 0c1ccc4e9c..9cc7694bcb 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwnj-error.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-identifier-invalid-zwnj-error.js
@@ -58,7 +58,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #\u200C_ZWNJ;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-get-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-get-meth.js
index 4a785dfa2b..ce6beace6d 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-get-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-get-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   get # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-set-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-set-meth.js
index 15ed1ea93b..39623a26f2 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-set-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-accessor-set-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   set # m(_) {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-async-gen-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-async-gen-meth.js
index 989be63258..1dd0b26ce2 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-async-gen-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-async-gen-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   async * # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-async-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-async-meth.js
index 0ac6d51f66..2c73809bb6 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-async-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-async-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   async # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-call-expr.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-call-expr.js
index 36c35e30f8..6709b2f21e 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-call-expr.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-call-expr.js
@@ -24,7 +24,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-field-init.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-field-init.js
index 401dbd34a3..87ec09f45a 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-field-init.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-field-init.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   # x = 1;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-field.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-field.js
index 8205fd0e3d..59d39808e5 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-field.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-field.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   # x;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-gen-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-gen-meth.js
index 5174d76aff..4c85229b66 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-gen-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-gen-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   * # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-member-expr.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-member-expr.js
index 848c0b00cd..d92447aa29 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-member-expr.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-member-expr.js
@@ -24,7 +24,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-meth.case.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-meth.case.js
index 3affb82d81..65e8a1d0cc 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-meth.case.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-meth.case.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-get-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-get-meth.js
index 8c087e002a..96ec201fc7 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-get-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-get-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static get # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-set-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-set-meth.js
index 3fa8a034b8..04eaeb1d7d 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-set-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-accessor-set-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static set # m(_) {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-gen-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-gen-meth.js
index ff03c518f9..d203e95129 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-gen-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-gen-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static async * # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-meth.js
index b489fadd42..bfa344c686 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-async-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static async # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field-init.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field-init.js
index afa44200ab..37df3aa708 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field-init.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field-init.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static # x = 1;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field.js
index f8a6cd6e5a..3b95a3415d 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-field.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static # x;
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-gen-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-gen-meth.js
index 18b07e8fb8..1650a36dac 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-gen-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-gen-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static * # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-meth.js b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-meth.js
index f115427940..6bd0321a19 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatename-whitespace-error-static-meth.js
@@ -22,7 +22,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static # m() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-privatenames-same-line-error.js b/test/language/statements/class/syntax/early-errors/grammar-privatenames-same-line-error.js
index 4b581a0149..5c3f857ecc 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-privatenames-same-line-error.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-privatenames-same-line-error.js
@@ -30,7 +30,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   #x #y
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-async-gen.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-async-gen.js
index 28540bf4d5..c0885700bc 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-async-gen.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-async-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   async * method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-async.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-async.js
index 8a1587c3e9..523cc59700 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-async.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-async.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   async method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-gen.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-gen.js
index 7db45fad67..f40850502b 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-gen.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   * method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-get.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-get.js
index 8e31b50376..03800daf4f 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-get.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-get.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   get method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-method.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-method.js
index 3907cba888..e87f897e91 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-method.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-method.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-async-gen.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-async-gen.js
index f764d787ad..63401bd907 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-async-gen.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-async-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   async * #method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-async.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-async.js
index f6a8b94ca2..5a6e779079 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-async.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-async.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   async #method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-gen.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-gen.js
index c4dfa99cd0..9f6949c29e 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-gen.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   * #method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-method.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-method.js
index 66276bc481..5ca1d1e6d6 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-method.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-private-method.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   #method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-set.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-set.js
index 24b3e3e344..03df4e1bf8 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-set.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-contains-super-set.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   set method(_) {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-async-gen.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-async-gen.js
index a5c15026f5..20c0a08701 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-async-gen.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-async-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   async * constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-async-meth.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-async-meth.js
index 67cdbe9d1a..609efdcd5c 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-async-meth.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-async-meth.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   async constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-gen.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-gen.js
index adb6818c0e..a8082a4c38 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-gen.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-gen.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   * constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-get.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-get.js
index bfbb5f28da..19c835611c 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-get.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-get.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   get constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js
index c03ba24d83..fb73fd08bd 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   set constructor(_) {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-async-gen-meth-prototype.js b/test/language/statements/class/syntax/early-errors/grammar-static-async-gen-meth-prototype.js
index fc7a232a2a..0f11684173 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-async-gen-meth-prototype.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-async-gen-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static async * prototype() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-async-gen-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-async-gen-meth-super.js
index 1c2c4bdbaf..5136713f43 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-async-gen-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-async-gen-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static async * method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-async-meth-prototype.js b/test/language/statements/class/syntax/early-errors/grammar-static-async-meth-prototype.js
index 88e4b95f21..603e6611ab 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-async-meth-prototype.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-async-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static async prototype() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-async-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-async-meth-super.js
index a197726c35..648a6de1ea 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-async-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-async-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static async method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-gen-meth-prototype.js b/test/language/statements/class/syntax/early-errors/grammar-static-gen-meth-prototype.js
index c5c5529e4f..2fb95c5f10 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-gen-meth-prototype.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-gen-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static * prototype() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-gen-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-gen-meth-super.js
index 3e69a7a449..70f2ce13b4 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-gen-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-gen-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static * method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-get-meth-prototype.js b/test/language/statements/class/syntax/early-errors/grammar-static-get-meth-prototype.js
index 962994e0da..e9ff941401 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-get-meth-prototype.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-get-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static get prototype() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-get-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-get-meth-super.js
index a72499191f..7dce9ba59b 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-get-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-get-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static get method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-meth-prototype.js b/test/language/statements/class/syntax/early-errors/grammar-static-meth-prototype.js
index f869215429..f8a8cf776b 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-meth-prototype.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static prototype() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-meth-super.js
index 8ca8799d49..5dc6771597 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-async-gen-meth-constructor.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-async-gen-meth-constructor.js
index 44037825e0..553f416813 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-async-gen-meth-constructor.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-private-async-gen-meth-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static async * #constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-async-gen-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-async-gen-meth-super.js
index 9fc2361c31..36ecd0ec1e 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-async-gen-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-private-async-gen-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static async * #method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-async-meth-constructor.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-async-meth-constructor.js
index 1291fc8082..b64ebaaede 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-async-meth-constructor.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-private-async-meth-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static async #constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-async-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-async-meth-super.js
index d40db23a92..fd17178414 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-async-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-private-async-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static async #method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-gen-meth-constructor.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-gen-meth-constructor.js
index 6e4703bebb..8f52d57636 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-gen-meth-constructor.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-private-gen-meth-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static * #constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-gen-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-gen-meth-super.js
index cdca4fbb3c..94f27a9562 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-gen-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-private-gen-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static * #method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-meth-constructor.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-meth-constructor.js
index 407293481f..266c15098f 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-meth-constructor.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-private-meth-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static #constructor() {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-meth-super.js
index dec213feed..c836924653 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-private-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static #method() {
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-privatename-constructor.js b/test/language/statements/class/syntax/early-errors/grammar-static-privatename-constructor.js
index d5700bb03b..4f62d43f59 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-privatename-constructor.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-privatename-constructor.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static #constructor
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js b/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js
index 4c3829b62d..b3b2e976d5 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   static set prototype(_) {}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-super.js b/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-super.js
index fe836d7975..5494aa83a1 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-super.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-super.js
@@ -18,7 +18,7 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C extends Function{
   static set method(_) {
diff --git a/test/language/statements/class/syntax/escaped-static.js b/test/language/statements/class/syntax/escaped-static.js
index 1be53dc661..f57d012ea5 100644
--- a/test/language/statements/class/syntax/escaped-static.js
+++ b/test/language/statements/class/syntax/escaped-static.js
@@ -18,7 +18,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 class C {
   st\u0061tic m() {}
diff --git a/test/language/statements/const/dstr-ary-ptrn-rest-init-ary.js b/test/language/statements/const/dstr-ary-ptrn-rest-init-ary.js
index d8924e9d00..2e8e694509 100644
--- a/test/language/statements/const/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/const/dstr-ary-ptrn-rest-init-ary.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 const [...[ x ] = []] = [];
 
diff --git a/test/language/statements/const/dstr-ary-ptrn-rest-init-id.js b/test/language/statements/const/dstr-ary-ptrn-rest-init-id.js
index 4dccb13f67..c427f498e1 100644
--- a/test/language/statements/const/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/const/dstr-ary-ptrn-rest-init-id.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 const [...x = []] = [];
 
diff --git a/test/language/statements/const/dstr-ary-ptrn-rest-init-obj.js b/test/language/statements/const/dstr-ary-ptrn-rest-init-obj.js
index 078b460240..dcb3c0cc1e 100644
--- a/test/language/statements/const/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/const/dstr-ary-ptrn-rest-init-obj.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 const [...{ x } = []] = [];
 
diff --git a/test/language/statements/const/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/statements/const/dstr-ary-ptrn-rest-not-final-ary.js
index 49c02b41a8..be33d79698 100644
--- a/test/language/statements/const/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/const/dstr-ary-ptrn-rest-not-final-ary.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 const [...[x], y] = [1, 2, 3];
 
diff --git a/test/language/statements/const/dstr-ary-ptrn-rest-not-final-id.js b/test/language/statements/const/dstr-ary-ptrn-rest-not-final-id.js
index ac0ed26da8..e8dbd9a3d3 100644
--- a/test/language/statements/const/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/const/dstr-ary-ptrn-rest-not-final-id.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 const [...x, y] = [1, 2, 3];
 
diff --git a/test/language/statements/const/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/statements/const/dstr-ary-ptrn-rest-not-final-obj.js
index e425654566..5cb24a9d0d 100644
--- a/test/language/statements/const/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/const/dstr-ary-ptrn-rest-not-final-obj.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 const [...{ x }, y] = [1, 2, 3];
 
diff --git a/test/language/statements/const/redeclaration-error-from-within-strict-mode-function-const.js b/test/language/statements/const/redeclaration-error-from-within-strict-mode-function-const.js
index a8e61b00cd..ac21b57fa3 100644
--- a/test/language/statements/const/redeclaration-error-from-within-strict-mode-function-const.js
+++ b/test/language/statements/const/redeclaration-error-from-within-strict-mode-function-const.js
@@ -10,6 +10,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 (function() { 'use strict'; { const f = 1; var f; } })
 
diff --git a/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-with-without-initialiser.js b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-with-without-initialiser.js
index 1e8be114c4..90bba67e87 100644
--- a/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-with-without-initialiser.js
+++ b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-with-without-initialiser.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 const x = 1, y;
 
diff --git a/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-without-with-initialiser.js b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-without-with-initialiser.js
index 0dbc2f3003..7dc658e4a6 100644
--- a/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-without-with-initialiser.js
+++ b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-without-with-initialiser.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 const x, y = 1;
 
diff --git a/test/language/statements/const/syntax/block-scope-syntax-const-declarations-without-initialiser.js b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-without-initialiser.js
index e1dcde49b3..bb79404266 100644
--- a/test/language/statements/const/syntax/block-scope-syntax-const-declarations-without-initialiser.js
+++ b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-without-initialiser.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 const x;
 
diff --git a/test/language/statements/const/syntax/const-declaring-let-split-across-two-lines.js b/test/language/statements/const/syntax/const-declaring-let-split-across-two-lines.js
index e9282284b6..700af5185e 100644
--- a/test/language/statements/const/syntax/const-declaring-let-split-across-two-lines.js
+++ b/test/language/statements/const/syntax/const-declaring-let-split-across-two-lines.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 const
 let = "irrelevant initializer";
diff --git a/test/language/statements/const/syntax/with-initializer-do-statement-while-expression.js b/test/language/statements/const/syntax/with-initializer-do-statement-while-expression.js
index abf0980373..89d78c00b5 100644
--- a/test/language/statements/const/syntax/with-initializer-do-statement-while-expression.js
+++ b/test/language/statements/const/syntax/with-initializer-do-statement-while-expression.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 do const x = 1; while (false)
diff --git a/test/language/statements/const/syntax/with-initializer-for-statement.js b/test/language/statements/const/syntax/with-initializer-for-statement.js
index eecd4c23fd..fbc5fb8163 100644
--- a/test/language/statements/const/syntax/with-initializer-for-statement.js
+++ b/test/language/statements/const/syntax/with-initializer-for-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (;false;) const x = 1;
diff --git a/test/language/statements/const/syntax/with-initializer-if-expression-statement-else-statement.js b/test/language/statements/const/syntax/with-initializer-if-expression-statement-else-statement.js
index 53e691353f..01b26b6922 100644
--- a/test/language/statements/const/syntax/with-initializer-if-expression-statement-else-statement.js
+++ b/test/language/statements/const/syntax/with-initializer-if-expression-statement-else-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) {} else const x = 1;
diff --git a/test/language/statements/const/syntax/with-initializer-if-expression-statement.js b/test/language/statements/const/syntax/with-initializer-if-expression-statement.js
index 090ee620b8..e63ea4d1c4 100644
--- a/test/language/statements/const/syntax/with-initializer-if-expression-statement.js
+++ b/test/language/statements/const/syntax/with-initializer-if-expression-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) const x = 1;
diff --git a/test/language/statements/const/syntax/with-initializer-label-statement.js b/test/language/statements/const/syntax/with-initializer-label-statement.js
index a1e2162fee..9f128bd92a 100644
--- a/test/language/statements/const/syntax/with-initializer-label-statement.js
+++ b/test/language/statements/const/syntax/with-initializer-label-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 label: const x = 1;
diff --git a/test/language/statements/const/syntax/with-initializer-while-expression-statement.js b/test/language/statements/const/syntax/with-initializer-while-expression-statement.js
index d4af176951..537defd568 100644
--- a/test/language/statements/const/syntax/with-initializer-while-expression-statement.js
+++ b/test/language/statements/const/syntax/with-initializer-while-expression-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 while (false) const x = 1;
diff --git a/test/language/statements/const/syntax/without-initializer-case-expression-statement-list.js b/test/language/statements/const/syntax/without-initializer-case-expression-statement-list.js
index 31f99364a5..312681fd34 100644
--- a/test/language/statements/const/syntax/without-initializer-case-expression-statement-list.js
+++ b/test/language/statements/const/syntax/without-initializer-case-expression-statement-list.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 switch (true) { case true: const x; }
diff --git a/test/language/statements/const/syntax/without-initializer-default-statement-list.js b/test/language/statements/const/syntax/without-initializer-default-statement-list.js
index b456656f28..2b9b8290cf 100644
--- a/test/language/statements/const/syntax/without-initializer-default-statement-list.js
+++ b/test/language/statements/const/syntax/without-initializer-default-statement-list.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 switch (true) { default: const x; }
diff --git a/test/language/statements/const/syntax/without-initializer-do-statement-while-expression.js b/test/language/statements/const/syntax/without-initializer-do-statement-while-expression.js
index 7deb43ac94..f8c5152c5f 100644
--- a/test/language/statements/const/syntax/without-initializer-do-statement-while-expression.js
+++ b/test/language/statements/const/syntax/without-initializer-do-statement-while-expression.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 do const x; while (false)
diff --git a/test/language/statements/const/syntax/without-initializer-for-statement.js b/test/language/statements/const/syntax/without-initializer-for-statement.js
index 75f0829379..e54a63f92c 100644
--- a/test/language/statements/const/syntax/without-initializer-for-statement.js
+++ b/test/language/statements/const/syntax/without-initializer-for-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (;false;) const x;
diff --git a/test/language/statements/const/syntax/without-initializer-if-expression-statement-else-statement.js b/test/language/statements/const/syntax/without-initializer-if-expression-statement-else-statement.js
index c016156a47..8b77e4fb74 100644
--- a/test/language/statements/const/syntax/without-initializer-if-expression-statement-else-statement.js
+++ b/test/language/statements/const/syntax/without-initializer-if-expression-statement-else-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) {} else const x;
diff --git a/test/language/statements/const/syntax/without-initializer-if-expression-statement.js b/test/language/statements/const/syntax/without-initializer-if-expression-statement.js
index b6904d05cf..8c2290d25e 100644
--- a/test/language/statements/const/syntax/without-initializer-if-expression-statement.js
+++ b/test/language/statements/const/syntax/without-initializer-if-expression-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) const x;
diff --git a/test/language/statements/const/syntax/without-initializer-label-statement.js b/test/language/statements/const/syntax/without-initializer-label-statement.js
index 95fc49c565..7bb5fd2b20 100644
--- a/test/language/statements/const/syntax/without-initializer-label-statement.js
+++ b/test/language/statements/const/syntax/without-initializer-label-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 label: const x;
diff --git a/test/language/statements/const/syntax/without-initializer-while-expression-statement.js b/test/language/statements/const/syntax/without-initializer-while-expression-statement.js
index 2790903631..e5100a1f26 100644
--- a/test/language/statements/const/syntax/without-initializer-while-expression-statement.js
+++ b/test/language/statements/const/syntax/without-initializer-while-expression-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 while (false) const x;
diff --git a/test/language/statements/continue/S12.7_A1_T1.js b/test/language/statements/continue/S12.7_A1_T1.js
index 82355d5cc3..80e79799df 100644
--- a/test/language/statements/continue/S12.7_A1_T1.js
+++ b/test/language/statements/continue/S12.7_A1_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/continue/S12.7_A1_T2.js b/test/language/statements/continue/S12.7_A1_T2.js
index d20790b9c7..eb131dd815 100644
--- a/test/language/statements/continue/S12.7_A1_T2.js
+++ b/test/language/statements/continue/S12.7_A1_T2.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 LABEL : x=3.14;
 
diff --git a/test/language/statements/continue/S12.7_A1_T3.js b/test/language/statements/continue/S12.7_A1_T3.js
index a7a805c3c7..846acd894b 100644
--- a/test/language/statements/continue/S12.7_A1_T3.js
+++ b/test/language/statements/continue/S12.7_A1_T3.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 LABEL : x=3.14;
 
diff --git a/test/language/statements/continue/S12.7_A1_T4.js b/test/language/statements/continue/S12.7_A1_T4.js
index 081c838581..905f3c1728 100644
--- a/test/language/statements/continue/S12.7_A1_T4.js
+++ b/test/language/statements/continue/S12.7_A1_T4.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/continue/S12.7_A5_T1.js b/test/language/statements/continue/S12.7_A5_T1.js
index 58950345ce..d763e9143d 100644
--- a/test/language/statements/continue/S12.7_A5_T1.js
+++ b/test/language/statements/continue/S12.7_A5_T1.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 LABEL_OUT : var x=0, y=0;
 LABEL_DO_LOOP : do {
diff --git a/test/language/statements/continue/S12.7_A5_T2.js b/test/language/statements/continue/S12.7_A5_T2.js
index 199f73b944..a203b410ab 100644
--- a/test/language/statements/continue/S12.7_A5_T2.js
+++ b/test/language/statements/continue/S12.7_A5_T2.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 LABEL_OUT : var x=0, y=0;
 LABEL_DO_LOOP : do {
diff --git a/test/language/statements/continue/S12.7_A5_T3.js b/test/language/statements/continue/S12.7_A5_T3.js
index 75376f9985..5b1a409758 100644
--- a/test/language/statements/continue/S12.7_A5_T3.js
+++ b/test/language/statements/continue/S12.7_A5_T3.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 LABEL_OUT : var x=0, y=0;
 
diff --git a/test/language/statements/continue/S12.7_A6.js b/test/language/statements/continue/S12.7_A6.js
index 93608856a5..926722219d 100644
--- a/test/language/statements/continue/S12.7_A6.js
+++ b/test/language/statements/continue/S12.7_A6.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x=0,y=0;
 
diff --git a/test/language/statements/continue/S12.7_A8_T1.js b/test/language/statements/continue/S12.7_A8_T1.js
index fe7f646fb0..b3c906eb7f 100644
--- a/test/language/statements/continue/S12.7_A8_T1.js
+++ b/test/language/statements/continue/S12.7_A8_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try{
 } catch(e){
diff --git a/test/language/statements/continue/S12.7_A8_T2.js b/test/language/statements/continue/S12.7_A8_T2.js
index f0d1bc5255..578fdecdb6 100644
--- a/test/language/statements/continue/S12.7_A8_T2.js
+++ b/test/language/statements/continue/S12.7_A8_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try{
 } catch(e){
diff --git a/test/language/statements/debugger/expression.js b/test/language/statements/debugger/expression.js
index 82e42c9b02..445682fbae 100644
--- a/test/language/statements/debugger/expression.js
+++ b/test/language/statements/debugger/expression.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 (debugger);
diff --git a/test/language/statements/do-while/S12.6.1_A12.js b/test/language/statements/do-while/S12.6.1_A12.js
index 14501821f2..75377701e1 100644
--- a/test/language/statements/do-while/S12.6.1_A12.js
+++ b/test/language/statements/do-while/S12.6.1_A12.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/do-while/S12.6.1_A15.js b/test/language/statements/do-while/S12.6.1_A15.js
index 0e3287d3b4..81c0e7bd63 100644
--- a/test/language/statements/do-while/S12.6.1_A15.js
+++ b/test/language/statements/do-while/S12.6.1_A15.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
diff --git a/test/language/statements/do-while/S12.6.1_A6_T1.js b/test/language/statements/do-while/S12.6.1_A6_T1.js
index dfc2bc2932..430f8247d2 100644
--- a/test/language/statements/do-while/S12.6.1_A6_T1.js
+++ b/test/language/statements/do-while/S12.6.1_A6_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/do-while/S12.6.1_A6_T2.js b/test/language/statements/do-while/S12.6.1_A6_T2.js
index 4c1eb4675b..6517689120 100644
--- a/test/language/statements/do-while/S12.6.1_A6_T2.js
+++ b/test/language/statements/do-while/S12.6.1_A6_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/do-while/S12.6.1_A6_T3.js b/test/language/statements/do-while/S12.6.1_A6_T3.js
index 52754aa6df..05a42bba99 100644
--- a/test/language/statements/do-while/S12.6.1_A6_T3.js
+++ b/test/language/statements/do-while/S12.6.1_A6_T3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/do-while/S12.6.1_A6_T4.js b/test/language/statements/do-while/S12.6.1_A6_T4.js
index 603e92d6ad..8e38ed009f 100644
--- a/test/language/statements/do-while/S12.6.1_A6_T4.js
+++ b/test/language/statements/do-while/S12.6.1_A6_T4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/do-while/S12.6.1_A6_T5.js b/test/language/statements/do-while/S12.6.1_A6_T5.js
index a3ada5eff3..617b4a3a6f 100644
--- a/test/language/statements/do-while/S12.6.1_A6_T5.js
+++ b/test/language/statements/do-while/S12.6.1_A6_T5.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/do-while/S12.6.1_A6_T6.js b/test/language/statements/do-while/S12.6.1_A6_T6.js
index 087102def6..1952d8e0af 100644
--- a/test/language/statements/do-while/S12.6.1_A6_T6.js
+++ b/test/language/statements/do-while/S12.6.1_A6_T6.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/do-while/decl-async-fun.js b/test/language/statements/do-while/decl-async-fun.js
index 07e259a7f8..e84df478ff 100644
--- a/test/language/statements/do-while/decl-async-fun.js
+++ b/test/language/statements/do-while/decl-async-fun.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do async function f() {} while (false)
diff --git a/test/language/statements/do-while/decl-async-gen.js b/test/language/statements/do-while/decl-async-gen.js
index 74bea4dd6a..0284c9bcb5 100644
--- a/test/language/statements/do-while/decl-async-gen.js
+++ b/test/language/statements/do-while/decl-async-gen.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do async function* g() {} while (false)
diff --git a/test/language/statements/do-while/decl-cls.js b/test/language/statements/do-while/decl-cls.js
index 68eb69c5f4..f853a425ad 100644
--- a/test/language/statements/do-while/decl-cls.js
+++ b/test/language/statements/do-while/decl-cls.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do class C {} while (false)
diff --git a/test/language/statements/do-while/decl-const.js b/test/language/statements/do-while/decl-const.js
index 0100622c9b..be182af796 100644
--- a/test/language/statements/do-while/decl-const.js
+++ b/test/language/statements/do-while/decl-const.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do const x = null; while (false)
diff --git a/test/language/statements/do-while/decl-fun.js b/test/language/statements/do-while/decl-fun.js
index 0536ed73a4..4c349cc21e 100644
--- a/test/language/statements/do-while/decl-fun.js
+++ b/test/language/statements/do-while/decl-fun.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do function f() {} while (false)
diff --git a/test/language/statements/do-while/decl-gen.js b/test/language/statements/do-while/decl-gen.js
index 19fb049d93..9fb1d89f56 100644
--- a/test/language/statements/do-while/decl-gen.js
+++ b/test/language/statements/do-while/decl-gen.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do function* g() {} while (false)
diff --git a/test/language/statements/do-while/decl-let.js b/test/language/statements/do-while/decl-let.js
index b0124e5f0a..018893af6a 100644
--- a/test/language/statements/do-while/decl-let.js
+++ b/test/language/statements/do-while/decl-let.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do let x; while (false)
diff --git a/test/language/statements/do-while/labelled-fn-stmt.js b/test/language/statements/do-while/labelled-fn-stmt.js
index 6a81e27f42..69cff0f374 100644
--- a/test/language/statements/do-while/labelled-fn-stmt.js
+++ b/test/language/statements/do-while/labelled-fn-stmt.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do label1: label2: function f() {} while (false)
diff --git a/test/language/statements/do-while/let-array-with-newline.js b/test/language/statements/do-while/let-array-with-newline.js
index 2826b89934..617d9ec466 100644
--- a/test/language/statements/do-while/let-array-with-newline.js
+++ b/test/language/statements/do-while/let-array-with-newline.js
@@ -15,7 +15,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do let
 [x] = 0
diff --git a/test/language/statements/expression/S12.4_A1.js b/test/language/statements/expression/S12.4_A1.js
index 126ded2822..64acb33b68 100644
--- a/test/language/statements/expression/S12.4_A1.js
+++ b/test/language/statements/expression/S12.4_A1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-init-yield-ident-invalid.js b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-init-yield-ident-invalid.js
index dd7258924b..7dce3d09b0 100644
--- a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-init-yield-ident-invalid.js
+++ b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-init-yield-ident-invalid.js
@@ -27,7 +27,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function fn() {
   for await ([ x = yield ] of [[]])
diff --git a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-array-invalid.js b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-array-invalid.js
index 3e83fe6ad6..7f97553d0d 100644
--- a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-array-invalid.js
+++ b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-array-invalid.js
@@ -27,7 +27,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function fn() {
   for await ([[(x, y)]] of [[[]]])
diff --git a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-array-yield-ident-invalid.js b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-array-yield-ident-invalid.js
index 67d4fcb0a1..ee9fa2ade0 100644
--- a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-array-yield-ident-invalid.js
+++ b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-array-yield-ident-invalid.js
@@ -27,7 +27,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function fn() {
   for await ([[x[yield]]] of [[[]]])
diff --git a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-obj-invalid.js b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-obj-invalid.js
index 5df076db73..7548e3677c 100644
--- a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-obj-invalid.js
+++ b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-obj-invalid.js
@@ -27,7 +27,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function fn() {
   for await ([{ get x() {} }] of [[{}]])
diff --git a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-obj-yield-ident-invalid.js b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-obj-yield-ident-invalid.js
index 98b5cac32d..e328a70bc7 100644
--- a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-obj-yield-ident-invalid.js
+++ b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-nested-obj-yield-ident-invalid.js
@@ -27,7 +27,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function fn() {
   for await ([{ x = yield }] of [[{}]])
diff --git a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-target-simple-strict.js b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-target-simple-strict.js
index a1f6ff24b7..2e3a3f12ab 100644
--- a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-target-simple-strict.js
+++ b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-target-simple-strict.js
@@ -27,7 +27,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function fn() {
   for await ([arguments] of [[]])
diff --git a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-target-yield-invalid.js b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-target-yield-invalid.js
index 074b2f892d..776f22290a 100644
--- a/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-target-yield-invalid.js
+++ b/test/language/statements/for-await-of/async-func-decl-dstr-array-elem-target-yield-invalid.js
@@ -27,7 +27,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function fn() {
   for await ([ x[yield] ] of [[]])
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-ary.js
index 887108475b..a0f044a8fb 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-id.js
index 294d76d88a..c4edca82b5 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-obj.js
index fcd0e46e70..ff51506b62 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-ary.js
index d7b50d9bcb..b6c868c08c 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-id.js
index 3964cc8f55..5511d057cb 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-obj.js
index c0d8ddcc8c..6d50185564 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-ary.js
index d2413b42ee..e14c4bf7ed 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-id.js
index d73647499f..6ae4748625 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-obj.js
index a6e0f66659..1abb44e048 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-ary.js
index 75212c8b41..9671ae37b5 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-id.js
index ce93f216bf..3a898662ef 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-obj.js
index 5df6cb18d5..7a67861d79 100644
--- a/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-ary.js
index 8601a6134f..33534bba27 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-id.js
index 01ff9e144c..883669ba4f 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-obj.js
index e930f89b1e..abce4cb6b0 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-ary.js
index 4e79b5fc27..95949cf52e 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-id.js
index f4899c45d5..d4d994c69c 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-obj.js
index 3193faa588..f6462bef52 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-ary.js
index 6b2964b07c..1e0e48a3a2 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-id.js
index 7a2b533608..395c33ae0a 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-obj.js
index 78231c4359..98d4b1f2f0 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-ary.js
index 67c082f806..e1c676b29a 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-id.js
index 1cdd83bfce..a143dfd7ec 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-obj.js
index 28f77a6e4f..0fe639ac92 100644
--- a/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-ary.js
index f86fc312ad..5c48b0031f 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-ary.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-id.js
index a6ec71cb1f..b251b1a8ab 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-id.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-obj.js
index f4d6b22b46..fc34c0b6d1 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-init-obj.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-ary.js
index 44887c4b2f..4b2f184466 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-ary.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-id.js
index 914b48daff..b3d193d0d8 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-id.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-obj.js
index 36cf847b03..08b531c1f6 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-ary-ptrn-rest-not-final-obj.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-ary.js
index 8133d8e39d..ce211cb618 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-id.js
index e4d6041a81..bbed360c6b 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-obj.js
index 0eb38d758c..669c91d051 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-ary.js
index 64577e743e..3d5e94ec17 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-id.js
index 4c0cbb95f4..1568985b3a 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-obj.js
index dae70c5c58..afa5d6bb4e 100644
--- a/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-func-dstr-var-async-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-ary.js
index 61d2e61465..82e1a01c17 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-id.js
index 2b3801ee3d..959afa6872 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-obj.js
index f64451b23f..d6b98e6851 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-ary.js
index 1c8803c934..0956ee86cf 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-id.js
index ac341f0013..22251ed548 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-obj.js
index d0e611b286..da78e854b0 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-ary.js
index bf3dbd3446..81a6f4d306 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-id.js
index f3275c00d4..784ec5f5c6 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-obj.js
index d34d54a1bc..2b7f4c8bb5 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-ary.js
index c9aaa4dacb..76971a8123 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-id.js
index 924a803426..1ea7f8e416 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-obj.js
index 9b51cd78b1..717fcc2b75 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-ary.js
index 08f86d495b..26060ecad0 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-id.js
index 2c4b8807ce..0dec9db6d2 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-obj.js
index 35cc132d3f..d8ac3e5407 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-ary.js
index 7d201d9dc6..abe0a22c30 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-id.js
index 172aa43ba3..243879aa0d 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-obj.js
index baeefd0292..7b01bffef2 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-ary.js
index 9a6f133ec9..9da306cba9 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-id.js
index 62a53d2c80..486c4fcca4 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-obj.js
index f5f2f36df1..dc5dc62091 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-ary.js
index 646a1eed1e..f29f8d8fcb 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-id.js
index 037370d919..668282b43f 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-obj.js
index 61da2dbb39..bd054ad121 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-ary.js
index e386c28655..882caf54dc 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-ary.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-id.js
index 0efa418321..03f0271e5f 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-id.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-obj.js
index 312337362d..367f467fc4 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-init-obj.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-ary.js
index 51cc031d5c..4ed33ea1e0 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-ary.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-id.js
index 84b27c29f0..364beb8c32 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-id.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-obj.js
index b58c4eba56..65650f25e6 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-rest-not-final-obj.js
@@ -41,7 +41,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-ary.js b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-ary.js
index 84527c94e5..6e838253e2 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-id.js b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-id.js
index 6dcac3c1c0..30779e0216 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-obj.js b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-obj.js
index 439c83785d..4404bddf64 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-init-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-ary.js
index b131bf299c..a8673f63ff 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-ary.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-id.js
index c4d1686964..6e63ad576c 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-id.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-obj.js
index af9909917b..c9e7d3457a 100644
--- a/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-await-of/async-gen-dstr-var-async-ary-ptrn-rest-not-final-obj.js
@@ -44,7 +44,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 var asyncIter = (async function*() {
diff --git a/test/language/statements/for-await-of/escaped-of.js b/test/language/statements/for-await-of/escaped-of.js
index 9df70e1dfb..5ce55e2c02 100644
--- a/test/language/statements/for-await-of/escaped-of.js
+++ b/test/language/statements/for-await-of/escaped-of.js
@@ -19,7 +19,7 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function* f() {
   for await (var x o\u0066 []) ;
diff --git a/test/language/statements/for-await-of/let-array-with-newline.js b/test/language/statements/for-await-of/let-array-with-newline.js
index e0e8eff233..b1712f3df2 100644
--- a/test/language/statements/for-await-of/let-array-with-newline.js
+++ b/test/language/statements/for-await-of/let-array-with-newline.js
@@ -16,7 +16,7 @@ flags: [noStrict]
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 async function* f() {
   for await (var x of []) let
diff --git a/test/language/statements/for-in/S12.6.4_A15.js b/test/language/statements/for-in/S12.6.4_A15.js
index db314778e1..46b905fd20 100644
--- a/test/language/statements/for-in/S12.6.4_A15.js
+++ b/test/language/statements/for-in/S12.6.4_A15.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var __arr=[1,2,3];
 
diff --git a/test/language/statements/for-in/decl-async-fun.js b/test/language/statements/for-in/decl-async-fun.js
index 5ffed9822b..1fbda3e036 100644
--- a/test/language/statements/for-in/decl-async-fun.js
+++ b/test/language/statements/for-in/decl-async-fun.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in {}) async function f() {}
diff --git a/test/language/statements/for-in/decl-async-gen.js b/test/language/statements/for-in/decl-async-gen.js
index 815353f2bf..fa801e0d34 100644
--- a/test/language/statements/for-in/decl-async-gen.js
+++ b/test/language/statements/for-in/decl-async-gen.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in {}) async function* g() {}
diff --git a/test/language/statements/for-in/decl-cls.js b/test/language/statements/for-in/decl-cls.js
index 158c1c57fe..0329c346a2 100644
--- a/test/language/statements/for-in/decl-cls.js
+++ b/test/language/statements/for-in/decl-cls.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in {}) class C {}
diff --git a/test/language/statements/for-in/decl-const.js b/test/language/statements/for-in/decl-const.js
index afb4cb70bf..76377731c2 100644
--- a/test/language/statements/for-in/decl-const.js
+++ b/test/language/statements/for-in/decl-const.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in {}) const y = null;
diff --git a/test/language/statements/for-in/decl-fun.js b/test/language/statements/for-in/decl-fun.js
index eac4cdfa28..fb5430250d 100644
--- a/test/language/statements/for-in/decl-fun.js
+++ b/test/language/statements/for-in/decl-fun.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in {}) function f() {}
diff --git a/test/language/statements/for-in/decl-gen.js b/test/language/statements/for-in/decl-gen.js
index d00f25653d..672410a560 100644
--- a/test/language/statements/for-in/decl-gen.js
+++ b/test/language/statements/for-in/decl-gen.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in {}) function* g() {}
diff --git a/test/language/statements/for-in/decl-let.js b/test/language/statements/for-in/decl-let.js
index 0b20688c35..3f66716f33 100644
--- a/test/language/statements/for-in/decl-let.js
+++ b/test/language/statements/for-in/decl-let.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in {}) let y;
diff --git a/test/language/statements/for-in/dstr-array-elem-init-yield-ident-invalid.js b/test/language/statements/for-in/dstr-array-elem-init-yield-ident-invalid.js
index e6c592df3c..16164b10b0 100644
--- a/test/language/statements/for-in/dstr-array-elem-init-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-array-elem-init-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([ x = yield ] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-elem-nested-array-invalid.js b/test/language/statements/for-in/dstr-array-elem-nested-array-invalid.js
index 9d22594ad4..6ad91804de 100644
--- a/test/language/statements/for-in/dstr-array-elem-nested-array-invalid.js
+++ b/test/language/statements/for-in/dstr-array-elem-nested-array-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([[(x, y)]] in [[[]]]) ;
diff --git a/test/language/statements/for-in/dstr-array-elem-nested-array-yield-ident-invalid.js b/test/language/statements/for-in/dstr-array-elem-nested-array-yield-ident-invalid.js
index d45d2558fe..1e367da12d 100644
--- a/test/language/statements/for-in/dstr-array-elem-nested-array-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-array-elem-nested-array-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([[x[yield]]] in [[[]]]) ;
diff --git a/test/language/statements/for-in/dstr-array-elem-nested-obj-invalid.js b/test/language/statements/for-in/dstr-array-elem-nested-obj-invalid.js
index 8162507948..9aa6ddaa85 100644
--- a/test/language/statements/for-in/dstr-array-elem-nested-obj-invalid.js
+++ b/test/language/statements/for-in/dstr-array-elem-nested-obj-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([{ get x() {} }] in [[{}]]) ;
diff --git a/test/language/statements/for-in/dstr-array-elem-nested-obj-yield-ident-invalid.js b/test/language/statements/for-in/dstr-array-elem-nested-obj-yield-ident-invalid.js
index 28b1068936..290d119798 100644
--- a/test/language/statements/for-in/dstr-array-elem-nested-obj-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-array-elem-nested-obj-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([{ x = yield }] in [[{}]]) ;
diff --git a/test/language/statements/for-in/dstr-array-elem-target-simple-strict.js b/test/language/statements/for-in/dstr-array-elem-target-simple-strict.js
index 6176fca9cc..73f0a284e7 100644
--- a/test/language/statements/for-in/dstr-array-elem-target-simple-strict.js
+++ b/test/language/statements/for-in/dstr-array-elem-target-simple-strict.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([arguments] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-elem-target-yield-invalid.js b/test/language/statements/for-in/dstr-array-elem-target-yield-invalid.js
index c7c34804bc..728aac3775 100644
--- a/test/language/statements/for-in/dstr-array-elem-target-yield-invalid.js
+++ b/test/language/statements/for-in/dstr-array-elem-target-yield-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([ x[yield] ] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-before-element.js b/test/language/statements/for-in/dstr-array-rest-before-element.js
index 5753169cfb..8de0f7e14c 100644
--- a/test/language/statements/for-in/dstr-array-rest-before-element.js
+++ b/test/language/statements/for-in/dstr-array-rest-before-element.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...x, y] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-before-elision.js b/test/language/statements/for-in/dstr-array-rest-before-elision.js
index 8cb1e1c85a..ae2ed110d1 100644
--- a/test/language/statements/for-in/dstr-array-rest-before-elision.js
+++ b/test/language/statements/for-in/dstr-array-rest-before-elision.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...x,] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-before-rest.js b/test/language/statements/for-in/dstr-array-rest-before-rest.js
index 5f76d919c0..1b7d33b195 100644
--- a/test/language/statements/for-in/dstr-array-rest-before-rest.js
+++ b/test/language/statements/for-in/dstr-array-rest-before-rest.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...x, ...y] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-elision-invalid.js b/test/language/statements/for-in/dstr-array-rest-elision-invalid.js
index 89ab8487c1..b40bc81bcd 100644
--- a/test/language/statements/for-in/dstr-array-rest-elision-invalid.js
+++ b/test/language/statements/for-in/dstr-array-rest-elision-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...x,] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-init.js b/test/language/statements/for-in/dstr-array-rest-init.js
index bd92abe07b..e366b19003 100644
--- a/test/language/statements/for-in/dstr-array-rest-init.js
+++ b/test/language/statements/for-in/dstr-array-rest-init.js
@@ -28,7 +28,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var x;
 
 for ([...x = 1] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-nested-array-invalid.js b/test/language/statements/for-in/dstr-array-rest-nested-array-invalid.js
index 9ee0f4cee3..366b5605a6 100644
--- a/test/language/statements/for-in/dstr-array-rest-nested-array-invalid.js
+++ b/test/language/statements/for-in/dstr-array-rest-nested-array-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...[(x, y)]] in [[[]]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-nested-array-yield-ident-invalid.js b/test/language/statements/for-in/dstr-array-rest-nested-array-yield-ident-invalid.js
index a53bd413cf..4a729370f0 100644
--- a/test/language/statements/for-in/dstr-array-rest-nested-array-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-array-rest-nested-array-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...[x[yield]]] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-nested-obj-invalid.js b/test/language/statements/for-in/dstr-array-rest-nested-obj-invalid.js
index 6028f044e5..c19f093807 100644
--- a/test/language/statements/for-in/dstr-array-rest-nested-obj-invalid.js
+++ b/test/language/statements/for-in/dstr-array-rest-nested-obj-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...{ get x() {} }] in [[[]]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-nested-obj-yield-ident-invalid.js b/test/language/statements/for-in/dstr-array-rest-nested-obj-yield-ident-invalid.js
index 136ba81066..aed7def4d8 100644
--- a/test/language/statements/for-in/dstr-array-rest-nested-obj-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-array-rest-nested-obj-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...{ x = yield }] in [[{}]]) ;
diff --git a/test/language/statements/for-in/dstr-array-rest-yield-ident-invalid.js b/test/language/statements/for-in/dstr-array-rest-yield-ident-invalid.js
index 694859390e..e8e3821d5a 100644
--- a/test/language/statements/for-in/dstr-array-rest-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-array-rest-yield-ident-invalid.js
@@ -28,7 +28,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var x = {};
 
 for ([...x[yield]] in [[]]) ;
diff --git a/test/language/statements/for-in/dstr-obj-id-identifier-yield-expr.js b/test/language/statements/for-in/dstr-obj-id-identifier-yield-expr.js
index cc045989d6..5d263f0a44 100644
--- a/test/language/statements/for-in/dstr-obj-id-identifier-yield-expr.js
+++ b/test/language/statements/for-in/dstr-obj-id-identifier-yield-expr.js
@@ -28,7 +28,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 (function*() {
 
 for ({ yield } in [{}]) ;
diff --git a/test/language/statements/for-in/dstr-obj-id-identifier-yield-ident-invalid.js b/test/language/statements/for-in/dstr-obj-id-identifier-yield-ident-invalid.js
index 859487c6f6..9075085617 100644
--- a/test/language/statements/for-in/dstr-obj-id-identifier-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-id-identifier-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ yield } in [{}]) ;
diff --git a/test/language/statements/for-in/dstr-obj-id-init-simple-strict.js b/test/language/statements/for-in/dstr-obj-id-init-simple-strict.js
index 620b3c7441..a94595511b 100644
--- a/test/language/statements/for-in/dstr-obj-id-init-simple-strict.js
+++ b/test/language/statements/for-in/dstr-obj-id-init-simple-strict.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ eval = 0 } in [{}]) ;
diff --git a/test/language/statements/for-in/dstr-obj-id-init-yield-ident-invalid.js b/test/language/statements/for-in/dstr-obj-id-init-yield-ident-invalid.js
index f492ecb301..4782a0d440 100644
--- a/test/language/statements/for-in/dstr-obj-id-init-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-id-init-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x = yield } in [{}]) ;
diff --git a/test/language/statements/for-in/dstr-obj-id-simple-strict.js b/test/language/statements/for-in/dstr-obj-id-simple-strict.js
index 33ec80ed96..0352369030 100644
--- a/test/language/statements/for-in/dstr-obj-id-simple-strict.js
+++ b/test/language/statements/for-in/dstr-obj-id-simple-strict.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ eval } in [{}]) ;
diff --git a/test/language/statements/for-in/dstr-obj-prop-elem-init-yield-ident-invalid.js b/test/language/statements/for-in/dstr-obj-prop-elem-init-yield-ident-invalid.js
index 292a84cda7..3cef6319b0 100644
--- a/test/language/statements/for-in/dstr-obj-prop-elem-init-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-prop-elem-init-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: x = yield } in [{}]) ;
diff --git a/test/language/statements/for-in/dstr-obj-prop-elem-target-yield-ident-invalid.js b/test/language/statements/for-in/dstr-obj-prop-elem-target-yield-ident-invalid.js
index a3975cf967..09a3f196a7 100644
--- a/test/language/statements/for-in/dstr-obj-prop-elem-target-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-prop-elem-target-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: x[yield] } in [{}]) ;
diff --git a/test/language/statements/for-in/dstr-obj-prop-nested-array-invalid.js b/test/language/statements/for-in/dstr-obj-prop-nested-array-invalid.js
index f0d28851ee..e0ac8d8c08 100644
--- a/test/language/statements/for-in/dstr-obj-prop-nested-array-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-prop-nested-array-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: [(x, y)] } in [{ x: [] }]) ;
diff --git a/test/language/statements/for-in/dstr-obj-prop-nested-array-yield-ident-invalid.js b/test/language/statements/for-in/dstr-obj-prop-nested-array-yield-ident-invalid.js
index 7c790a0253..e684cf2ab2 100644
--- a/test/language/statements/for-in/dstr-obj-prop-nested-array-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-prop-nested-array-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: [x = yield] } in [{ x: [] }]) ;
diff --git a/test/language/statements/for-in/dstr-obj-prop-nested-obj-invalid.js b/test/language/statements/for-in/dstr-obj-prop-nested-obj-invalid.js
index 586225f547..1e2895b2c9 100644
--- a/test/language/statements/for-in/dstr-obj-prop-nested-obj-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-prop-nested-obj-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: { get x() {} } } in [{ x: {} }]) ;
diff --git a/test/language/statements/for-in/dstr-obj-prop-nested-obj-yield-ident-invalid.js b/test/language/statements/for-in/dstr-obj-prop-nested-obj-yield-ident-invalid.js
index 320dd00adb..7b855674cf 100644
--- a/test/language/statements/for-in/dstr-obj-prop-nested-obj-yield-ident-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-prop-nested-obj-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: { x = yield } } in [{ x: {} }]) ;
diff --git a/test/language/statements/for-in/dstr-obj-rest-not-last-element-invalid.js b/test/language/statements/for-in/dstr-obj-rest-not-last-element-invalid.js
index cd7fc557ea..42a3b39192 100644
--- a/test/language/statements/for-in/dstr-obj-rest-not-last-element-invalid.js
+++ b/test/language/statements/for-in/dstr-obj-rest-not-last-element-invalid.js
@@ -28,7 +28,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var rest, b;
 
 for ({...rest, b} in [{}
diff --git a/test/language/statements/for-in/head-const-bound-names-dup.js b/test/language/statements/for-in/head-const-bound-names-dup.js
index 9d379d9167..1e8927743e 100644
--- a/test/language/statements/for-in/head-const-bound-names-dup.js
+++ b/test/language/statements/for-in/head-const-bound-names-dup.js
@@ -12,6 +12,6 @@ esid: sec-for-in-and-for-of-statements
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const [x, x] in {}) {}
diff --git a/test/language/statements/for-in/head-const-bound-names-in-stmt.js b/test/language/statements/for-in/head-const-bound-names-in-stmt.js
index f999a28be2..1d51f66839 100644
--- a/test/language/statements/for-in/head-const-bound-names-in-stmt.js
+++ b/test/language/statements/for-in/head-const-bound-names-in-stmt.js
@@ -12,7 +12,7 @@ esid: sec-for-in-and-for-of-statements
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const x in {}) {
   var x;
diff --git a/test/language/statements/for-in/head-const-bound-names-let.js b/test/language/statements/for-in/head-const-bound-names-let.js
index 49e0f2104d..725de6b106 100644
--- a/test/language/statements/for-in/head-const-bound-names-let.js
+++ b/test/language/statements/for-in/head-const-bound-names-let.js
@@ -12,6 +12,6 @@ es6id: 13.7.5
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const let in {}) {}
diff --git a/test/language/statements/for-in/head-let-bound-names-dup.js b/test/language/statements/for-in/head-let-bound-names-dup.js
index bff9cff8d4..1d5b1698f8 100644
--- a/test/language/statements/for-in/head-let-bound-names-dup.js
+++ b/test/language/statements/for-in/head-let-bound-names-dup.js
@@ -12,6 +12,6 @@ esid: sec-for-in-and-for-of-statements-static-semantics-early-errors
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let [x, x] in {}) {}
diff --git a/test/language/statements/for-in/head-let-bound-names-in-stmt.js b/test/language/statements/for-in/head-let-bound-names-in-stmt.js
index 35a3f6b32d..190d9b4914 100644
--- a/test/language/statements/for-in/head-let-bound-names-in-stmt.js
+++ b/test/language/statements/for-in/head-let-bound-names-in-stmt.js
@@ -12,7 +12,7 @@ esid: sec-for-in-and-for-of-statements-static-semantics-early-errors
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x in {}) {
   var x;
diff --git a/test/language/statements/for-in/head-let-bound-names-let.js b/test/language/statements/for-in/head-let-bound-names-let.js
index be597fb10f..8cedca5f6d 100644
--- a/test/language/statements/for-in/head-let-bound-names-let.js
+++ b/test/language/statements/for-in/head-let-bound-names-let.js
@@ -12,6 +12,6 @@ esid: sec-for-in-and-for-of-statements
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let let in {}) {}
diff --git a/test/language/statements/for-in/head-lhs-cover-non-asnmt-trgt.js b/test/language/statements/for-in/head-lhs-cover-non-asnmt-trgt.js
index ff458a03e3..4ec22e46d8 100644
--- a/test/language/statements/for-in/head-lhs-cover-non-asnmt-trgt.js
+++ b/test/language/statements/for-in/head-lhs-cover-non-asnmt-trgt.js
@@ -19,6 +19,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ((this) in {}) {}
diff --git a/test/language/statements/for-in/head-lhs-invalid-asnmt-ptrn-ary.js b/test/language/statements/for-in/head-lhs-invalid-asnmt-ptrn-ary.js
index e64bb0df72..22d55bd2b7 100644
--- a/test/language/statements/for-in/head-lhs-invalid-asnmt-ptrn-ary.js
+++ b/test/language/statements/for-in/head-lhs-invalid-asnmt-ptrn-ary.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([(x, y)] in {}) {}
diff --git a/test/language/statements/for-in/head-lhs-invalid-asnmt-ptrn-obj.js b/test/language/statements/for-in/head-lhs-invalid-asnmt-ptrn-obj.js
index fd74393971..a6047c5392 100644
--- a/test/language/statements/for-in/head-lhs-invalid-asnmt-ptrn-obj.js
+++ b/test/language/statements/for-in/head-lhs-invalid-asnmt-ptrn-obj.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ m() {} } in {}) {}
diff --git a/test/language/statements/for-in/head-lhs-non-asnmt-trgt.js b/test/language/statements/for-in/head-lhs-non-asnmt-trgt.js
index badf8bdd52..347acf00b4 100644
--- a/test/language/statements/for-in/head-lhs-non-asnmt-trgt.js
+++ b/test/language/statements/for-in/head-lhs-non-asnmt-trgt.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (this in {}) {}
diff --git a/test/language/statements/for-in/labelled-fn-stmt-const.js b/test/language/statements/for-in/labelled-fn-stmt-const.js
index a3c1f8334f..15b3c2a709 100644
--- a/test/language/statements/for-in/labelled-fn-stmt-const.js
+++ b/test/language/statements/for-in/labelled-fn-stmt-const.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const x in {}) label1: label2: function f() {}
diff --git a/test/language/statements/for-in/labelled-fn-stmt-let.js b/test/language/statements/for-in/labelled-fn-stmt-let.js
index d08bf29bd6..e315476d1a 100644
--- a/test/language/statements/for-in/labelled-fn-stmt-let.js
+++ b/test/language/statements/for-in/labelled-fn-stmt-let.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x in {}) label1: label2: function f() {}
diff --git a/test/language/statements/for-in/labelled-fn-stmt-lhs.js b/test/language/statements/for-in/labelled-fn-stmt-lhs.js
index aafce8c5b0..544dab3f1f 100644
--- a/test/language/statements/for-in/labelled-fn-stmt-lhs.js
+++ b/test/language/statements/for-in/labelled-fn-stmt-lhs.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (x in {}) label1: label2: function f() {}
diff --git a/test/language/statements/for-in/labelled-fn-stmt-var.js b/test/language/statements/for-in/labelled-fn-stmt-var.js
index 57edeb1c92..4315eb6ec2 100644
--- a/test/language/statements/for-in/labelled-fn-stmt-var.js
+++ b/test/language/statements/for-in/labelled-fn-stmt-var.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in {}) label1: label2: function f() {}
diff --git a/test/language/statements/for-in/let-array-with-newline.js b/test/language/statements/for-in/let-array-with-newline.js
index 2e75b06dee..1c077b5623 100644
--- a/test/language/statements/for-in/let-array-with-newline.js
+++ b/test/language/statements/for-in/let-array-with-newline.js
@@ -15,7 +15,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x in null) let
 [a] = 0;
diff --git a/test/language/statements/for-of/decl-async-fun.js b/test/language/statements/for-of/decl-async-fun.js
index ffa9c5e408..d6ddc1ec88 100644
--- a/test/language/statements/for-of/decl-async-fun.js
+++ b/test/language/statements/for-of/decl-async-fun.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) async function f() {}
diff --git a/test/language/statements/for-of/decl-async-gen.js b/test/language/statements/for-of/decl-async-gen.js
index 54d556726a..3e9014936d 100644
--- a/test/language/statements/for-of/decl-async-gen.js
+++ b/test/language/statements/for-of/decl-async-gen.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) async function* g() {}
diff --git a/test/language/statements/for-of/decl-cls.js b/test/language/statements/for-of/decl-cls.js
index b46f4c8d11..b6e13c5b6c 100644
--- a/test/language/statements/for-of/decl-cls.js
+++ b/test/language/statements/for-of/decl-cls.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) class C {}
diff --git a/test/language/statements/for-of/decl-const.js b/test/language/statements/for-of/decl-const.js
index 879020ac75..c30c10312a 100644
--- a/test/language/statements/for-of/decl-const.js
+++ b/test/language/statements/for-of/decl-const.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) const y = null;
diff --git a/test/language/statements/for-of/decl-fun.js b/test/language/statements/for-of/decl-fun.js
index 488889370e..24bf5274db 100644
--- a/test/language/statements/for-of/decl-fun.js
+++ b/test/language/statements/for-of/decl-fun.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) function f() {}
diff --git a/test/language/statements/for-of/decl-gen.js b/test/language/statements/for-of/decl-gen.js
index c5eb2acaf5..d012e10c3b 100644
--- a/test/language/statements/for-of/decl-gen.js
+++ b/test/language/statements/for-of/decl-gen.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) function* g() {}
diff --git a/test/language/statements/for-of/decl-let.js b/test/language/statements/for-of/decl-let.js
index 75645e2f10..74c74e06c2 100644
--- a/test/language/statements/for-of/decl-let.js
+++ b/test/language/statements/for-of/decl-let.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) let y;
diff --git a/test/language/statements/for-of/dstr-array-elem-init-yield-ident-invalid.js b/test/language/statements/for-of/dstr-array-elem-init-yield-ident-invalid.js
index 6ce0605096..1e10ae3a35 100644
--- a/test/language/statements/for-of/dstr-array-elem-init-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-array-elem-init-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([ x = yield ] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-elem-nested-array-invalid.js b/test/language/statements/for-of/dstr-array-elem-nested-array-invalid.js
index 3ff3d1682b..50b3e0602b 100644
--- a/test/language/statements/for-of/dstr-array-elem-nested-array-invalid.js
+++ b/test/language/statements/for-of/dstr-array-elem-nested-array-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([[(x, y)]] of [[[]]]) ;
diff --git a/test/language/statements/for-of/dstr-array-elem-nested-array-yield-ident-invalid.js b/test/language/statements/for-of/dstr-array-elem-nested-array-yield-ident-invalid.js
index ed286f2ca9..d225982a0e 100644
--- a/test/language/statements/for-of/dstr-array-elem-nested-array-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-array-elem-nested-array-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([[x[yield]]] of [[[]]]) ;
diff --git a/test/language/statements/for-of/dstr-array-elem-nested-obj-invalid.js b/test/language/statements/for-of/dstr-array-elem-nested-obj-invalid.js
index f187d5a38a..aed00ae1c4 100644
--- a/test/language/statements/for-of/dstr-array-elem-nested-obj-invalid.js
+++ b/test/language/statements/for-of/dstr-array-elem-nested-obj-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([{ get x() {} }] of [[{}]]) ;
diff --git a/test/language/statements/for-of/dstr-array-elem-nested-obj-yield-ident-invalid.js b/test/language/statements/for-of/dstr-array-elem-nested-obj-yield-ident-invalid.js
index 05ae33f51c..f11c1679ef 100644
--- a/test/language/statements/for-of/dstr-array-elem-nested-obj-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-array-elem-nested-obj-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([{ x = yield }] of [[{}]]) ;
diff --git a/test/language/statements/for-of/dstr-array-elem-target-simple-strict.js b/test/language/statements/for-of/dstr-array-elem-target-simple-strict.js
index 74b33dbf55..bd7ad37361 100644
--- a/test/language/statements/for-of/dstr-array-elem-target-simple-strict.js
+++ b/test/language/statements/for-of/dstr-array-elem-target-simple-strict.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([arguments] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-elem-target-yield-invalid.js b/test/language/statements/for-of/dstr-array-elem-target-yield-invalid.js
index 83d4e90978..ffcd84209d 100644
--- a/test/language/statements/for-of/dstr-array-elem-target-yield-invalid.js
+++ b/test/language/statements/for-of/dstr-array-elem-target-yield-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([ x[yield] ] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-before-element.js b/test/language/statements/for-of/dstr-array-rest-before-element.js
index 4c29d2ad06..de8be9a8ea 100644
--- a/test/language/statements/for-of/dstr-array-rest-before-element.js
+++ b/test/language/statements/for-of/dstr-array-rest-before-element.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...x, y] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-before-elision.js b/test/language/statements/for-of/dstr-array-rest-before-elision.js
index 6d805f6358..7f736657a6 100644
--- a/test/language/statements/for-of/dstr-array-rest-before-elision.js
+++ b/test/language/statements/for-of/dstr-array-rest-before-elision.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...x,] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-before-rest.js b/test/language/statements/for-of/dstr-array-rest-before-rest.js
index 8c68e2e571..610eff16e0 100644
--- a/test/language/statements/for-of/dstr-array-rest-before-rest.js
+++ b/test/language/statements/for-of/dstr-array-rest-before-rest.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...x, ...y] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-elision-invalid.js b/test/language/statements/for-of/dstr-array-rest-elision-invalid.js
index 3b6212fda9..f87953aade 100644
--- a/test/language/statements/for-of/dstr-array-rest-elision-invalid.js
+++ b/test/language/statements/for-of/dstr-array-rest-elision-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...x,] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-init.js b/test/language/statements/for-of/dstr-array-rest-init.js
index 1d41c9ad7d..de3d63cbf8 100644
--- a/test/language/statements/for-of/dstr-array-rest-init.js
+++ b/test/language/statements/for-of/dstr-array-rest-init.js
@@ -28,7 +28,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var x;
 
 for ([...x = 1] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-nested-array-invalid.js b/test/language/statements/for-of/dstr-array-rest-nested-array-invalid.js
index 7e2b16bfa5..c7c890a157 100644
--- a/test/language/statements/for-of/dstr-array-rest-nested-array-invalid.js
+++ b/test/language/statements/for-of/dstr-array-rest-nested-array-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...[(x, y)]] of [[[]]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-nested-array-yield-ident-invalid.js b/test/language/statements/for-of/dstr-array-rest-nested-array-yield-ident-invalid.js
index e6ed5632d6..f71b64d87a 100644
--- a/test/language/statements/for-of/dstr-array-rest-nested-array-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-array-rest-nested-array-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...[x[yield]]] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-nested-obj-invalid.js b/test/language/statements/for-of/dstr-array-rest-nested-obj-invalid.js
index b413731431..a4f11bb2e6 100644
--- a/test/language/statements/for-of/dstr-array-rest-nested-obj-invalid.js
+++ b/test/language/statements/for-of/dstr-array-rest-nested-obj-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...{ get x() {} }] of [[[]]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-nested-obj-yield-ident-invalid.js b/test/language/statements/for-of/dstr-array-rest-nested-obj-yield-ident-invalid.js
index d36023afb5..e8041341f9 100644
--- a/test/language/statements/for-of/dstr-array-rest-nested-obj-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-array-rest-nested-obj-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([...{ x = yield }] of [[{}]]) ;
diff --git a/test/language/statements/for-of/dstr-array-rest-yield-ident-invalid.js b/test/language/statements/for-of/dstr-array-rest-yield-ident-invalid.js
index c0b8149c8c..9527ecd946 100644
--- a/test/language/statements/for-of/dstr-array-rest-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-array-rest-yield-ident-invalid.js
@@ -28,7 +28,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var x = {};
 
 for ([...x[yield]] of [[]]) ;
diff --git a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-ary.js b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-ary.js
index 62084ee87b..9e194e4cbd 100644
--- a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-ary.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-id.js b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-id.js
index 6b9cf85216..719a38f587 100644
--- a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-id.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-obj.js b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-obj.js
index 64c52d98c5..9171a89222 100644
--- a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-init-obj.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-ary.js
index 0866cad6cd..2a7d9e8417 100644
--- a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-ary.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-id.js
index 602e64a1cb..825afc940b 100644
--- a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-id.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-obj.js
index bc14a5f681..938744308b 100644
--- a/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-of/dstr-const-ary-ptrn-rest-not-final-obj.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-ary.js b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-ary.js
index bfdb0b7127..afbc8d07d5 100644
--- a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-ary.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-id.js b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-id.js
index 5513e662b6..02517bc07c 100644
--- a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-id.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-obj.js b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-obj.js
index 6b31432864..2d40f6697f 100644
--- a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-init-obj.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-ary.js
index 7567d7cf7d..cad2ebe8c8 100644
--- a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-ary.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-id.js
index dcd0d137a6..2614b81be5 100644
--- a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-id.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-obj.js
index 117e8608ee..ab3ff97c65 100644
--- a/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-of/dstr-let-ary-ptrn-rest-not-final-obj.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-obj-id-identifier-yield-expr.js b/test/language/statements/for-of/dstr-obj-id-identifier-yield-expr.js
index e98e4e4235..98c31890c9 100644
--- a/test/language/statements/for-of/dstr-obj-id-identifier-yield-expr.js
+++ b/test/language/statements/for-of/dstr-obj-id-identifier-yield-expr.js
@@ -28,7 +28,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 (function*() {
 
 for ({ yield } of [{}]) ;
diff --git a/test/language/statements/for-of/dstr-obj-id-identifier-yield-ident-invalid.js b/test/language/statements/for-of/dstr-obj-id-identifier-yield-ident-invalid.js
index 7e86135b59..d31920459e 100644
--- a/test/language/statements/for-of/dstr-obj-id-identifier-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-id-identifier-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ yield } of [{}]) ;
diff --git a/test/language/statements/for-of/dstr-obj-id-init-simple-strict.js b/test/language/statements/for-of/dstr-obj-id-init-simple-strict.js
index 3e1638726c..457b64e288 100644
--- a/test/language/statements/for-of/dstr-obj-id-init-simple-strict.js
+++ b/test/language/statements/for-of/dstr-obj-id-init-simple-strict.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ eval = 0 } of [{}]) ;
diff --git a/test/language/statements/for-of/dstr-obj-id-init-yield-ident-invalid.js b/test/language/statements/for-of/dstr-obj-id-init-yield-ident-invalid.js
index 88c554d36e..99a5c81fb7 100644
--- a/test/language/statements/for-of/dstr-obj-id-init-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-id-init-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x = yield } of [{}]) ;
diff --git a/test/language/statements/for-of/dstr-obj-id-simple-strict.js b/test/language/statements/for-of/dstr-obj-id-simple-strict.js
index 5c4a9fa50f..a422abcfdb 100644
--- a/test/language/statements/for-of/dstr-obj-id-simple-strict.js
+++ b/test/language/statements/for-of/dstr-obj-id-simple-strict.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ eval } of [{}]) ;
diff --git a/test/language/statements/for-of/dstr-obj-prop-elem-init-yield-ident-invalid.js b/test/language/statements/for-of/dstr-obj-prop-elem-init-yield-ident-invalid.js
index d72df9b985..38f25e24d8 100644
--- a/test/language/statements/for-of/dstr-obj-prop-elem-init-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-prop-elem-init-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: x = yield } of [{}]) ;
diff --git a/test/language/statements/for-of/dstr-obj-prop-elem-target-yield-ident-invalid.js b/test/language/statements/for-of/dstr-obj-prop-elem-target-yield-ident-invalid.js
index f2db3211cf..6f7a4d4a3b 100644
--- a/test/language/statements/for-of/dstr-obj-prop-elem-target-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-prop-elem-target-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: x[yield] } of [{}]) ;
diff --git a/test/language/statements/for-of/dstr-obj-prop-nested-array-invalid.js b/test/language/statements/for-of/dstr-obj-prop-nested-array-invalid.js
index 9e7711994b..4ebc5b3009 100644
--- a/test/language/statements/for-of/dstr-obj-prop-nested-array-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-prop-nested-array-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: [(x, y)] } of [{ x: [] }]) ;
diff --git a/test/language/statements/for-of/dstr-obj-prop-nested-array-yield-ident-invalid.js b/test/language/statements/for-of/dstr-obj-prop-nested-array-yield-ident-invalid.js
index 5e02aa7772..44e525a80c 100644
--- a/test/language/statements/for-of/dstr-obj-prop-nested-array-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-prop-nested-array-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: [x = yield] } of [{ x: [] }]) ;
diff --git a/test/language/statements/for-of/dstr-obj-prop-nested-obj-invalid.js b/test/language/statements/for-of/dstr-obj-prop-nested-obj-invalid.js
index abb38eae37..5825252103 100644
--- a/test/language/statements/for-of/dstr-obj-prop-nested-obj-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-prop-nested-obj-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: { get x() {} } } of [{ x: {} }]) ;
diff --git a/test/language/statements/for-of/dstr-obj-prop-nested-obj-yield-ident-invalid.js b/test/language/statements/for-of/dstr-obj-prop-nested-obj-yield-ident-invalid.js
index 9c0560f469..c8baa712eb 100644
--- a/test/language/statements/for-of/dstr-obj-prop-nested-obj-yield-ident-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-prop-nested-obj-yield-ident-invalid.js
@@ -28,6 +28,6 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ x: { x = yield } } of [{ x: {} }]) ;
diff --git a/test/language/statements/for-of/dstr-obj-rest-not-last-element-invalid.js b/test/language/statements/for-of/dstr-obj-rest-not-last-element-invalid.js
index 4b3fbd502e..4132866a59 100644
--- a/test/language/statements/for-of/dstr-obj-rest-not-last-element-invalid.js
+++ b/test/language/statements/for-of/dstr-obj-rest-not-last-element-invalid.js
@@ -28,7 +28,7 @@ info: |
           lhs using AssignmentPattern as the goal symbol.
     [...]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var rest, b;
 
 for ({...rest, b} of [{}
diff --git a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-ary.js b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-ary.js
index 0685d73009..f5c02445a8 100644
--- a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-ary.js
@@ -42,7 +42,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-id.js b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-id.js
index f56070e585..94808e71cd 100644
--- a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-id.js
@@ -42,7 +42,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-obj.js b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-obj.js
index 41585fa772..10694bc1f9 100644
--- a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-init-obj.js
@@ -42,7 +42,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-ary.js
index d0ec0f3ee1..dd9f35e8f9 100644
--- a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-ary.js
@@ -42,7 +42,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-id.js b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-id.js
index 711fb7fe9a..2e7395d575 100644
--- a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-id.js
@@ -42,7 +42,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-obj.js
index 781193f1fc..3ab041fe92 100644
--- a/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for-of/dstr-var-ary-ptrn-rest-not-final-obj.js
@@ -42,7 +42,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for-of/escaped-of.js b/test/language/statements/for-of/escaped-of.js
index a3262f4c5f..b806a482be 100644
--- a/test/language/statements/for-of/escaped-of.js
+++ b/test/language/statements/for-of/escaped-of.js
@@ -18,6 +18,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x o\u0066 []) ;
diff --git a/test/language/statements/for-of/head-const-bound-names-dup.js b/test/language/statements/for-of/head-const-bound-names-dup.js
index e6c94dafa7..affa2e5c9f 100644
--- a/test/language/statements/for-of/head-const-bound-names-dup.js
+++ b/test/language/statements/for-of/head-const-bound-names-dup.js
@@ -12,6 +12,6 @@ esid: sec-for-in-and-for-of-statements
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const [x, x] of []) {}
diff --git a/test/language/statements/for-of/head-const-bound-names-in-stmt.js b/test/language/statements/for-of/head-const-bound-names-in-stmt.js
index 6c693965e4..02cc30268b 100644
--- a/test/language/statements/for-of/head-const-bound-names-in-stmt.js
+++ b/test/language/statements/for-of/head-const-bound-names-in-stmt.js
@@ -12,7 +12,7 @@ esid: sec-for-in-and-for-of-statements
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const x of []) {
   var x;
diff --git a/test/language/statements/for-of/head-const-bound-names-let.js b/test/language/statements/for-of/head-const-bound-names-let.js
index c45389ee7f..5603f9c524 100644
--- a/test/language/statements/for-of/head-const-bound-names-let.js
+++ b/test/language/statements/for-of/head-const-bound-names-let.js
@@ -12,6 +12,6 @@ es6id: 13.7.5
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const let of []) {}
diff --git a/test/language/statements/for-of/head-decl-no-expr.js b/test/language/statements/for-of/head-decl-no-expr.js
index 5f3742e467..01457d5453 100644
--- a/test/language/statements/for-of/head-decl-no-expr.js
+++ b/test/language/statements/for-of/head-decl-no-expr.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x of [], []) {}
diff --git a/test/language/statements/for-of/head-expr-no-expr.js b/test/language/statements/for-of/head-expr-no-expr.js
index 2535e639f7..05573f5eb6 100644
--- a/test/language/statements/for-of/head-expr-no-expr.js
+++ b/test/language/statements/for-of/head-expr-no-expr.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var x;
 for (x of [], []) {}
diff --git a/test/language/statements/for-of/head-let-bound-names-dup.js b/test/language/statements/for-of/head-let-bound-names-dup.js
index 728d069f4e..1b78dcdb5a 100644
--- a/test/language/statements/for-of/head-let-bound-names-dup.js
+++ b/test/language/statements/for-of/head-let-bound-names-dup.js
@@ -12,6 +12,6 @@ esid: sec-for-in-and-for-of-statements-static-semantics-early-errors
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let [x, x] of []) {}
diff --git a/test/language/statements/for-of/head-let-bound-names-in-stmt.js b/test/language/statements/for-of/head-let-bound-names-in-stmt.js
index 6a02a2df2f..4420d08cda 100644
--- a/test/language/statements/for-of/head-let-bound-names-in-stmt.js
+++ b/test/language/statements/for-of/head-let-bound-names-in-stmt.js
@@ -12,7 +12,7 @@ esid: sec-for-in-and-for-of-statements-static-semantics-early-errors
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x of []) {
   var x;
diff --git a/test/language/statements/for-of/head-let-bound-names-let.js b/test/language/statements/for-of/head-let-bound-names-let.js
index 0893a622d2..260ff1fa91 100644
--- a/test/language/statements/for-of/head-let-bound-names-let.js
+++ b/test/language/statements/for-of/head-let-bound-names-let.js
@@ -12,6 +12,6 @@ esid: sec-for-in-and-for-of-statements
 es6id: 13.7.5
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let let of []) {}
diff --git a/test/language/statements/for-of/head-lhs-cover-non-asnmt-trgt.js b/test/language/statements/for-of/head-lhs-cover-non-asnmt-trgt.js
index 850de1c4a4..fe17cf2165 100644
--- a/test/language/statements/for-of/head-lhs-cover-non-asnmt-trgt.js
+++ b/test/language/statements/for-of/head-lhs-cover-non-asnmt-trgt.js
@@ -19,6 +19,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ((this) of []) {}
diff --git a/test/language/statements/for-of/head-lhs-invalid-asnmt-ptrn-ary.js b/test/language/statements/for-of/head-lhs-invalid-asnmt-ptrn-ary.js
index 0f7b745c91..4a8c96946c 100644
--- a/test/language/statements/for-of/head-lhs-invalid-asnmt-ptrn-ary.js
+++ b/test/language/statements/for-of/head-lhs-invalid-asnmt-ptrn-ary.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ([(x, y)] of []) {}
diff --git a/test/language/statements/for-of/head-lhs-invalid-asnmt-ptrn-obj.js b/test/language/statements/for-of/head-lhs-invalid-asnmt-ptrn-obj.js
index c8f14de2ce..6c866fe52b 100644
--- a/test/language/statements/for-of/head-lhs-invalid-asnmt-ptrn-obj.js
+++ b/test/language/statements/for-of/head-lhs-invalid-asnmt-ptrn-obj.js
@@ -15,6 +15,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ({ m() {} } of []) {}
diff --git a/test/language/statements/for-of/head-lhs-let.js b/test/language/statements/for-of/head-lhs-let.js
index 48be778ab2..d2e3293b4c 100644
--- a/test/language/statements/for-of/head-lhs-let.js
+++ b/test/language/statements/for-of/head-lhs-let.js
@@ -20,6 +20,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( let of [] ) ;
diff --git a/test/language/statements/for-of/head-lhs-non-asnmt-trgt.js b/test/language/statements/for-of/head-lhs-non-asnmt-trgt.js
index 26e60429c9..38ce25fa1b 100644
--- a/test/language/statements/for-of/head-lhs-non-asnmt-trgt.js
+++ b/test/language/statements/for-of/head-lhs-non-asnmt-trgt.js
@@ -13,6 +13,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (this of []) {}
diff --git a/test/language/statements/for-of/head-var-no-expr.js b/test/language/statements/for-of/head-var-no-expr.js
index 92dc93e6b9..1e132c706b 100644
--- a/test/language/statements/for-of/head-var-no-expr.js
+++ b/test/language/statements/for-of/head-var-no-expr.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of [], []) {}
diff --git a/test/language/statements/for-of/labelled-fn-stmt-const.js b/test/language/statements/for-of/labelled-fn-stmt-const.js
index a440034484..996ee02625 100644
--- a/test/language/statements/for-of/labelled-fn-stmt-const.js
+++ b/test/language/statements/for-of/labelled-fn-stmt-const.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const x of []) label1: label2: function f() {}
diff --git a/test/language/statements/for-of/labelled-fn-stmt-let.js b/test/language/statements/for-of/labelled-fn-stmt-let.js
index fedc0fcde9..606888232e 100644
--- a/test/language/statements/for-of/labelled-fn-stmt-let.js
+++ b/test/language/statements/for-of/labelled-fn-stmt-let.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x of []) label1: label2: function f() {}
diff --git a/test/language/statements/for-of/labelled-fn-stmt-lhs.js b/test/language/statements/for-of/labelled-fn-stmt-lhs.js
index 81fbdeb816..2971fff42f 100644
--- a/test/language/statements/for-of/labelled-fn-stmt-lhs.js
+++ b/test/language/statements/for-of/labelled-fn-stmt-lhs.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (x of []) label1: label2: function f() {}
diff --git a/test/language/statements/for-of/labelled-fn-stmt-var.js b/test/language/statements/for-of/labelled-fn-stmt-var.js
index ceff114da4..5ced0bedc1 100644
--- a/test/language/statements/for-of/labelled-fn-stmt-var.js
+++ b/test/language/statements/for-of/labelled-fn-stmt-var.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) label1: label2: function f() {}
diff --git a/test/language/statements/for-of/let-array-with-newline.js b/test/language/statements/for-of/let-array-with-newline.js
index 139ea7cc1c..c5900c6420 100644
--- a/test/language/statements/for-of/let-array-with-newline.js
+++ b/test/language/statements/for-of/let-array-with-newline.js
@@ -15,7 +15,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x of []) let
 [a] = 0;
diff --git a/test/language/statements/for/S12.6.3_A11.1_T3.js b/test/language/statements/for/S12.6.3_A11.1_T3.js
index 7581d9bc3a..d994a1c4ed 100644
--- a/test/language/statements/for/S12.6.3_A11.1_T3.js
+++ b/test/language/statements/for/S12.6.3_A11.1_T3.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 __str="";
 
diff --git a/test/language/statements/for/S12.6.3_A11_T3.js b/test/language/statements/for/S12.6.3_A11_T3.js
index b52fe0537e..5ea9bb8645 100644
--- a/test/language/statements/for/S12.6.3_A11_T3.js
+++ b/test/language/statements/for/S12.6.3_A11_T3.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 __str="";
 
diff --git a/test/language/statements/for/S12.6.3_A12.1_T3.js b/test/language/statements/for/S12.6.3_A12.1_T3.js
index 1a3fdd2d1e..47701e71fa 100644
--- a/test/language/statements/for/S12.6.3_A12.1_T3.js
+++ b/test/language/statements/for/S12.6.3_A12.1_T3.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 __str="";
 
diff --git a/test/language/statements/for/S12.6.3_A12_T3.js b/test/language/statements/for/S12.6.3_A12_T3.js
index f39f7dcacd..c2a4a34180 100644
--- a/test/language/statements/for/S12.6.3_A12_T3.js
+++ b/test/language/statements/for/S12.6.3_A12_T3.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 __str="";
 
diff --git a/test/language/statements/for/S12.6.3_A4.1.js b/test/language/statements/for/S12.6.3_A4.1.js
index 0e23c1d1a4..3623daa22e 100644
--- a/test/language/statements/for/S12.6.3_A4.1.js
+++ b/test/language/statements/for/S12.6.3_A4.1.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 arr = [1,2,3,4,5];
 
diff --git a/test/language/statements/for/S12.6.3_A4_T1.js b/test/language/statements/for/S12.6.3_A4_T1.js
index 50392787cc..9c691c5f8e 100644
--- a/test/language/statements/for/S12.6.3_A4_T1.js
+++ b/test/language/statements/for/S12.6.3_A4_T1.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 arr = [1,2,3,4,5];
 
diff --git a/test/language/statements/for/S12.6.3_A4_T2.js b/test/language/statements/for/S12.6.3_A4_T2.js
index 2e04d6ef13..8ffdc02106 100644
--- a/test/language/statements/for/S12.6.3_A4_T2.js
+++ b/test/language/statements/for/S12.6.3_A4_T2.js
@@ -13,7 +13,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 arr = [1,2,3,4,5];
 
diff --git a/test/language/statements/for/S12.6.3_A7.1_T1.js b/test/language/statements/for/S12.6.3_A7.1_T1.js
index 17c4048ce6..284f80b6aa 100644
--- a/test/language/statements/for/S12.6.3_A7.1_T1.js
+++ b/test/language/statements/for/S12.6.3_A7.1_T1.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/for/S12.6.3_A7.1_T2.js b/test/language/statements/for/S12.6.3_A7.1_T2.js
index 7afa0c508c..a4bfab078a 100644
--- a/test/language/statements/for/S12.6.3_A7.1_T2.js
+++ b/test/language/statements/for/S12.6.3_A7.1_T2.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/for/S12.6.3_A7_T1.js b/test/language/statements/for/S12.6.3_A7_T1.js
index 51bb5dc286..085cdcaa88 100644
--- a/test/language/statements/for/S12.6.3_A7_T1.js
+++ b/test/language/statements/for/S12.6.3_A7_T1.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/for/S12.6.3_A7_T2.js b/test/language/statements/for/S12.6.3_A7_T2.js
index 67b9745a0b..540e2808a7 100644
--- a/test/language/statements/for/S12.6.3_A7_T2.js
+++ b/test/language/statements/for/S12.6.3_A7_T2.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/for/S12.6.3_A8.1_T1.js b/test/language/statements/for/S12.6.3_A8.1_T1.js
index 149077b229..f4749fc49e 100644
--- a/test/language/statements/for/S12.6.3_A8.1_T1.js
+++ b/test/language/statements/for/S12.6.3_A8.1_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var arr = [];
 
diff --git a/test/language/statements/for/S12.6.3_A8.1_T2.js b/test/language/statements/for/S12.6.3_A8.1_T2.js
index 0953e42969..c1953111fa 100644
--- a/test/language/statements/for/S12.6.3_A8.1_T2.js
+++ b/test/language/statements/for/S12.6.3_A8.1_T2.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var arr = [];
 
diff --git a/test/language/statements/for/S12.6.3_A8.1_T3.js b/test/language/statements/for/S12.6.3_A8.1_T3.js
index 20e7cf043a..d50d1f98aa 100644
--- a/test/language/statements/for/S12.6.3_A8.1_T3.js
+++ b/test/language/statements/for/S12.6.3_A8.1_T3.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var arr = [];
 
diff --git a/test/language/statements/for/S12.6.3_A8_T1.js b/test/language/statements/for/S12.6.3_A8_T1.js
index 88b0f82302..d96d9dadfc 100644
--- a/test/language/statements/for/S12.6.3_A8_T1.js
+++ b/test/language/statements/for/S12.6.3_A8_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var arr = [];
 
diff --git a/test/language/statements/for/S12.6.3_A8_T2.js b/test/language/statements/for/S12.6.3_A8_T2.js
index 70a80a947d..8e5493f9a7 100644
--- a/test/language/statements/for/S12.6.3_A8_T2.js
+++ b/test/language/statements/for/S12.6.3_A8_T2.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var arr = [];
 
diff --git a/test/language/statements/for/S12.6.3_A8_T3.js b/test/language/statements/for/S12.6.3_A8_T3.js
index 8782eb8843..f15e863bc2 100644
--- a/test/language/statements/for/S12.6.3_A8_T3.js
+++ b/test/language/statements/for/S12.6.3_A8_T3.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var arr = [];
 
diff --git a/test/language/statements/for/decl-async-fun.js b/test/language/statements/for/decl-async-fun.js
index 3e35186b4f..9517f9cc69 100644
--- a/test/language/statements/for/decl-async-fun.js
+++ b/test/language/statements/for/decl-async-fun.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( ; false; ) async function f() {}
diff --git a/test/language/statements/for/decl-async-gen.js b/test/language/statements/for/decl-async-gen.js
index 1f2eacbb44..e442183a61 100644
--- a/test/language/statements/for/decl-async-gen.js
+++ b/test/language/statements/for/decl-async-gen.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( ; false; ) async function* g() {}
diff --git a/test/language/statements/for/decl-cls.js b/test/language/statements/for/decl-cls.js
index 14b9f3dfcf..021233fb3d 100644
--- a/test/language/statements/for/decl-cls.js
+++ b/test/language/statements/for/decl-cls.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( ; false; ) class C {}
diff --git a/test/language/statements/for/decl-const.js b/test/language/statements/for/decl-const.js
index 0a9caf3a42..d2039b2fc5 100644
--- a/test/language/statements/for/decl-const.js
+++ b/test/language/statements/for/decl-const.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( ; false; ) const x = null;
diff --git a/test/language/statements/for/decl-fun.js b/test/language/statements/for/decl-fun.js
index b0f33565ed..914434912f 100644
--- a/test/language/statements/for/decl-fun.js
+++ b/test/language/statements/for/decl-fun.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( ; false; ) function f() {}
diff --git a/test/language/statements/for/decl-gen.js b/test/language/statements/for/decl-gen.js
index 2ded16a953..515677a6d9 100644
--- a/test/language/statements/for/decl-gen.js
+++ b/test/language/statements/for/decl-gen.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( ; false; ) function* g() {}
diff --git a/test/language/statements/for/decl-let.js b/test/language/statements/for/decl-let.js
index c9df4e7342..55ea0aa073 100644
--- a/test/language/statements/for/decl-let.js
+++ b/test/language/statements/for/decl-let.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( ; false; ) let x;
diff --git a/test/language/statements/for/dstr-const-ary-ptrn-rest-init-ary.js b/test/language/statements/for/dstr-const-ary-ptrn-rest-init-ary.js
index d52c93971e..9fa82c5926 100644
--- a/test/language/statements/for/dstr-const-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for/dstr-const-ary-ptrn-rest-init-ary.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-const-ary-ptrn-rest-init-id.js b/test/language/statements/for/dstr-const-ary-ptrn-rest-init-id.js
index 1950ca7d31..6dee6a41b7 100644
--- a/test/language/statements/for/dstr-const-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for/dstr-const-ary-ptrn-rest-init-id.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-const-ary-ptrn-rest-init-obj.js b/test/language/statements/for/dstr-const-ary-ptrn-rest-init-obj.js
index af680c4e2c..6b441fe183 100644
--- a/test/language/statements/for/dstr-const-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for/dstr-const-ary-ptrn-rest-init-obj.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-ary.js
index 3bb95dc25f..e4bf5ee84b 100644
--- a/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-ary.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-id.js b/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-id.js
index 07d39602fe..a718524750 100644
--- a/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-id.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-obj.js
index 0b0b652007..ca6fad0195 100644
--- a/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for/dstr-const-ary-ptrn-rest-not-final-obj.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-let-ary-ptrn-rest-init-ary.js b/test/language/statements/for/dstr-let-ary-ptrn-rest-init-ary.js
index 64b8b970af..c87f9ea770 100644
--- a/test/language/statements/for/dstr-let-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for/dstr-let-ary-ptrn-rest-init-ary.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-let-ary-ptrn-rest-init-id.js b/test/language/statements/for/dstr-let-ary-ptrn-rest-init-id.js
index 99cacbbc56..5699397799 100644
--- a/test/language/statements/for/dstr-let-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for/dstr-let-ary-ptrn-rest-init-id.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-let-ary-ptrn-rest-init-obj.js b/test/language/statements/for/dstr-let-ary-ptrn-rest-init-obj.js
index 5202a59ef8..b1b30e94cb 100644
--- a/test/language/statements/for/dstr-let-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for/dstr-let-ary-ptrn-rest-init-obj.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-ary.js
index ea65ad76c0..57280d7ee2 100644
--- a/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-ary.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-id.js b/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-id.js
index ff72509fbb..d80a63cfa7 100644
--- a/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-id.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-obj.js
index 9e6e344d35..b1684345ae 100644
--- a/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for/dstr-let-ary-ptrn-rest-not-final-obj.js
@@ -45,7 +45,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-var-ary-ptrn-rest-init-ary.js b/test/language/statements/for/dstr-var-ary-ptrn-rest-init-ary.js
index 922aa0f449..bf2b8ef65c 100644
--- a/test/language/statements/for/dstr-var-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/for/dstr-var-ary-ptrn-rest-init-ary.js
@@ -39,7 +39,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-var-ary-ptrn-rest-init-id.js b/test/language/statements/for/dstr-var-ary-ptrn-rest-init-id.js
index ee267deb92..d43e66652e 100644
--- a/test/language/statements/for/dstr-var-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/for/dstr-var-ary-ptrn-rest-init-id.js
@@ -39,7 +39,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-var-ary-ptrn-rest-init-obj.js b/test/language/statements/for/dstr-var-ary-ptrn-rest-init-obj.js
index 23a46cc17a..e59b449c16 100644
--- a/test/language/statements/for/dstr-var-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/for/dstr-var-ary-ptrn-rest-init-obj.js
@@ -39,7 +39,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-ary.js b/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-ary.js
index 6cef49c2c0..d9fc1332c6 100644
--- a/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-ary.js
@@ -39,7 +39,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-id.js b/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-id.js
index 98f839f9e2..143ad676df 100644
--- a/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-id.js
@@ -39,7 +39,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-obj.js b/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-obj.js
index 4ba8469faf..fb661782e7 100644
--- a/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/for/dstr-var-ary-ptrn-rest-not-final-obj.js
@@ -39,7 +39,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var iterCount = 0;
 
diff --git a/test/language/statements/for/head-const-bound-names-in-stmt.js b/test/language/statements/for/head-const-bound-names-in-stmt.js
index 5bb62ad234..e1eeb9fbc6 100644
--- a/test/language/statements/for/head-const-bound-names-in-stmt.js
+++ b/test/language/statements/for/head-const-bound-names-in-stmt.js
@@ -15,7 +15,7 @@ esid: sec-for-statement
 es6id: 13.7.4
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const x; false; ) {
   var x;
diff --git a/test/language/statements/for/head-let-bound-names-in-stmt.js b/test/language/statements/for/head-let-bound-names-in-stmt.js
index 479a48d361..8b90958606 100644
--- a/test/language/statements/for/head-let-bound-names-in-stmt.js
+++ b/test/language/statements/for/head-let-bound-names-in-stmt.js
@@ -15,7 +15,7 @@ esid: sec-for-statement
 es6id: 13.7.4
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x; false; ) {
   var x;
diff --git a/test/language/statements/for/labelled-fn-stmt-const.js b/test/language/statements/for/labelled-fn-stmt-const.js
index 76125bf2bc..50d0fa1b00 100644
--- a/test/language/statements/for/labelled-fn-stmt-const.js
+++ b/test/language/statements/for/labelled-fn-stmt-const.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (const x; false; ) label1: label2: function f() {}
diff --git a/test/language/statements/for/labelled-fn-stmt-expr.js b/test/language/statements/for/labelled-fn-stmt-expr.js
index fa1b37e789..cb664f72da 100644
--- a/test/language/statements/for/labelled-fn-stmt-expr.js
+++ b/test/language/statements/for/labelled-fn-stmt-expr.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for ( ; false; ) label1: label2: function f() {}
diff --git a/test/language/statements/for/labelled-fn-stmt-let.js b/test/language/statements/for/labelled-fn-stmt-let.js
index c3ec3bf2cf..9391e9f3c8 100644
--- a/test/language/statements/for/labelled-fn-stmt-let.js
+++ b/test/language/statements/for/labelled-fn-stmt-let.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (let x; false; ) label1: label2: function f() {}
diff --git a/test/language/statements/for/labelled-fn-stmt-var.js b/test/language/statements/for/labelled-fn-stmt-var.js
index ebac05bb96..bac0d27152 100644
--- a/test/language/statements/for/labelled-fn-stmt-var.js
+++ b/test/language/statements/for/labelled-fn-stmt-var.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var x; false; ) label1: label2: function f() {}
diff --git a/test/language/statements/for/let-array-with-newline.js b/test/language/statements/for/let-array-with-newline.js
index cc37370289..db0103f928 100644
--- a/test/language/statements/for/let-array-with-newline.js
+++ b/test/language/statements/for/let-array-with-newline.js
@@ -15,7 +15,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (; false; ) let
 [a] = 0;
diff --git a/test/language/statements/function/13.0_4-5gs.js b/test/language/statements/function/13.0_4-5gs.js
index 552363beb9..7d29ae80bd 100644
--- a/test/language/statements/function/13.0_4-5gs.js
+++ b/test/language/statements/function/13.0_4-5gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_0_4_5_fun() { eval = 42; };
diff --git a/test/language/statements/function/13.1-13gs.js b/test/language/statements/function/13.1-13gs.js
index aa8f21747d..c90cbc9308 100644
--- a/test/language/statements/function/13.1-13gs.js
+++ b/test/language/statements/function/13.1-13gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function arguments() { };
diff --git a/test/language/statements/function/13.1-1gs.js b/test/language/statements/function/13.1-1gs.js
index b86f22e797..905db14069 100644
--- a/test/language/statements/function/13.1-1gs.js
+++ b/test/language/statements/function/13.1-1gs.js
@@ -13,6 +13,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_1_fun(eval) { }
diff --git a/test/language/statements/function/13.1-4gs.js b/test/language/statements/function/13.1-4gs.js
index 3e09ef329a..90a64051dd 100644
--- a/test/language/statements/function/13.1-4gs.js
+++ b/test/language/statements/function/13.1-4gs.js
@@ -13,6 +13,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var _13_1_4_fun = function (arguments) { };
diff --git a/test/language/statements/function/13.1-5gs.js b/test/language/statements/function/13.1-5gs.js
index b1d12af6be..4effa45d3e 100644
--- a/test/language/statements/function/13.1-5gs.js
+++ b/test/language/statements/function/13.1-5gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_5_fun(param, param) { }
diff --git a/test/language/statements/function/13.1-8gs.js b/test/language/statements/function/13.1-8gs.js
index 1a838d9ed6..a04c84d603 100644
--- a/test/language/statements/function/13.1-8gs.js
+++ b/test/language/statements/function/13.1-8gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var _13_1_8_fun = function (param, param) { };
diff --git a/test/language/statements/function/S13_A7_T3.js b/test/language/statements/function/S13_A7_T3.js
index 832b065c5e..0454857098 100644
--- a/test/language/statements/function/S13_A7_T3.js
+++ b/test/language/statements/function/S13_A7_T3.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function __func(){\A\B\C};
diff --git a/test/language/statements/function/dflt-params-duplicates.js b/test/language/statements/function/dflt-params-duplicates.js
index cac4130362..fba4473e58 100644
--- a/test/language/statements/function/dflt-params-duplicates.js
+++ b/test/language/statements/function/dflt-params-duplicates.js
@@ -55,7 +55,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f(x = 0, x) {
   
diff --git a/test/language/statements/function/dflt-params-rest.js b/test/language/statements/function/dflt-params-rest.js
index 87b23e3c28..638ab89e32 100644
--- a/test/language/statements/function/dflt-params-rest.js
+++ b/test/language/statements/function/dflt-params-rest.js
@@ -59,7 +59,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f(...x = []) {
   
diff --git a/test/language/statements/function/dstr-ary-ptrn-rest-init-ary.js b/test/language/statements/function/dstr-ary-ptrn-rest-init-ary.js
index 65904cc347..60ee786c79 100644
--- a/test/language/statements/function/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/function/dstr-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...[ x ] = []]) {
diff --git a/test/language/statements/function/dstr-ary-ptrn-rest-init-id.js b/test/language/statements/function/dstr-ary-ptrn-rest-init-id.js
index ff1879275d..40962fc797 100644
--- a/test/language/statements/function/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/function/dstr-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...x = []]) {
diff --git a/test/language/statements/function/dstr-ary-ptrn-rest-init-obj.js b/test/language/statements/function/dstr-ary-ptrn-rest-init-obj.js
index b948b87b22..e4e6c2e1c8 100644
--- a/test/language/statements/function/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/function/dstr-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...{ x } = []]) {
diff --git a/test/language/statements/function/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/statements/function/dstr-ary-ptrn-rest-not-final-ary.js
index fe66bc5f29..74fabe32cf 100644
--- a/test/language/statements/function/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/function/dstr-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...[x], y]) {
diff --git a/test/language/statements/function/dstr-ary-ptrn-rest-not-final-id.js b/test/language/statements/function/dstr-ary-ptrn-rest-not-final-id.js
index b1a13ed002..6bd20a5f6e 100644
--- a/test/language/statements/function/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/function/dstr-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...x, y]) {
diff --git a/test/language/statements/function/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/statements/function/dstr-ary-ptrn-rest-not-final-obj.js
index be0f956530..a9c23fdc54 100644
--- a/test/language/statements/function/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/function/dstr-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...{ x }, y]) {
diff --git a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-ary.js
index 9d049b17ab..2f150ff8b8 100644
--- a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...[ x ] = []] = []) {
diff --git a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-id.js
index e2e9b864ee..83b4a9df10 100644
--- a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...x = []] = []) {
diff --git a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-obj.js
index e400296651..9ef555ef58 100644
--- a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-init-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...{ x } = []] = []) {
diff --git a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
index 784330faf3..ece2a82fa5 100644
--- a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-ary.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...[x], y] = [1, 2, 3]) {
diff --git a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-id.js
index d79dfcdb72..f3dfbd4c42 100644
--- a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-id.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...x, y] = [1, 2, 3]) {
diff --git a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
index 3b7e7f6da4..730e361c8f 100644
--- a/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/function/dstr-dflt-ary-ptrn-rest-not-final-obj.js
@@ -48,7 +48,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function f([...{ x }, y] = [1, 2, 3]) {
diff --git a/test/language/statements/function/early-body-super-call.js b/test/language/statements/function/early-body-super-call.js
index e46930cbb0..15339edad4 100644
--- a/test/language/statements/function/early-body-super-call.js
+++ b/test/language/statements/function/early-body-super-call.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   super();
diff --git a/test/language/statements/function/early-body-super-prop.js b/test/language/statements/function/early-body-super-prop.js
index 241f750083..65bad9ab11 100644
--- a/test/language/statements/function/early-body-super-prop.js
+++ b/test/language/statements/function/early-body-super-prop.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
   super.x;
diff --git a/test/language/statements/function/early-params-super-call.js b/test/language/statements/function/early-params-super-call.js
index 3bac87f460..d9c3f283ba 100644
--- a/test/language/statements/function/early-params-super-call.js
+++ b/test/language/statements/function/early-params-super-call.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f(x = super()) {}
diff --git a/test/language/statements/function/early-params-super-prop.js b/test/language/statements/function/early-params-super-prop.js
index 2652d0c71e..f63e7a8f64 100644
--- a/test/language/statements/function/early-params-super-prop.js
+++ b/test/language/statements/function/early-params-super-prop.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f(x = super.x) {}
diff --git a/test/language/statements/function/enable-strict-via-body.js b/test/language/statements/function/enable-strict-via-body.js
index 477ff0c2e7..64e4ae216b 100644
--- a/test/language/statements/function/enable-strict-via-body.js
+++ b/test/language/statements/function/enable-strict-via-body.js
@@ -16,7 +16,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_0_10_fun() {
     function _13_0_10_inner() {
diff --git a/test/language/statements/function/enable-strict-via-outer-body.js b/test/language/statements/function/enable-strict-via-outer-body.js
index c4faa4a363..78244f2818 100644
--- a/test/language/statements/function/enable-strict-via-outer-body.js
+++ b/test/language/statements/function/enable-strict-via-outer-body.js
@@ -16,7 +16,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_0_11_fun() {
     "use strict";
diff --git a/test/language/statements/function/enable-strict-via-outer-script.js b/test/language/statements/function/enable-strict-via-outer-script.js
index 78b889a034..c058f2f364 100644
--- a/test/language/statements/function/enable-strict-via-outer-script.js
+++ b/test/language/statements/function/enable-strict-via-outer-script.js
@@ -16,7 +16,7 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var _13_0_9_fun = function () {
     function _13_0_9_inner() {
diff --git a/test/language/statements/function/invalid-2-names.js b/test/language/statements/function/invalid-2-names.js
index c37152636b..52b72a4d09 100644
--- a/test/language/statements/function/invalid-2-names.js
+++ b/test/language/statements/function/invalid-2-names.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function x, y() {}
diff --git a/test/language/statements/function/invalid-3-names.js b/test/language/statements/function/invalid-3-names.js
index 252d9aedb1..249ae257d7 100644
--- a/test/language/statements/function/invalid-3-names.js
+++ b/test/language/statements/function/invalid-3-names.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function x,y,z(){}
diff --git a/test/language/statements/function/invalid-function-body-1.js b/test/language/statements/function/invalid-function-body-1.js
index 2af16dda33..5a49c7b723 100644
--- a/test/language/statements/function/invalid-function-body-1.js
+++ b/test/language/statements/function/invalid-function-body-1.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function __func(){/ ABC}
diff --git a/test/language/statements/function/invalid-function-body-2.js b/test/language/statements/function/invalid-function-body-2.js
index 9b3a65d0fd..39e5294db3 100644
--- a/test/language/statements/function/invalid-function-body-2.js
+++ b/test/language/statements/function/invalid-function-body-2.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function __func(){&1}
diff --git a/test/language/statements/function/invalid-function-body-3.js b/test/language/statements/function/invalid-function-body-3.js
index d7f3d28bbe..67178ddecf 100644
--- a/test/language/statements/function/invalid-function-body-3.js
+++ b/test/language/statements/function/invalid-function-body-3.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function __func(){# ABC}
diff --git a/test/language/statements/function/invalid-name-dot.js b/test/language/statements/function/invalid-name-dot.js
index 8c95ba994a..13dd1c2b87 100644
--- a/test/language/statements/function/invalid-name-dot.js
+++ b/test/language/statements/function/invalid-name-dot.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function obj.tt() {}
diff --git a/test/language/statements/function/invalid-name-two-dots.js b/test/language/statements/function/invalid-name-two-dots.js
index 64b1e01905..31c8d0eebd 100644
--- a/test/language/statements/function/invalid-name-two-dots.js
+++ b/test/language/statements/function/invalid-name-two-dots.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function obj.tt.ss() {}
diff --git a/test/language/statements/function/name-arguments-strict-body.js b/test/language/statements/function/name-arguments-strict-body.js
index df3e2a5a1d..859fe38594 100644
--- a/test/language/statements/function/name-arguments-strict-body.js
+++ b/test/language/statements/function/name-arguments-strict-body.js
@@ -13,6 +13,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function arguments() { 'use strict'; }
diff --git a/test/language/statements/function/name-arguments-strict.js b/test/language/statements/function/name-arguments-strict.js
index 0602c93293..81d66315dd 100644
--- a/test/language/statements/function/name-arguments-strict.js
+++ b/test/language/statements/function/name-arguments-strict.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function arguments() { }
diff --git a/test/language/statements/function/name-eval-strict-body.js b/test/language/statements/function/name-eval-strict-body.js
index 5586f74a9c..b30d9bb76d 100644
--- a/test/language/statements/function/name-eval-strict-body.js
+++ b/test/language/statements/function/name-eval-strict-body.js
@@ -13,6 +13,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function eval() { 'use strict'; }
diff --git a/test/language/statements/function/name-eval-strict.js b/test/language/statements/function/name-eval-strict.js
index dfc67f1b18..08e02477c1 100644
--- a/test/language/statements/function/name-eval-strict.js
+++ b/test/language/statements/function/name-eval-strict.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function eval() { }
diff --git a/test/language/statements/function/param-arguments-strict-body.js b/test/language/statements/function/param-arguments-strict-body.js
index aa839a1d98..0f106b3812 100644
--- a/test/language/statements/function/param-arguments-strict-body.js
+++ b/test/language/statements/function/param-arguments-strict-body.js
@@ -17,6 +17,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_20_fun(arguments) { 'use strict'; }
diff --git a/test/language/statements/function/param-arguments-strict.js b/test/language/statements/function/param-arguments-strict.js
index 7d00ecf8d3..d80657d6b6 100644
--- a/test/language/statements/function/param-arguments-strict.js
+++ b/test/language/statements/function/param-arguments-strict.js
@@ -17,6 +17,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_3_fun(arguments) { }
diff --git a/test/language/statements/function/param-dflt-yield-strict.js b/test/language/statements/function/param-dflt-yield-strict.js
index a310c6b9c1..308bdb8969 100644
--- a/test/language/statements/function/param-dflt-yield-strict.js
+++ b/test/language/statements/function/param-dflt-yield-strict.js
@@ -16,7 +16,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *g() {
   function f(x = yield) {
diff --git a/test/language/statements/function/param-duplicated-strict-1.js b/test/language/statements/function/param-duplicated-strict-1.js
index ddc8a5046c..69dc995f6f 100644
--- a/test/language/statements/function/param-duplicated-strict-1.js
+++ b/test/language/statements/function/param-duplicated-strict-1.js
@@ -17,6 +17,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_5_fun(param, param) { }
diff --git a/test/language/statements/function/param-duplicated-strict-2.js b/test/language/statements/function/param-duplicated-strict-2.js
index f606d255a2..24e0694adc 100644
--- a/test/language/statements/function/param-duplicated-strict-2.js
+++ b/test/language/statements/function/param-duplicated-strict-2.js
@@ -18,6 +18,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_6_fun(param1, param2, param1) { }
diff --git a/test/language/statements/function/param-duplicated-strict-3.js b/test/language/statements/function/param-duplicated-strict-3.js
index 9404faeee6..fffbc4f9f5 100644
--- a/test/language/statements/function/param-duplicated-strict-3.js
+++ b/test/language/statements/function/param-duplicated-strict-3.js
@@ -17,6 +17,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_7_fun(param, param, param) { }
diff --git a/test/language/statements/function/param-duplicated-strict-body-1.js b/test/language/statements/function/param-duplicated-strict-body-1.js
index 555780408b..0bff98ae7d 100644
--- a/test/language/statements/function/param-duplicated-strict-body-1.js
+++ b/test/language/statements/function/param-duplicated-strict-body-1.js
@@ -17,6 +17,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_24_fun(param, param) { 'use strict'; }
diff --git a/test/language/statements/function/param-duplicated-strict-body-2.js b/test/language/statements/function/param-duplicated-strict-body-2.js
index a5ab552c39..a4ebbe36e2 100644
--- a/test/language/statements/function/param-duplicated-strict-body-2.js
+++ b/test/language/statements/function/param-duplicated-strict-body-2.js
@@ -18,6 +18,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_26_fun(param1, param2, param1) { 'use strict'; }
diff --git a/test/language/statements/function/param-duplicated-strict-body-3.js b/test/language/statements/function/param-duplicated-strict-body-3.js
index 072499dffe..bf62fd13d4 100644
--- a/test/language/statements/function/param-duplicated-strict-body-3.js
+++ b/test/language/statements/function/param-duplicated-strict-body-3.js
@@ -17,6 +17,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_28_fun(param, param, param) { 'use strict'; }
diff --git a/test/language/statements/function/param-eval-strict-body.js b/test/language/statements/function/param-eval-strict-body.js
index 51cff13c5f..14ec629d1c 100644
--- a/test/language/statements/function/param-eval-strict-body.js
+++ b/test/language/statements/function/param-eval-strict-body.js
@@ -17,6 +17,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_16_fun(eval) { 'use strict'; }
diff --git a/test/language/statements/function/param-eval-strict.js b/test/language/statements/function/param-eval-strict.js
index c2ff694254..03d5f64b12 100644
--- a/test/language/statements/function/param-eval-strict.js
+++ b/test/language/statements/function/param-eval-strict.js
@@ -17,6 +17,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function _13_1_1_fun(eval) { }
diff --git a/test/language/statements/function/rest-params-trailing-comma-early-error.js b/test/language/statements/function/rest-params-trailing-comma-early-error.js
index a03ea03e5a..61a2695466 100644
--- a/test/language/statements/function/rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/function/rest-params-trailing-comma-early-error.js
@@ -51,7 +51,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f(...a,) {
   
diff --git a/test/language/statements/function/use-strict-with-non-simple-param.js b/test/language/statements/function/use-strict-with-non-simple-param.js
index eb7162a5cd..feb90fbf5e 100644
--- a/test/language/statements/function/use-strict-with-non-simple-param.js
+++ b/test/language/statements/function/use-strict-with-non-simple-param.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f(a = 0) {
   "use strict";
diff --git a/test/language/statements/generators/dflt-params-duplicates.js b/test/language/statements/generators/dflt-params-duplicates.js
index be04cd5bb9..cdb0acd6b7 100644
--- a/test/language/statements/generators/dflt-params-duplicates.js
+++ b/test/language/statements/generators/dflt-params-duplicates.js
@@ -55,7 +55,7 @@ info: |
       elements.
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* f(x = 0, x) {
   
diff --git a/test/language/statements/generators/dflt-params-rest.js b/test/language/statements/generators/dflt-params-rest.js
index 1c67f52f85..aa16d2fcde 100644
--- a/test/language/statements/generators/dflt-params-rest.js
+++ b/test/language/statements/generators/dflt-params-rest.js
@@ -59,7 +59,7 @@ info: |
       ...BindingPattern[?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* f(...x = []) {
   
diff --git a/test/language/statements/generators/dstr-ary-ptrn-rest-init-ary.js b/test/language/statements/generators/dstr-ary-ptrn-rest-init-ary.js
index eb5a453f60..e910184633 100644
--- a/test/language/statements/generators/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/generators/dstr-ary-ptrn-rest-init-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...[ x ] = []]) {
diff --git a/test/language/statements/generators/dstr-ary-ptrn-rest-init-id.js b/test/language/statements/generators/dstr-ary-ptrn-rest-init-id.js
index 9d7ea55f5c..da497a2bca 100644
--- a/test/language/statements/generators/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/generators/dstr-ary-ptrn-rest-init-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...x = []]) {
diff --git a/test/language/statements/generators/dstr-ary-ptrn-rest-init-obj.js b/test/language/statements/generators/dstr-ary-ptrn-rest-init-obj.js
index cfd0cfa029..1da1697f80 100644
--- a/test/language/statements/generators/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/generators/dstr-ary-ptrn-rest-init-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...{ x } = []]) {
diff --git a/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-ary.js
index d5d27cf71f..4a06b066ce 100644
--- a/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...[x], y]) {
diff --git a/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-id.js b/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-id.js
index b73d0de843..06f2cf726b 100644
--- a/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...x, y]) {
diff --git a/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-obj.js
index 3dff8839cf..00d9c69ee6 100644
--- a/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/generators/dstr-ary-ptrn-rest-not-final-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...{ x }, y]) {
diff --git a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-ary.js b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-ary.js
index caa94db564..e51de27720 100644
--- a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...[ x ] = []] = []) {
diff --git a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-id.js b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-id.js
index 2be605a7d2..e56213c3fd 100644
--- a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...x = []] = []) {
diff --git a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-obj.js b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-obj.js
index 5f81ffe88d..1ba6a98ddc 100644
--- a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-init-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...{ x } = []] = []) {
diff --git a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-ary.js b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-ary.js
index 9dd55e8480..f1718dc8cd 100644
--- a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-ary.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...[x], y] = [1, 2, 3]) {
diff --git a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-id.js b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-id.js
index 2d3835a2a3..fc16874041 100644
--- a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-id.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...x, y] = [1, 2, 3]) {
diff --git a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-obj.js b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-obj.js
index f545490223..934a55a35b 100644
--- a/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/generators/dstr-dflt-ary-ptrn-rest-not-final-obj.js
@@ -47,7 +47,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 function* f([...{ x }, y] = [1, 2, 3]) {
diff --git a/test/language/statements/generators/param-dflt-yield.js b/test/language/statements/generators/param-dflt-yield.js
index f316ce0ee2..707f8ec20a 100644
--- a/test/language/statements/generators/param-dflt-yield.js
+++ b/test/language/statements/generators/param-dflt-yield.js
@@ -19,6 +19,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g(x = yield) {}
diff --git a/test/language/statements/generators/rest-params-trailing-comma-early-error.js b/test/language/statements/generators/rest-params-trailing-comma-early-error.js
index bf07db08dd..e37fb51b1f 100644
--- a/test/language/statements/generators/rest-params-trailing-comma-early-error.js
+++ b/test/language/statements/generators/rest-params-trailing-comma-early-error.js
@@ -52,7 +52,7 @@ info: |
         FormalParameterList[?Yield, ?Await] ,
         FormalParameterList[?Yield, ?Await] , FunctionRestParameter[?Yield, ?Await]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* f(...a,) {
   
diff --git a/test/language/statements/generators/use-strict-with-non-simple-param.js b/test/language/statements/generators/use-strict-with-non-simple-param.js
index 9a4c39cc50..cc7736e52f 100644
--- a/test/language/statements/generators/use-strict-with-non-simple-param.js
+++ b/test/language/statements/generators/use-strict-with-non-simple-param.js
@@ -15,7 +15,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* f(a = 0) {
   "use strict";
diff --git a/test/language/statements/generators/yield-as-binding-identifier-escaped.js b/test/language/statements/generators/yield-as-binding-identifier-escaped.js
index 8dba014a0d..ec830e8a66 100644
--- a/test/language/statements/generators/yield-as-binding-identifier-escaped.js
+++ b/test/language/statements/generators/yield-as-binding-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *gen() {
   var yi\u0065ld;
diff --git a/test/language/statements/generators/yield-as-binding-identifier.js b/test/language/statements/generators/yield-as-binding-identifier.js
index 9b2ad53d80..2c50ffd87c 100644
--- a/test/language/statements/generators/yield-as-binding-identifier.js
+++ b/test/language/statements/generators/yield-as-binding-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *gen() {
   var yield;
diff --git a/test/language/statements/generators/yield-as-identifier-reference-escaped.js b/test/language/statements/generators/yield-as-identifier-reference-escaped.js
index a63fbd0081..15c27ae631 100644
--- a/test/language/statements/generators/yield-as-identifier-reference-escaped.js
+++ b/test/language/statements/generators/yield-as-identifier-reference-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *gen() {
   void yi\u0065ld;
diff --git a/test/language/statements/generators/yield-as-identifier-reference.js b/test/language/statements/generators/yield-as-identifier-reference.js
index 46352b3099..8b55ac6ced 100644
--- a/test/language/statements/generators/yield-as-identifier-reference.js
+++ b/test/language/statements/generators/yield-as-identifier-reference.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *gen() {
   void yield;
diff --git a/test/language/statements/generators/yield-as-label-identifier-escaped.js b/test/language/statements/generators/yield-as-label-identifier-escaped.js
index 668f10a029..510c0ff462 100644
--- a/test/language/statements/generators/yield-as-label-identifier-escaped.js
+++ b/test/language/statements/generators/yield-as-label-identifier-escaped.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *gen() {
   yi\u0065ld: ;
diff --git a/test/language/statements/generators/yield-as-label-identifier.js b/test/language/statements/generators/yield-as-label-identifier.js
index 26e7580039..14f875858b 100644
--- a/test/language/statements/generators/yield-as-label-identifier.js
+++ b/test/language/statements/generators/yield-as-label-identifier.js
@@ -22,7 +22,7 @@ info: |
     StringValue of Identifier is "yield".
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function *gen() {
   yield: ;
diff --git a/test/language/statements/generators/yield-as-logical-or-expression.js b/test/language/statements/generators/yield-as-logical-or-expression.js
index f72916619e..4db85d745e 100644
--- a/test/language/statements/generators/yield-as-logical-or-expression.js
+++ b/test/language/statements/generators/yield-as-logical-or-expression.js
@@ -11,7 +11,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 
 function* g() {
diff --git a/test/language/statements/generators/yield-as-parameter.js b/test/language/statements/generators/yield-as-parameter.js
index 1f37d66580..92f2c65ab2 100644
--- a/test/language/statements/generators/yield-as-parameter.js
+++ b/test/language/statements/generators/yield-as-parameter.js
@@ -12,6 +12,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g(yield) {}
diff --git a/test/language/statements/generators/yield-identifier-spread-strict.js b/test/language/statements/generators/yield-identifier-spread-strict.js
index eee4022544..493d595717 100644
--- a/test/language/statements/generators/yield-identifier-spread-strict.js
+++ b/test/language/statements/generators/yield-identifier-spread-strict.js
@@ -23,7 +23,7 @@ info: |
       ...AssignmentExpression[In, ?Yield]
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/generators/yield-identifier-strict.js b/test/language/statements/generators/yield-identifier-strict.js
index 3fd66b965f..b8c0d7a400 100644
--- a/test/language/statements/generators/yield-identifier-strict.js
+++ b/test/language/statements/generators/yield-identifier-strict.js
@@ -16,7 +16,7 @@ info: |
       function * BindingIdentifier ( FormalParameters ) { GeneratorBody }
 
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var callCount = 0;
 
diff --git a/test/language/statements/generators/yield-star-after-newline.js b/test/language/statements/generators/yield-star-after-newline.js
index 606f3b4476..4447a57578 100644
--- a/test/language/statements/generators/yield-star-after-newline.js
+++ b/test/language/statements/generators/yield-star-after-newline.js
@@ -11,7 +11,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() {
   yield
diff --git a/test/language/statements/generators/yield-weak-binding.js b/test/language/statements/generators/yield-weak-binding.js
index 5e3b8bd2d9..035dfbbe7a 100644
--- a/test/language/statements/generators/yield-weak-binding.js
+++ b/test/language/statements/generators/yield-weak-binding.js
@@ -11,6 +11,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* g() { yield 3 + yield 4; }
diff --git a/test/language/statements/if/S12.5_A11.js b/test/language/statements/if/S12.5_A11.js
index 7b35dd6ce8..93aad87bb8 100644
--- a/test/language/statements/if/S12.5_A11.js
+++ b/test/language/statements/if/S12.5_A11.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
diff --git a/test/language/statements/if/S12.5_A6_T1.js b/test/language/statements/if/S12.5_A6_T1.js
index 2babe750fb..2306f5ed38 100644
--- a/test/language/statements/if/S12.5_A6_T1.js
+++ b/test/language/statements/if/S12.5_A6_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/if/S12.5_A6_T2.js b/test/language/statements/if/S12.5_A6_T2.js
index 0a41bacb82..bca0a79b40 100644
--- a/test/language/statements/if/S12.5_A6_T2.js
+++ b/test/language/statements/if/S12.5_A6_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
diff --git a/test/language/statements/if/S12.5_A8.js b/test/language/statements/if/S12.5_A8.js
index dc472d4923..3dc3074d13 100644
--- a/test/language/statements/if/S12.5_A8.js
+++ b/test/language/statements/if/S12.5_A8.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/if/if-async-fun-else-async-fun.js b/test/language/statements/if/if-async-fun-else-async-fun.js
index a2ff660bc7..65cfe002e7 100644
--- a/test/language/statements/if/if-async-fun-else-async-fun.js
+++ b/test/language/statements/if/if-async-fun-else-async-fun.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) async function f() {  } else async function _f() {}
diff --git a/test/language/statements/if/if-async-fun-else-stmt.js b/test/language/statements/if/if-async-fun-else-stmt.js
index f72287ba35..88ca80133f 100644
--- a/test/language/statements/if/if-async-fun-else-stmt.js
+++ b/test/language/statements/if/if-async-fun-else-stmt.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) async function f() {  } else ;
diff --git a/test/language/statements/if/if-async-fun-no-else.js b/test/language/statements/if/if-async-fun-no-else.js
index c6657e9467..8d84418910 100644
--- a/test/language/statements/if/if-async-fun-no-else.js
+++ b/test/language/statements/if/if-async-fun-no-else.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) async function f() {  }
diff --git a/test/language/statements/if/if-async-gen-else-async-gen.js b/test/language/statements/if/if-async-gen-else-async-gen.js
index d41a087ab8..12e4eae7e7 100644
--- a/test/language/statements/if/if-async-gen-else-async-gen.js
+++ b/test/language/statements/if/if-async-gen-else-async-gen.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) async function* f() {  } else async function* _f() {}
diff --git a/test/language/statements/if/if-async-gen-else-stmt.js b/test/language/statements/if/if-async-gen-else-stmt.js
index 7ec5364314..cfa5268b86 100644
--- a/test/language/statements/if/if-async-gen-else-stmt.js
+++ b/test/language/statements/if/if-async-gen-else-stmt.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) async function* f() {  } else ;
diff --git a/test/language/statements/if/if-async-gen-no-else.js b/test/language/statements/if/if-async-gen-no-else.js
index 70ff7f2e90..bc28a047d5 100644
--- a/test/language/statements/if/if-async-gen-no-else.js
+++ b/test/language/statements/if/if-async-gen-no-else.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) async function* f() {  }
diff --git a/test/language/statements/if/if-cls-else-cls.js b/test/language/statements/if/if-cls-else-cls.js
index bab29115fc..6e348b5447 100644
--- a/test/language/statements/if/if-cls-else-cls.js
+++ b/test/language/statements/if/if-cls-else-cls.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) class C {} else class D {}
diff --git a/test/language/statements/if/if-cls-else-stmt.js b/test/language/statements/if/if-cls-else-stmt.js
index f54231fe6b..558e64933f 100644
--- a/test/language/statements/if/if-cls-else-stmt.js
+++ b/test/language/statements/if/if-cls-else-stmt.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) class C {} else ;
diff --git a/test/language/statements/if/if-cls-no-else.js b/test/language/statements/if/if-cls-no-else.js
index a83627d5f0..70956f3221 100644
--- a/test/language/statements/if/if-cls-no-else.js
+++ b/test/language/statements/if/if-cls-no-else.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) class C {}
diff --git a/test/language/statements/if/if-const-else-const.js b/test/language/statements/if/if-const-else-const.js
index 6e482bbfdd..ccd28d18fe 100644
--- a/test/language/statements/if/if-const-else-const.js
+++ b/test/language/statements/if/if-const-else-const.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) const x = null; else const y = null;
diff --git a/test/language/statements/if/if-const-else-stmt.js b/test/language/statements/if/if-const-else-stmt.js
index 3ba92839c8..fd97943822 100644
--- a/test/language/statements/if/if-const-else-stmt.js
+++ b/test/language/statements/if/if-const-else-stmt.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) const x = null; else ;
diff --git a/test/language/statements/if/if-const-no-else.js b/test/language/statements/if/if-const-no-else.js
index 1c8a226140..14d1715012 100644
--- a/test/language/statements/if/if-const-no-else.js
+++ b/test/language/statements/if/if-const-no-else.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) const x = null;
diff --git a/test/language/statements/if/if-decl-else-decl-strict.js b/test/language/statements/if/if-decl-else-decl-strict.js
index 87969f4371..9b4cb84512 100644
--- a/test/language/statements/if/if-decl-else-decl-strict.js
+++ b/test/language/statements/if/if-decl-else-decl-strict.js
@@ -19,6 +19,6 @@ info: |
     The above rules are only applied when parsing code that is not strict mode code.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function f() {  } else function _f() {}
diff --git a/test/language/statements/if/if-decl-else-stmt-strict.js b/test/language/statements/if/if-decl-else-stmt-strict.js
index d233ea22d5..d7443adc6c 100644
--- a/test/language/statements/if/if-decl-else-stmt-strict.js
+++ b/test/language/statements/if/if-decl-else-stmt-strict.js
@@ -19,6 +19,6 @@ info: |
     The above rules are only applied when parsing code that is not strict mode code.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function f() {  } else ;
diff --git a/test/language/statements/if/if-decl-no-else-strict.js b/test/language/statements/if/if-decl-no-else-strict.js
index 44bdb7345c..18962a083c 100644
--- a/test/language/statements/if/if-decl-no-else-strict.js
+++ b/test/language/statements/if/if-decl-no-else-strict.js
@@ -19,6 +19,6 @@ info: |
     The above rules are only applied when parsing code that is not strict mode code.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function f() {  }
diff --git a/test/language/statements/if/if-fun-else-fun-strict.js b/test/language/statements/if/if-fun-else-fun-strict.js
index b8e60c12d1..86120e99b9 100644
--- a/test/language/statements/if/if-fun-else-fun-strict.js
+++ b/test/language/statements/if/if-fun-else-fun-strict.js
@@ -20,6 +20,6 @@ info: |
     The above rules are only applied when parsing code that is not strict mode code.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function f() {} else function _f() {}
diff --git a/test/language/statements/if/if-fun-else-stmt-strict.js b/test/language/statements/if/if-fun-else-stmt-strict.js
index 9f970787a0..c813716993 100644
--- a/test/language/statements/if/if-fun-else-stmt-strict.js
+++ b/test/language/statements/if/if-fun-else-stmt-strict.js
@@ -20,6 +20,6 @@ info: |
     The above rules are only applied when parsing code that is not strict mode code.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function f() {} else ;
diff --git a/test/language/statements/if/if-fun-no-else-strict.js b/test/language/statements/if/if-fun-no-else-strict.js
index 8aec4ecca6..d1ff27e90b 100644
--- a/test/language/statements/if/if-fun-no-else-strict.js
+++ b/test/language/statements/if/if-fun-no-else-strict.js
@@ -20,6 +20,6 @@ info: |
     The above rules are only applied when parsing code that is not strict mode code.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function f() {}
diff --git a/test/language/statements/if/if-gen-else-gen.js b/test/language/statements/if/if-gen-else-gen.js
index d722edced8..2f8b479d13 100644
--- a/test/language/statements/if/if-gen-else-gen.js
+++ b/test/language/statements/if/if-gen-else-gen.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function* g() {  } else function* _g() {}
diff --git a/test/language/statements/if/if-gen-else-stmt.js b/test/language/statements/if/if-gen-else-stmt.js
index 27e61e71a1..4405c3a364 100644
--- a/test/language/statements/if/if-gen-else-stmt.js
+++ b/test/language/statements/if/if-gen-else-stmt.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function* g() {  } else ;
diff --git a/test/language/statements/if/if-gen-no-else.js b/test/language/statements/if/if-gen-no-else.js
index 719070a614..f17f8e852b 100644
--- a/test/language/statements/if/if-gen-no-else.js
+++ b/test/language/statements/if/if-gen-no-else.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) function* g() {  }
diff --git a/test/language/statements/if/if-let-else-let.js b/test/language/statements/if/if-let-else-let.js
index b54a83a3c0..d6fa1fc5ea 100644
--- a/test/language/statements/if/if-let-else-let.js
+++ b/test/language/statements/if/if-let-else-let.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) let x; else let y;
diff --git a/test/language/statements/if/if-let-else-stmt.js b/test/language/statements/if/if-let-else-stmt.js
index 7a7de86d1b..96359bcef6 100644
--- a/test/language/statements/if/if-let-else-stmt.js
+++ b/test/language/statements/if/if-let-else-stmt.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) let x; else ;
diff --git a/test/language/statements/if/if-let-no-else.js b/test/language/statements/if/if-let-no-else.js
index 77fc0ec080..9b7785f581 100644
--- a/test/language/statements/if/if-let-no-else.js
+++ b/test/language/statements/if/if-let-no-else.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) let x;
diff --git a/test/language/statements/if/if-stmt-else-async-fun.js b/test/language/statements/if/if-stmt-else-async-fun.js
index e9ce26137d..90a32ccc03 100644
--- a/test/language/statements/if/if-stmt-else-async-fun.js
+++ b/test/language/statements/if/if-stmt-else-async-fun.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) ; else async function f() {  }
diff --git a/test/language/statements/if/if-stmt-else-async-gen.js b/test/language/statements/if/if-stmt-else-async-gen.js
index 0472f7ea36..ece8a25516 100644
--- a/test/language/statements/if/if-stmt-else-async-gen.js
+++ b/test/language/statements/if/if-stmt-else-async-gen.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) ; else async function* f() {  }
diff --git a/test/language/statements/if/if-stmt-else-cls.js b/test/language/statements/if/if-stmt-else-cls.js
index 0e92afaf67..55f3ef7cd5 100644
--- a/test/language/statements/if/if-stmt-else-cls.js
+++ b/test/language/statements/if/if-stmt-else-cls.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) ; else class C {}
diff --git a/test/language/statements/if/if-stmt-else-const.js b/test/language/statements/if/if-stmt-else-const.js
index c96f954b2b..e2c8b7ca5e 100644
--- a/test/language/statements/if/if-stmt-else-const.js
+++ b/test/language/statements/if/if-stmt-else-const.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) ; else const x = null;
diff --git a/test/language/statements/if/if-stmt-else-decl-strict.js b/test/language/statements/if/if-stmt-else-decl-strict.js
index 94eab02d69..4d64b91831 100644
--- a/test/language/statements/if/if-stmt-else-decl-strict.js
+++ b/test/language/statements/if/if-stmt-else-decl-strict.js
@@ -23,6 +23,6 @@ info: |
        [...]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) ; else function f() {  }
diff --git a/test/language/statements/if/if-stmt-else-fun-strict.js b/test/language/statements/if/if-stmt-else-fun-strict.js
index 118e0f209a..bd7ac89c9a 100644
--- a/test/language/statements/if/if-stmt-else-fun-strict.js
+++ b/test/language/statements/if/if-stmt-else-fun-strict.js
@@ -24,6 +24,6 @@ info: |
        [...]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) ; else function f() {}
diff --git a/test/language/statements/if/if-stmt-else-gen.js b/test/language/statements/if/if-stmt-else-gen.js
index 02fb8b7fed..d1c79f6e95 100644
--- a/test/language/statements/if/if-stmt-else-gen.js
+++ b/test/language/statements/if/if-stmt-else-gen.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) ; else function* g() {  }
diff --git a/test/language/statements/if/if-stmt-else-let.js b/test/language/statements/if/if-stmt-else-let.js
index cd0a91c914..5c7146be65 100644
--- a/test/language/statements/if/if-stmt-else-let.js
+++ b/test/language/statements/if/if-stmt-else-let.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) ; else let x;
diff --git a/test/language/statements/if/labelled-fn-stmt-first.js b/test/language/statements/if/labelled-fn-stmt-first.js
index a538450d92..9d9aa8c4fc 100644
--- a/test/language/statements/if/labelled-fn-stmt-first.js
+++ b/test/language/statements/if/labelled-fn-stmt-first.js
@@ -24,6 +24,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) label1: label2: function test262() {} else ;
diff --git a/test/language/statements/if/labelled-fn-stmt-lone.js b/test/language/statements/if/labelled-fn-stmt-lone.js
index 3ba5012c98..4380f1330e 100644
--- a/test/language/statements/if/labelled-fn-stmt-lone.js
+++ b/test/language/statements/if/labelled-fn-stmt-lone.js
@@ -24,6 +24,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) label1: label2: function test262() {}
diff --git a/test/language/statements/if/labelled-fn-stmt-second.js b/test/language/statements/if/labelled-fn-stmt-second.js
index 8542af05bc..e6cb0913eb 100644
--- a/test/language/statements/if/labelled-fn-stmt-second.js
+++ b/test/language/statements/if/labelled-fn-stmt-second.js
@@ -24,6 +24,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (true) ; else label1: label2: function test262() {}
diff --git a/test/language/statements/if/let-array-with-newline.js b/test/language/statements/if/let-array-with-newline.js
index 4e6d913254..78e16a5066 100644
--- a/test/language/statements/if/let-array-with-newline.js
+++ b/test/language/statements/if/let-array-with-newline.js
@@ -15,7 +15,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 if (false) let
 [a] = 0;
diff --git a/test/language/statements/labeled/continue.js b/test/language/statements/labeled/continue.js
index e6a3acb5ec..5e42c9825f 100644
--- a/test/language/statements/labeled/continue.js
+++ b/test/language/statements/labeled/continue.js
@@ -18,7 +18,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 do {
   test262: {
diff --git a/test/language/statements/labeled/decl-async-function.js b/test/language/statements/labeled/decl-async-function.js
index 045722334e..e0b4e8bafd 100644
--- a/test/language/statements/labeled/decl-async-function.js
+++ b/test/language/statements/labeled/decl-async-function.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 label: async function f() {}
diff --git a/test/language/statements/labeled/decl-async-generator.js b/test/language/statements/labeled/decl-async-generator.js
index 0edf01d81c..85e456720f 100644
--- a/test/language/statements/labeled/decl-async-generator.js
+++ b/test/language/statements/labeled/decl-async-generator.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 label: async function* g() {}
diff --git a/test/language/statements/labeled/decl-cls.js b/test/language/statements/labeled/decl-cls.js
index f097ca8a14..41f1de4800 100644
--- a/test/language/statements/labeled/decl-cls.js
+++ b/test/language/statements/labeled/decl-cls.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 label: class C {}
diff --git a/test/language/statements/labeled/decl-const.js b/test/language/statements/labeled/decl-const.js
index 30a99ba1c4..28e2411616 100644
--- a/test/language/statements/labeled/decl-const.js
+++ b/test/language/statements/labeled/decl-const.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 label: const x = null;
diff --git a/test/language/statements/labeled/decl-fun-strict.js b/test/language/statements/labeled/decl-fun-strict.js
index eda37629bf..00f1ae758b 100644
--- a/test/language/statements/labeled/decl-fun-strict.js
+++ b/test/language/statements/labeled/decl-fun-strict.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 label: function g() {}
diff --git a/test/language/statements/labeled/decl-gen.js b/test/language/statements/labeled/decl-gen.js
index 32c5277ab0..22e5161ab8 100644
--- a/test/language/statements/labeled/decl-gen.js
+++ b/test/language/statements/labeled/decl-gen.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 label: function* g() {}
diff --git a/test/language/statements/labeled/decl-let.js b/test/language/statements/labeled/decl-let.js
index 601d4ae6d8..5d0e2d187e 100644
--- a/test/language/statements/labeled/decl-let.js
+++ b/test/language/statements/labeled/decl-let.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 label: let x;
diff --git a/test/language/statements/labeled/let-array-with-newline.js b/test/language/statements/labeled/let-array-with-newline.js
index b49dd6f38c..81c167c461 100644
--- a/test/language/statements/labeled/let-array-with-newline.js
+++ b/test/language/statements/labeled/let-array-with-newline.js
@@ -15,7 +15,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // Wrapped in an if-statement to avoid reference errors at runtime.
 if (false) {
diff --git a/test/language/statements/labeled/value-await-module-escaped.js b/test/language/statements/labeled/value-await-module-escaped.js
index 3d59c2aa52..0d8c20ee1c 100644
--- a/test/language/statements/labeled/value-await-module-escaped.js
+++ b/test/language/statements/labeled/value-await-module-escaped.js
@@ -16,6 +16,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 aw\u0061it: 1;
diff --git a/test/language/statements/labeled/value-await-module.js b/test/language/statements/labeled/value-await-module.js
index 7eb4bb65bb..c923d9ed90 100644
--- a/test/language/statements/labeled/value-await-module.js
+++ b/test/language/statements/labeled/value-await-module.js
@@ -15,6 +15,6 @@ negative:
 flags: [module]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 await: 1;
diff --git a/test/language/statements/labeled/value-yield-strict-escaped.js b/test/language/statements/labeled/value-yield-strict-escaped.js
index 2b5ccc9bec..638cf0fe0e 100644
--- a/test/language/statements/labeled/value-yield-strict-escaped.js
+++ b/test/language/statements/labeled/value-yield-strict-escaped.js
@@ -17,6 +17,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 yi\u0065ld: 1;
diff --git a/test/language/statements/labeled/value-yield-strict.js b/test/language/statements/labeled/value-yield-strict.js
index 9e097b9faf..bcc3fc6f97 100644
--- a/test/language/statements/labeled/value-yield-strict.js
+++ b/test/language/statements/labeled/value-yield-strict.js
@@ -12,6 +12,6 @@
   flags: [onlyStrict]
  ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 yield: 1;
diff --git a/test/language/statements/let/dstr-ary-ptrn-rest-init-ary.js b/test/language/statements/let/dstr-ary-ptrn-rest-init-ary.js
index c00541b3b7..35242a0451 100644
--- a/test/language/statements/let/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/let/dstr-ary-ptrn-rest-init-ary.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let [...[ x ] = []] = [];
 
diff --git a/test/language/statements/let/dstr-ary-ptrn-rest-init-id.js b/test/language/statements/let/dstr-ary-ptrn-rest-init-id.js
index 2dcfcac25f..042ba84084 100644
--- a/test/language/statements/let/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/let/dstr-ary-ptrn-rest-init-id.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let [...x = []] = [];
 
diff --git a/test/language/statements/let/dstr-ary-ptrn-rest-init-obj.js b/test/language/statements/let/dstr-ary-ptrn-rest-init-obj.js
index 1672d0f2ee..7ea4e95515 100644
--- a/test/language/statements/let/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/let/dstr-ary-ptrn-rest-init-obj.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let [...{ x } = []] = [];
 
diff --git a/test/language/statements/let/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/statements/let/dstr-ary-ptrn-rest-not-final-ary.js
index 68dda3dab8..a5a4433fc5 100644
--- a/test/language/statements/let/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/let/dstr-ary-ptrn-rest-not-final-ary.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let [...[x], y] = [1, 2, 3];
 
diff --git a/test/language/statements/let/dstr-ary-ptrn-rest-not-final-id.js b/test/language/statements/let/dstr-ary-ptrn-rest-not-final-id.js
index 4958b4ade4..03e88a3ea5 100644
--- a/test/language/statements/let/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/let/dstr-ary-ptrn-rest-not-final-id.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let [...x, y] = [1, 2, 3];
 
diff --git a/test/language/statements/let/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/statements/let/dstr-ary-ptrn-rest-not-final-obj.js
index 227bb25d07..cfaf68f1ad 100644
--- a/test/language/statements/let/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/let/dstr-ary-ptrn-rest-not-final-obj.js
@@ -26,7 +26,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let [...{ x }, y] = [1, 2, 3];
 
diff --git a/test/language/statements/let/redeclaration-error-from-within-strict-mode-function.js b/test/language/statements/let/redeclaration-error-from-within-strict-mode-function.js
index 6f00de3ae7..81433e41bf 100644
--- a/test/language/statements/let/redeclaration-error-from-within-strict-mode-function.js
+++ b/test/language/statements/let/redeclaration-error-from-within-strict-mode-function.js
@@ -10,6 +10,6 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 (function() { 'use strict'; { let f; var f; } })
 
diff --git a/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-function-declaration.js b/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-function-declaration.js
index 6f38c7740a..51a0816b71 100644
--- a/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-function-declaration.js
+++ b/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-function-declaration.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 { let f; function f() {} }
diff --git a/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js b/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js
index df1226b666..2f9d74e6e7 100644
--- a/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js
+++ b/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 { let f; var f; }
 
diff --git a/test/language/statements/let/syntax/identifier-let-allowed-as-lefthandside-expression-strict.js b/test/language/statements/let/syntax/identifier-let-allowed-as-lefthandside-expression-strict.js
index 9d91fa4001..c5ebe0c1da 100644
--- a/test/language/statements/let/syntax/identifier-let-allowed-as-lefthandside-expression-strict.js
+++ b/test/language/statements/let/syntax/identifier-let-allowed-as-lefthandside-expression-strict.js
@@ -11,7 +11,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 var o = { a: 1 };
 for (let in o) { }
 
diff --git a/test/language/statements/let/syntax/identifier-let-disallowed-as-boundname.js b/test/language/statements/let/syntax/identifier-let-disallowed-as-boundname.js
index 078dbef0e7..c36a9960f8 100644
--- a/test/language/statements/let/syntax/identifier-let-disallowed-as-boundname.js
+++ b/test/language/statements/let/syntax/identifier-let-disallowed-as-boundname.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (let let in {}) { }
 
diff --git a/test/language/statements/let/syntax/let-let-declaration-split-across-two-lines.js b/test/language/statements/let/syntax/let-let-declaration-split-across-two-lines.js
index 33d1e0fa7c..86b2223be1 100644
--- a/test/language/statements/let/syntax/let-let-declaration-split-across-two-lines.js
+++ b/test/language/statements/let/syntax/let-let-declaration-split-across-two-lines.js
@@ -27,7 +27,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let  // start of a LexicalDeclaration, *not* an ASI opportunity
 let;
diff --git a/test/language/statements/let/syntax/let-let-declaration-with-initializer-split-across-two-lines.js b/test/language/statements/let/syntax/let-let-declaration-with-initializer-split-across-two-lines.js
index 18d2dd083b..2edb1ea1cf 100644
--- a/test/language/statements/let/syntax/let-let-declaration-with-initializer-split-across-two-lines.js
+++ b/test/language/statements/let/syntax/let-let-declaration-with-initializer-split-across-two-lines.js
@@ -27,7 +27,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 let  // start of a LexicalDeclaration, *not* an ASI opportunity
 let = "irrelevant initializer";
diff --git a/test/language/statements/let/syntax/let-newline-await-in-normal-function.js b/test/language/statements/let/syntax/let-newline-await-in-normal-function.js
index 5cbc36b821..ab5051f94f 100644
--- a/test/language/statements/let/syntax/let-newline-await-in-normal-function.js
+++ b/test/language/statements/let/syntax/let-newline-await-in-normal-function.js
@@ -16,7 +16,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
     let
diff --git a/test/language/statements/let/syntax/let-newline-yield-in-generator-function.js b/test/language/statements/let/syntax/let-newline-yield-in-generator-function.js
index 8eaca8aaae..7858e093da 100644
--- a/test/language/statements/let/syntax/let-newline-yield-in-generator-function.js
+++ b/test/language/statements/let/syntax/let-newline-yield-in-generator-function.js
@@ -17,7 +17,7 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function* f() {
     let
diff --git a/test/language/statements/let/syntax/let-newline-yield-in-normal-function.js b/test/language/statements/let/syntax/let-newline-yield-in-normal-function.js
index 13b599bef7..f11eee808e 100644
--- a/test/language/statements/let/syntax/let-newline-yield-in-normal-function.js
+++ b/test/language/statements/let/syntax/let-newline-yield-in-normal-function.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
     let
diff --git a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-do-statement-while-expression.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-do-statement-while-expression.js
index f52f823e88..3f4d58f7db 100644
--- a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-do-statement-while-expression.js
+++ b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-do-statement-while-expression.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 do let x = 1; while (false)
diff --git a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-for-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-for-statement.js
index 21283585b9..4a069c0d4f 100644
--- a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-for-statement.js
+++ b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-for-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (;false;) let x = 1;
diff --git a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement-else-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement-else-statement.js
index daa76b9b19..cc038b8063 100644
--- a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement-else-statement.js
+++ b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement-else-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) {} else let x = 1;
diff --git a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement.js
index 3498419142..e7fd7cfd81 100644
--- a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement.js
+++ b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) let x = 1;
diff --git a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-label-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-label-statement.js
index 0dbb5ebe66..eb215ccc07 100644
--- a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-label-statement.js
+++ b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-label-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 label: let x = 1;
diff --git a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-while-expression-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-while-expression-statement.js
index efc5c54c31..972187616a 100644
--- a/test/language/statements/let/syntax/with-initialisers-in-statement-positions-while-expression-statement.js
+++ b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-while-expression-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 while (false) let x = 1;
diff --git a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-do-statement-while-expression.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-do-statement-while-expression.js
index d1995ae3e5..74ef945ad7 100644
--- a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-do-statement-while-expression.js
+++ b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-do-statement-while-expression.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 do let x; while (false)
diff --git a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-for-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-for-statement.js
index 736ae70b19..9ca112dc15 100644
--- a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-for-statement.js
+++ b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-for-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 for (;false;) let x;
diff --git a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement-else-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement-else-statement.js
index 16dfb747df..bba093da21 100644
--- a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement-else-statement.js
+++ b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement-else-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) {} else let x;
diff --git a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement.js
index c2b0c37e3a..1bbe1373c7 100644
--- a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement.js
+++ b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 if (true) let x;
diff --git a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-label-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-label-statement.js
index 7623f0feab..3aaabf2d87 100644
--- a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-label-statement.js
+++ b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-label-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 label: let x;
diff --git a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-while-expression-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-while-expression-statement.js
index 0db62e85d6..91c841aec1 100644
--- a/test/language/statements/let/syntax/without-initialisers-in-statement-positions-while-expression-statement.js
+++ b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-while-expression-statement.js
@@ -10,5 +10,5 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 while (false) let x;
diff --git a/test/language/statements/return/S12.9_A1_T1.js b/test/language/statements/return/S12.9_A1_T1.js
index 8e5b8b63a0..80ac1c2b91 100644
--- a/test/language/statements/return/S12.9_A1_T1.js
+++ b/test/language/statements/return/S12.9_A1_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T10.js b/test/language/statements/return/S12.9_A1_T10.js
index fddcecd36b..33a811f719 100644
--- a/test/language/statements/return/S12.9_A1_T10.js
+++ b/test/language/statements/return/S12.9_A1_T10.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T2.js b/test/language/statements/return/S12.9_A1_T2.js
index 6e951e07bc..7afbb2d961 100644
--- a/test/language/statements/return/S12.9_A1_T2.js
+++ b/test/language/statements/return/S12.9_A1_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T3.js b/test/language/statements/return/S12.9_A1_T3.js
index d724c51148..566ed19d3e 100644
--- a/test/language/statements/return/S12.9_A1_T3.js
+++ b/test/language/statements/return/S12.9_A1_T3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T4.js b/test/language/statements/return/S12.9_A1_T4.js
index dea0187b23..6b80e16111 100644
--- a/test/language/statements/return/S12.9_A1_T4.js
+++ b/test/language/statements/return/S12.9_A1_T4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T5.js b/test/language/statements/return/S12.9_A1_T5.js
index 19fe41a94b..87cad62146 100644
--- a/test/language/statements/return/S12.9_A1_T5.js
+++ b/test/language/statements/return/S12.9_A1_T5.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T6.js b/test/language/statements/return/S12.9_A1_T6.js
index 5a52b441d1..f060fb9409 100644
--- a/test/language/statements/return/S12.9_A1_T6.js
+++ b/test/language/statements/return/S12.9_A1_T6.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T7.js b/test/language/statements/return/S12.9_A1_T7.js
index ef806b2e74..ab1ab4f038 100644
--- a/test/language/statements/return/S12.9_A1_T7.js
+++ b/test/language/statements/return/S12.9_A1_T7.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T8.js b/test/language/statements/return/S12.9_A1_T8.js
index adc6e6112e..cbd7afbd33 100644
--- a/test/language/statements/return/S12.9_A1_T8.js
+++ b/test/language/statements/return/S12.9_A1_T8.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/return/S12.9_A1_T9.js b/test/language/statements/return/S12.9_A1_T9.js
index 637f5baf2c..7bbb7417b7 100644
--- a/test/language/statements/return/S12.9_A1_T9.js
+++ b/test/language/statements/return/S12.9_A1_T9.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/switch/S12.11_A2_T1.js b/test/language/statements/switch/S12.11_A2_T1.js
index 564b4c3bcd..839df41e40 100644
--- a/test/language/statements/switch/S12.11_A2_T1.js
+++ b/test/language/statements/switch/S12.11_A2_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function SwitchTest(value){
   var result = 0;
diff --git a/test/language/statements/switch/S12.11_A3_T1.js b/test/language/statements/switch/S12.11_A3_T1.js
index 18d62ea598..f2e6f8cd8f 100644
--- a/test/language/statements/switch/S12.11_A3_T1.js
+++ b/test/language/statements/switch/S12.11_A3_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function SwitchTest(value){
   var result = 0;
diff --git a/test/language/statements/switch/S12.11_A3_T2.js b/test/language/statements/switch/S12.11_A3_T2.js
index baf35bf0bb..77fbdcf1bf 100644
--- a/test/language/statements/switch/S12.11_A3_T2.js
+++ b/test/language/statements/switch/S12.11_A3_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function SwitchTest(value){
   var result = 0;
diff --git a/test/language/statements/switch/S12.11_A3_T3.js b/test/language/statements/switch/S12.11_A3_T3.js
index ba4b0a2370..ba9cb4323e 100644
--- a/test/language/statements/switch/S12.11_A3_T3.js
+++ b/test/language/statements/switch/S12.11_A3_T3.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch(value);
diff --git a/test/language/statements/switch/S12.11_A3_T4.js b/test/language/statements/switch/S12.11_A3_T4.js
index d87b5c6d85..1c149928b0 100644
--- a/test/language/statements/switch/S12.11_A3_T4.js
+++ b/test/language/statements/switch/S12.11_A3_T4.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function SwitchTest(value){
   var result = 0;
diff --git a/test/language/statements/switch/S12.11_A3_T5.js b/test/language/statements/switch/S12.11_A3_T5.js
index 1ff4da7773..5733c8b29e 100644
--- a/test/language/statements/switch/S12.11_A3_T5.js
+++ b/test/language/statements/switch/S12.11_A3_T5.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function SwitchTest(value){
   var result = 0;
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 10e1ea79f1..bd8e77ef6b 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: async function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 98829724d9..6098287ba5 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: async function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
index 91906db752..da33064208 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: class f {}; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
index c9a20386fa..836892ea22 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: const f = 0; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
index 8bfc287a44..c9b8546845 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
index 574e66f64c..083f8d363e 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
index b2f421efc8..9ef2ba2e2a 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: let f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
index 23727ed147..73fe7bd0bc 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function f() {} default: var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 227787cfaa..55be8d639f 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: async function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 9ce3ef18fd..3a634f1190 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: async function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
index eafc4aa8c3..35694ef3d4 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: class f {}; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
index ea389625eb..32415daa6e 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: const f = 0; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
index 2b8d9f9edd..ed563f0196 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
index 541e95fbfb..725dcf1d0e 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
index bf80a01573..28c8184f4e 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: let f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
index 90043ab648..0281f3cddc 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: async function* f() {} default: var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 4be2f94921..5178f3edba 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: async function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index d906486e24..4db0ed845c 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: async function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
index 86d28fc414..50aa4cdd5e 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: class f {}; }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
index fc40322be7..dcca5fa4e0 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: const f = 0; }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
index 3105bd1055..6f6ea32f17 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
index 2ab7f45259..5d035983da 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
index d638d275f9..00552af97c 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: let f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
index 01bdf7c2c5..dd35a925cc 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: class f {} default: var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
index a7b2b0f380..1a84de956e 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: async function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index a716283d59..c1d6b37b13 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: async function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
index 935e2d4592..55c492f193 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: class f {}; }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
index aa12581202..1c35408a95 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: const f = 0; }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
index 9e5576766d..c5c16513f4 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
index 9afdc67ba2..bf70693802 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
index f78bdc1a5f..cab2d7ba83 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: let f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
index dd83aae74a..9aa3667c62 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: const f = 0; default: var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 652d4bcf09..cb5c6de837 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: async function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 17b1324f6d..6cae1a9f81 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: async function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
index 7ae9ee7eac..48eb323a3b 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: class f {}; }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
index 8dc1a364bd..84bf72fba4 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: const f = 0; }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
index f8a289eeb3..75c43a0137 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
index 63c7aa4858..da46e8bcd0 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
index 1f086094bf..4ca757f0df 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: let f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
index b0afd350b1..efa90415f8 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function f() {} default: var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
index cdb4ecbd4c..d87b260f69 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: async function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 751268f6c1..4b70e514b9 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: async function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
index ffcf44ed73..393c2343a2 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: class f {}; }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
index d7717b00e5..52b8147df7 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: const f = 0; }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
index 9983750e45..72a68f8276 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
index c4ff279fe1..9119f0994f 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
index e670aa5021..2149cff066 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: let f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
index 358defe864..0fe4925156 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: function* f() {} default: var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
index 216e63ae95..a1408a5d05 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: async function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index 5cc25428f5..b8f667a00f 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: async function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
index d42ebda22b..e09b73cf01 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: class f {}; }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
index 2274bda835..85b658b2a2 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: const f = 0; }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
index e3a1b71bc2..9186b43cb4 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
index b9683e04ef..3536efc5e1 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
index 832c8d33bd..56a9f055ad 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: let f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
index 7e78aa32c9..646d2f36ca 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: let f; default: var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
index d913906d1d..ab27b6fa45 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: async function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
index cc91b83c69..52971bb3ee 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: async function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
index a026c4ad42..e457e72148 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: class f {}; }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
index 0aee9f93fd..426f9708db 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: const f = 0; }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
index 952753dd4d..86b3f9e75c 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: function f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
index 8e1a907080..640a12a798 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
@@ -18,6 +18,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: function* f() {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
index c346768708..91d4c3b088 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
@@ -17,6 +17,6 @@ info: |
 ---*/
 
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 switch (0) { case 1: var f; default: let f; }
diff --git a/test/language/statements/try/S12.14_A16_T1.js b/test/language/statements/try/S12.14_A16_T1.js
index 342586349b..32b72b362b 100644
--- a/test/language/statements/try/S12.14_A16_T1.js
+++ b/test/language/statements/try/S12.14_A16_T1.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try
diff --git a/test/language/statements/try/S12.14_A16_T10.js b/test/language/statements/try/S12.14_A16_T10.js
index a453bf6b7d..881c119e91 100644
--- a/test/language/statements/try/S12.14_A16_T10.js
+++ b/test/language/statements/try/S12.14_A16_T10.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try{}
diff --git a/test/language/statements/try/S12.14_A16_T11.js b/test/language/statements/try/S12.14_A16_T11.js
index 69ba62c6b5..436ed52c81 100644
--- a/test/language/statements/try/S12.14_A16_T11.js
+++ b/test/language/statements/try/S12.14_A16_T11.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try{
diff --git a/test/language/statements/try/S12.14_A16_T12.js b/test/language/statements/try/S12.14_A16_T12.js
index 290a0fc5d3..e598416593 100644
--- a/test/language/statements/try/S12.14_A16_T12.js
+++ b/test/language/statements/try/S12.14_A16_T12.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try
diff --git a/test/language/statements/try/S12.14_A16_T13.js b/test/language/statements/try/S12.14_A16_T13.js
index f15df1f29b..6d85dcd26c 100644
--- a/test/language/statements/try/S12.14_A16_T13.js
+++ b/test/language/statements/try/S12.14_A16_T13.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try
diff --git a/test/language/statements/try/S12.14_A16_T14.js b/test/language/statements/try/S12.14_A16_T14.js
index ea16ebb97c..cee097b199 100644
--- a/test/language/statements/try/S12.14_A16_T14.js
+++ b/test/language/statements/try/S12.14_A16_T14.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try(e1){
diff --git a/test/language/statements/try/S12.14_A16_T15.js b/test/language/statements/try/S12.14_A16_T15.js
index 873722816c..31cb65dbac 100644
--- a/test/language/statements/try/S12.14_A16_T15.js
+++ b/test/language/statements/try/S12.14_A16_T15.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try{
diff --git a/test/language/statements/try/S12.14_A16_T2.js b/test/language/statements/try/S12.14_A16_T2.js
index fcb7b3c9cd..de51c0d227 100644
--- a/test/language/statements/try/S12.14_A16_T2.js
+++ b/test/language/statements/try/S12.14_A16_T2.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 catch
diff --git a/test/language/statements/try/S12.14_A16_T3.js b/test/language/statements/try/S12.14_A16_T3.js
index def9e18366..ae20d39cd7 100644
--- a/test/language/statements/try/S12.14_A16_T3.js
+++ b/test/language/statements/try/S12.14_A16_T3.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 finally
diff --git a/test/language/statements/try/S12.14_A16_T5.js b/test/language/statements/try/S12.14_A16_T5.js
index 99a0399384..d122a10943 100644
--- a/test/language/statements/try/S12.14_A16_T5.js
+++ b/test/language/statements/try/S12.14_A16_T5.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try{}
diff --git a/test/language/statements/try/S12.14_A16_T6.js b/test/language/statements/try/S12.14_A16_T6.js
index 3ede65c0c5..0f576a651b 100644
--- a/test/language/statements/try/S12.14_A16_T6.js
+++ b/test/language/statements/try/S12.14_A16_T6.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try{
diff --git a/test/language/statements/try/S12.14_A16_T7.js b/test/language/statements/try/S12.14_A16_T7.js
index ef9692c22f..68495630ff 100644
--- a/test/language/statements/try/S12.14_A16_T7.js
+++ b/test/language/statements/try/S12.14_A16_T7.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try{}
diff --git a/test/language/statements/try/S12.14_A16_T8.js b/test/language/statements/try/S12.14_A16_T8.js
index 5956c5626c..ac994569a6 100644
--- a/test/language/statements/try/S12.14_A16_T8.js
+++ b/test/language/statements/try/S12.14_A16_T8.js
@@ -14,7 +14,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 try{}
diff --git a/test/language/statements/try/S12.14_A16_T9.js b/test/language/statements/try/S12.14_A16_T9.js
index 542732f6f2..8e9e73f6ac 100644
--- a/test/language/statements/try/S12.14_A16_T9.js
+++ b/test/language/statements/try/S12.14_A16_T9.js
@@ -12,7 +12,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // CHECK#1
 catch(){}
diff --git a/test/language/statements/try/catch-parameter-boundnames-restriction-arguments-negative-early.js b/test/language/statements/try/catch-parameter-boundnames-restriction-arguments-negative-early.js
index f1a03f173e..dde3977123 100644
--- a/test/language/statements/try/catch-parameter-boundnames-restriction-arguments-negative-early.js
+++ b/test/language/statements/try/catch-parameter-boundnames-restriction-arguments-negative-early.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch (arguments) { }
diff --git a/test/language/statements/try/catch-parameter-boundnames-restriction-eval-negative-early.js b/test/language/statements/try/catch-parameter-boundnames-restriction-eval-negative-early.js
index 269dabc483..3e588e30aa 100644
--- a/test/language/statements/try/catch-parameter-boundnames-restriction-eval-negative-early.js
+++ b/test/language/statements/try/catch-parameter-boundnames-restriction-eval-negative-early.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch (eval) { }
diff --git a/test/language/statements/try/dstr-ary-ptrn-rest-init-ary.js b/test/language/statements/try/dstr-ary-ptrn-rest-init-ary.js
index 4cfc813f16..0f574753eb 100644
--- a/test/language/statements/try/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/try/dstr-ary-ptrn-rest-init-ary.js
@@ -24,7 +24,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var ranCatch = false;
 
diff --git a/test/language/statements/try/dstr-ary-ptrn-rest-init-id.js b/test/language/statements/try/dstr-ary-ptrn-rest-init-id.js
index 4063ae3012..133ca4780e 100644
--- a/test/language/statements/try/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/try/dstr-ary-ptrn-rest-init-id.js
@@ -24,7 +24,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var ranCatch = false;
 
diff --git a/test/language/statements/try/dstr-ary-ptrn-rest-init-obj.js b/test/language/statements/try/dstr-ary-ptrn-rest-init-obj.js
index 66193ce437..5c1beb043b 100644
--- a/test/language/statements/try/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/try/dstr-ary-ptrn-rest-init-obj.js
@@ -24,7 +24,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var ranCatch = false;
 
diff --git a/test/language/statements/try/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/statements/try/dstr-ary-ptrn-rest-not-final-ary.js
index 35b2b277ae..dcb07a8cd3 100644
--- a/test/language/statements/try/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/try/dstr-ary-ptrn-rest-not-final-ary.js
@@ -24,7 +24,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var ranCatch = false;
 
diff --git a/test/language/statements/try/dstr-ary-ptrn-rest-not-final-id.js b/test/language/statements/try/dstr-ary-ptrn-rest-not-final-id.js
index 672b3be642..a6f4b64e7b 100644
--- a/test/language/statements/try/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/try/dstr-ary-ptrn-rest-not-final-id.js
@@ -24,7 +24,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var ranCatch = false;
 
diff --git a/test/language/statements/try/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/statements/try/dstr-ary-ptrn-rest-not-final-obj.js
index cdfdf56d4e..63ec534aa2 100644
--- a/test/language/statements/try/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/try/dstr-ary-ptrn-rest-not-final-obj.js
@@ -24,7 +24,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var ranCatch = false;
 
diff --git a/test/language/statements/try/early-catch-duplicates.js b/test/language/statements/try/early-catch-duplicates.js
index 49a97f8d7f..de923e3a8c 100644
--- a/test/language/statements/try/early-catch-duplicates.js
+++ b/test/language/statements/try/early-catch-duplicates.js
@@ -11,6 +11,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch ([x, x]) {}
diff --git a/test/language/statements/try/early-catch-function.js b/test/language/statements/try/early-catch-function.js
index 75acef33e6..8483447c9a 100644
--- a/test/language/statements/try/early-catch-function.js
+++ b/test/language/statements/try/early-catch-function.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 function f() {
     try {
diff --git a/test/language/statements/try/early-catch-lex.js b/test/language/statements/try/early-catch-lex.js
index 49c9122e44..4d12085419 100644
--- a/test/language/statements/try/early-catch-lex.js
+++ b/test/language/statements/try/early-catch-lex.js
@@ -12,6 +12,6 @@ negative:
 features: [let]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch (x) { let x; }
diff --git a/test/language/statements/try/early-catch-var.js b/test/language/statements/try/early-catch-var.js
index 925d92af9c..0101d2ec94 100644
--- a/test/language/statements/try/early-catch-var.js
+++ b/test/language/statements/try/early-catch-var.js
@@ -16,6 +16,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try { } catch (x) { for (var x of []) {} }
diff --git a/test/language/statements/try/optional-catch-binding-parens.js b/test/language/statements/try/optional-catch-binding-parens.js
index 2ed384cc1d..7b05593c89 100644
--- a/test/language/statements/try/optional-catch-binding-parens.js
+++ b/test/language/statements/try/optional-catch-binding-parens.js
@@ -15,7 +15,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 try {} catch () {}
 
diff --git a/test/language/statements/variable/12.2.1-1gs.js b/test/language/statements/variable/12.2.1-1gs.js
index 7a52ea627d..27acdc8a61 100644
--- a/test/language/statements/variable/12.2.1-1gs.js
+++ b/test/language/statements/variable/12.2.1-1gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 for (var eval in arrObj) { }
diff --git a/test/language/statements/variable/12.2.1-4gs.js b/test/language/statements/variable/12.2.1-4gs.js
index 742814a6b3..2002d2b458 100644
--- a/test/language/statements/variable/12.2.1-4gs.js
+++ b/test/language/statements/variable/12.2.1-4gs.js
@@ -12,6 +12,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var arguments;
diff --git a/test/language/statements/variable/S12.2_A8_T1.js b/test/language/statements/variable/S12.2_A8_T1.js
index 8e0c6f1086..8d211af38d 100644
--- a/test/language/statements/variable/S12.2_A8_T1.js
+++ b/test/language/statements/variable/S12.2_A8_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/variable/S12.2_A8_T2.js b/test/language/statements/variable/S12.2_A8_T2.js
index 4c127b5a1a..541345a483 100644
--- a/test/language/statements/variable/S12.2_A8_T2.js
+++ b/test/language/statements/variable/S12.2_A8_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/variable/S12.2_A8_T3.js b/test/language/statements/variable/S12.2_A8_T3.js
index 04e9cfc3d1..d3244e2012 100644
--- a/test/language/statements/variable/S12.2_A8_T3.js
+++ b/test/language/statements/variable/S12.2_A8_T3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/variable/S12.2_A8_T4.js b/test/language/statements/variable/S12.2_A8_T4.js
index 676a5cd26c..3f538b3b22 100644
--- a/test/language/statements/variable/S12.2_A8_T4.js
+++ b/test/language/statements/variable/S12.2_A8_T4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/variable/S12.2_A8_T5.js b/test/language/statements/variable/S12.2_A8_T5.js
index 97af49cf63..06463d20f9 100644
--- a/test/language/statements/variable/S12.2_A8_T5.js
+++ b/test/language/statements/variable/S12.2_A8_T5.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/variable/S12.2_A8_T6.js b/test/language/statements/variable/S12.2_A8_T6.js
index ff29f7e393..08e93cce6e 100644
--- a/test/language/statements/variable/S12.2_A8_T6.js
+++ b/test/language/statements/variable/S12.2_A8_T6.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/variable/S12.2_A8_T7.js b/test/language/statements/variable/S12.2_A8_T7.js
index 8386a0220e..3702ad6f27 100644
--- a/test/language/statements/variable/S12.2_A8_T7.js
+++ b/test/language/statements/variable/S12.2_A8_T7.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/variable/S12.2_A8_T8.js b/test/language/statements/variable/S12.2_A8_T8.js
index 274bc32b94..48f5315845 100644
--- a/test/language/statements/variable/S12.2_A8_T8.js
+++ b/test/language/statements/variable/S12.2_A8_T8.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 __arr = [];
 
diff --git a/test/language/statements/variable/dstr-ary-ptrn-rest-init-ary.js b/test/language/statements/variable/dstr-ary-ptrn-rest-init-ary.js
index d17626566b..1f60d3b70f 100644
--- a/test/language/statements/variable/dstr-ary-ptrn-rest-init-ary.js
+++ b/test/language/statements/variable/dstr-ary-ptrn-rest-init-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var [...[ x ] = []] = [];
 
diff --git a/test/language/statements/variable/dstr-ary-ptrn-rest-init-id.js b/test/language/statements/variable/dstr-ary-ptrn-rest-init-id.js
index 787406c365..c515fc79ab 100644
--- a/test/language/statements/variable/dstr-ary-ptrn-rest-init-id.js
+++ b/test/language/statements/variable/dstr-ary-ptrn-rest-init-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var [...x = []] = [];
 
diff --git a/test/language/statements/variable/dstr-ary-ptrn-rest-init-obj.js b/test/language/statements/variable/dstr-ary-ptrn-rest-init-obj.js
index efa6589d89..17c526c2ae 100644
--- a/test/language/statements/variable/dstr-ary-ptrn-rest-init-obj.js
+++ b/test/language/statements/variable/dstr-ary-ptrn-rest-init-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var [...{ x } = []] = [];
 
diff --git a/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-ary.js b/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-ary.js
index 706ce8b472..4b0849ef42 100644
--- a/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-ary.js
+++ b/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-ary.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var [...[x], y] = [1, 2, 3];
 
diff --git a/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-id.js b/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-id.js
index e8b7fd6d93..d44a53ba4e 100644
--- a/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-id.js
+++ b/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-id.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var [...x, y] = [1, 2, 3];
 
diff --git a/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-obj.js b/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-obj.js
index db0b0b4b9e..8c6a58625a 100644
--- a/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-obj.js
+++ b/test/language/statements/variable/dstr-ary-ptrn-rest-not-final-obj.js
@@ -25,7 +25,7 @@ info: |
         [ BindingElementList[?Yield] ]
         [ BindingElementList[?Yield] , Elisionopt BindingRestElement[?Yield]opt ]
 ---*/
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var [...{ x }, y] = [1, 2, 3];
 
diff --git a/test/language/statements/variable/id-arguments-strict.js b/test/language/statements/variable/id-arguments-strict.js
index 034877b3d9..38c2d3b27a 100644
--- a/test/language/statements/variable/id-arguments-strict.js
+++ b/test/language/statements/variable/id-arguments-strict.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var arguments;
diff --git a/test/language/statements/variable/id-eval-strict.js b/test/language/statements/variable/id-eval-strict.js
index 1f56a8014c..71dd660eed 100644
--- a/test/language/statements/variable/id-eval-strict.js
+++ b/test/language/statements/variable/id-eval-strict.js
@@ -11,6 +11,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var eval;
diff --git a/test/language/statements/while/S12.6.2_A15.js b/test/language/statements/while/S12.6.2_A15.js
index 51304a0840..a5ecaf00ee 100644
--- a/test/language/statements/while/S12.6.2_A15.js
+++ b/test/language/statements/while/S12.6.2_A15.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
diff --git a/test/language/statements/while/S12.6.2_A6_T1.js b/test/language/statements/while/S12.6.2_A6_T1.js
index ec1e976fb2..a9d19045a8 100644
--- a/test/language/statements/while/S12.6.2_A6_T1.js
+++ b/test/language/statements/while/S12.6.2_A6_T1.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/while/S12.6.2_A6_T2.js b/test/language/statements/while/S12.6.2_A6_T2.js
index 26345f3c38..6920d8f9ee 100644
--- a/test/language/statements/while/S12.6.2_A6_T2.js
+++ b/test/language/statements/while/S12.6.2_A6_T2.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/while/S12.6.2_A6_T3.js b/test/language/statements/while/S12.6.2_A6_T3.js
index d66374b8d0..adccc4bd8e 100644
--- a/test/language/statements/while/S12.6.2_A6_T3.js
+++ b/test/language/statements/while/S12.6.2_A6_T3.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/while/S12.6.2_A6_T4.js b/test/language/statements/while/S12.6.2_A6_T4.js
index 3a38da2722..516febd111 100644
--- a/test/language/statements/while/S12.6.2_A6_T4.js
+++ b/test/language/statements/while/S12.6.2_A6_T4.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/while/S12.6.2_A6_T5.js b/test/language/statements/while/S12.6.2_A6_T5.js
index 7de2cc3602..8f98d7bb2c 100644
--- a/test/language/statements/while/S12.6.2_A6_T5.js
+++ b/test/language/statements/while/S12.6.2_A6_T5.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/while/S12.6.2_A6_T6.js b/test/language/statements/while/S12.6.2_A6_T6.js
index 6bf7d5efd5..c93dd5e13f 100644
--- a/test/language/statements/while/S12.6.2_A6_T6.js
+++ b/test/language/statements/while/S12.6.2_A6_T6.js
@@ -10,7 +10,7 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/language/statements/while/decl-async-fun.js b/test/language/statements/while/decl-async-fun.js
index 323166de60..fd0f55bf3c 100644
--- a/test/language/statements/while/decl-async-fun.js
+++ b/test/language/statements/while/decl-async-fun.js
@@ -15,6 +15,6 @@ negative:
 features: [async-functions]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) async function f() {}
diff --git a/test/language/statements/while/decl-async-gen.js b/test/language/statements/while/decl-async-gen.js
index 532d28f7e9..566c38a0b2 100644
--- a/test/language/statements/while/decl-async-gen.js
+++ b/test/language/statements/while/decl-async-gen.js
@@ -15,6 +15,6 @@ negative:
 features: [async-iteration]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) async function* g() {}
diff --git a/test/language/statements/while/decl-cls.js b/test/language/statements/while/decl-cls.js
index 55b04036ae..ca7646aa1c 100644
--- a/test/language/statements/while/decl-cls.js
+++ b/test/language/statements/while/decl-cls.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) class C {}
diff --git a/test/language/statements/while/decl-const.js b/test/language/statements/while/decl-const.js
index 75919d7c99..428d42c8bb 100644
--- a/test/language/statements/while/decl-const.js
+++ b/test/language/statements/while/decl-const.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) const x = null;
diff --git a/test/language/statements/while/decl-fun.js b/test/language/statements/while/decl-fun.js
index 5c5a7c38ef..b8c9d05034 100644
--- a/test/language/statements/while/decl-fun.js
+++ b/test/language/statements/while/decl-fun.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) function f() {}
diff --git a/test/language/statements/while/decl-gen.js b/test/language/statements/while/decl-gen.js
index 58bce61472..f3e7592f5f 100644
--- a/test/language/statements/while/decl-gen.js
+++ b/test/language/statements/while/decl-gen.js
@@ -10,6 +10,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) function* g() {}
diff --git a/test/language/statements/while/decl-let.js b/test/language/statements/while/decl-let.js
index 536ec80ff5..d3def7e446 100644
--- a/test/language/statements/while/decl-let.js
+++ b/test/language/statements/while/decl-let.js
@@ -9,6 +9,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) let x;
diff --git a/test/language/statements/while/labelled-fn-stmt.js b/test/language/statements/while/labelled-fn-stmt.js
index 8f919fa97d..57bf1d3f5c 100644
--- a/test/language/statements/while/labelled-fn-stmt.js
+++ b/test/language/statements/while/labelled-fn-stmt.js
@@ -13,6 +13,6 @@ info: |
     of the language mode.
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) label1: label2: function f() {}
diff --git a/test/language/statements/while/let-array-with-newline.js b/test/language/statements/while/let-array-with-newline.js
index 693622b5e1..a3b9637fd1 100644
--- a/test/language/statements/while/let-array-with-newline.js
+++ b/test/language/statements/while/let-array-with-newline.js
@@ -15,7 +15,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 while (false) let
 [a] = 0;
diff --git a/test/language/statements/with/12.10.1-11gs.js b/test/language/statements/with/12.10.1-11gs.js
index 8f8ea3bd0f..33544f0b6c 100644
--- a/test/language/statements/with/12.10.1-11gs.js
+++ b/test/language/statements/with/12.10.1-11gs.js
@@ -10,6 +10,6 @@ negative:
 flags: [onlyStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) { }
diff --git a/test/language/statements/with/decl-async-fun.js b/test/language/statements/with/decl-async-fun.js
index 5c16534556..d2b941e828 100644
--- a/test/language/statements/with/decl-async-fun.js
+++ b/test/language/statements/with/decl-async-fun.js
@@ -16,6 +16,6 @@ features: [async-functions]
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) async function f() {}
diff --git a/test/language/statements/with/decl-async-gen.js b/test/language/statements/with/decl-async-gen.js
index 1b68a99138..a188004bec 100644
--- a/test/language/statements/with/decl-async-gen.js
+++ b/test/language/statements/with/decl-async-gen.js
@@ -16,6 +16,6 @@ features: [async-iteration]
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) async function* g() {}
diff --git a/test/language/statements/with/decl-cls.js b/test/language/statements/with/decl-cls.js
index 1cfcb15ccb..72f4cf262c 100644
--- a/test/language/statements/with/decl-cls.js
+++ b/test/language/statements/with/decl-cls.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) class C {}
diff --git a/test/language/statements/with/decl-const.js b/test/language/statements/with/decl-const.js
index fbbd19fe16..dfc1cb0b79 100644
--- a/test/language/statements/with/decl-const.js
+++ b/test/language/statements/with/decl-const.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) const x = null;
diff --git a/test/language/statements/with/decl-fun.js b/test/language/statements/with/decl-fun.js
index 00ceba0da3..8982fe5c7f 100644
--- a/test/language/statements/with/decl-fun.js
+++ b/test/language/statements/with/decl-fun.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) function f() {}
diff --git a/test/language/statements/with/decl-gen.js b/test/language/statements/with/decl-gen.js
index 04e73a58bd..a8a65aa646 100644
--- a/test/language/statements/with/decl-gen.js
+++ b/test/language/statements/with/decl-gen.js
@@ -11,6 +11,6 @@ negative:
 features: [generators]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) function* g() {}
diff --git a/test/language/statements/with/decl-let.js b/test/language/statements/with/decl-let.js
index 63d83aa8bc..c73f7a7603 100644
--- a/test/language/statements/with/decl-let.js
+++ b/test/language/statements/with/decl-let.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) let x;
diff --git a/test/language/statements/with/labelled-fn-stmt.js b/test/language/statements/with/labelled-fn-stmt.js
index 0b24a71fe6..9c27fb978b 100644
--- a/test/language/statements/with/labelled-fn-stmt.js
+++ b/test/language/statements/with/labelled-fn-stmt.js
@@ -21,6 +21,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 with ({}) label1: label2: function test262() {}
diff --git a/test/language/statements/with/let-array-with-newline.js b/test/language/statements/with/let-array-with-newline.js
index c0142dd27c..a27248ac9a 100644
--- a/test/language/statements/with/let-array-with-newline.js
+++ b/test/language/statements/with/let-array-with-newline.js
@@ -15,7 +15,7 @@ negative:
 flags: [noStrict]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // Wrapped in an if-statement to avoid reference errors at runtime.
 if (false) {
diff --git a/test/language/types/boolean/S8.3_A2.1.js b/test/language/types/boolean/S8.3_A2.1.js
index f021e8ddf4..2c7f677710 100644
--- a/test/language/types/boolean/S8.3_A2.1.js
+++ b/test/language/types/boolean/S8.3_A2.1.js
@@ -10,6 +10,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 true = 1;
diff --git a/test/language/types/boolean/S8.3_A2.2.js b/test/language/types/boolean/S8.3_A2.2.js
index e96248e67f..8c5aa38fa5 100644
--- a/test/language/types/boolean/S8.3_A2.2.js
+++ b/test/language/types/boolean/S8.3_A2.2.js
@@ -10,6 +10,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 false = 0;
diff --git a/test/language/types/null/S8.2_A2.js b/test/language/types/null/S8.2_A2.js
index 9062d3a6be..c97d6a1eed 100644
--- a/test/language/types/null/S8.2_A2.js
+++ b/test/language/types/null/S8.2_A2.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var null;
diff --git a/test/language/types/reference/S8.7.2_A1_T1.js b/test/language/types/reference/S8.7.2_A1_T1.js
index ac71a0852d..36470c1e1f 100644
--- a/test/language/types/reference/S8.7.2_A1_T1.js
+++ b/test/language/types/reference/S8.7.2_A1_T1.js
@@ -10,6 +10,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 'litera'=1;
diff --git a/test/language/types/reference/S8.7.2_A1_T2.js b/test/language/types/reference/S8.7.2_A1_T2.js
index b6c026f665..afa0942691 100644
--- a/test/language/types/reference/S8.7.2_A1_T2.js
+++ b/test/language/types/reference/S8.7.2_A1_T2.js
@@ -10,6 +10,6 @@ negative:
   type: ReferenceError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 1=1;
diff --git a/test/language/types/string/S8.4_A13_T1.js b/test/language/types/string/S8.4_A13_T1.js
index d2b9d12bdd..d6286a857b 100644
--- a/test/language/types/string/S8.4_A13_T1.js
+++ b/test/language/types/string/S8.4_A13_T1.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var str = ''';
diff --git a/test/language/types/string/S8.4_A13_T2.js b/test/language/types/string/S8.4_A13_T2.js
index a74ac0dbd8..b000eb49bf 100644
--- a/test/language/types/string/S8.4_A13_T2.js
+++ b/test/language/types/string/S8.4_A13_T2.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var str = ';
diff --git a/test/language/types/string/S8.4_A13_T3.js b/test/language/types/string/S8.4_A13_T3.js
index 2d28b67958..607ebd9dc9 100644
--- a/test/language/types/string/S8.4_A13_T3.js
+++ b/test/language/types/string/S8.4_A13_T3.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var str = '''';
diff --git a/test/language/types/string/S8.4_A14_T1.js b/test/language/types/string/S8.4_A14_T1.js
index 48119b7d30..986432597a 100644
--- a/test/language/types/string/S8.4_A14_T1.js
+++ b/test/language/types/string/S8.4_A14_T1.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var str = ";
diff --git a/test/language/types/string/S8.4_A14_T2.js b/test/language/types/string/S8.4_A14_T2.js
index bee237019e..78a8d57685 100644
--- a/test/language/types/string/S8.4_A14_T2.js
+++ b/test/language/types/string/S8.4_A14_T2.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var str = """;
diff --git a/test/language/types/string/S8.4_A14_T3.js b/test/language/types/string/S8.4_A14_T3.js
index 89ce9642b1..9282715317 100644
--- a/test/language/types/string/S8.4_A14_T3.js
+++ b/test/language/types/string/S8.4_A14_T3.js
@@ -10,6 +10,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var str = """";
diff --git a/test/language/white-space/S7.2_A5_T1.js b/test/language/white-space/S7.2_A5_T1.js
index dbcae38453..a18e4bea00 100644
--- a/test/language/white-space/S7.2_A5_T1.js
+++ b/test/language/white-space/S7.2_A5_T1.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u0009x;
diff --git a/test/language/white-space/S7.2_A5_T2.js b/test/language/white-space/S7.2_A5_T2.js
index 31bcaa032d..280d4c7c35 100644
--- a/test/language/white-space/S7.2_A5_T2.js
+++ b/test/language/white-space/S7.2_A5_T2.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u000Bx;
diff --git a/test/language/white-space/S7.2_A5_T3.js b/test/language/white-space/S7.2_A5_T3.js
index 2de8bc7828..bf3d179174 100644
--- a/test/language/white-space/S7.2_A5_T3.js
+++ b/test/language/white-space/S7.2_A5_T3.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u000Cx;
diff --git a/test/language/white-space/S7.2_A5_T4.js b/test/language/white-space/S7.2_A5_T4.js
index 1969354f8e..193d17a375 100644
--- a/test/language/white-space/S7.2_A5_T4.js
+++ b/test/language/white-space/S7.2_A5_T4.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u0020x;
diff --git a/test/language/white-space/S7.2_A5_T5.js b/test/language/white-space/S7.2_A5_T5.js
index fe924dbf4c..d9194ae4ff 100644
--- a/test/language/white-space/S7.2_A5_T5.js
+++ b/test/language/white-space/S7.2_A5_T5.js
@@ -12,6 +12,6 @@ negative:
   type: SyntaxError
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 var\u00A0x;
diff --git a/test/language/white-space/mongolian-vowel-separator.js b/test/language/white-space/mongolian-vowel-separator.js
index 0e0a34e6d4..84a5e8cc9f 100644
--- a/test/language/white-space/mongolian-vowel-separator.js
+++ b/test/language/white-space/mongolian-vowel-separator.js
@@ -26,7 +26,7 @@ negative:
 features: [u180e]
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 // U+180E between "var" and "foo"; UTF8(0x180E) = 0xE1 0xA0 0x8E
 vará Žfoo;
diff --git a/tools/lint/lib/checks/negative.py b/tools/lint/lib/checks/negative.py
index de0f149c6e..7a06368c27 100644
--- a/tools/lint/lib/checks/negative.py
+++ b/tools/lint/lib/checks/negative.py
@@ -2,7 +2,7 @@ import re
 from ..check import Check
 
 _THROW_STMT = re.compile(
-      r'^failIfCodeGetsEvaluated\(\);$',
+      r'^\$DONOTEVALUATE\(\);$',
       re.MULTILINE)
 
 class CheckNegative(Check):
diff --git a/tools/lint/test/fixtures/negative_valid_parse.js b/tools/lint/test/fixtures/negative_valid_parse.js
index 0d89d701a3..2f28cac376 100644
--- a/tools/lint/test/fixtures/negative_valid_parse.js
+++ b/tools/lint/test/fixtures/negative_valid_parse.js
@@ -9,6 +9,6 @@ negative:
   phase: parse
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 !!!
diff --git a/tools/lint/test/fixtures/negative_valid_resolution.js b/tools/lint/test/fixtures/negative_valid_resolution.js
index bbe51fd88f..309dc6e679 100644
--- a/tools/lint/test/fixtures/negative_valid_resolution.js
+++ b/tools/lint/test/fixtures/negative_valid_resolution.js
@@ -10,6 +10,6 @@ negative:
   phase: resolution
 ---*/
 
-failIfCodeGetsEvaluated();
+$DONOTEVALUATE();
 
 import 'non-existent-module.js';
-- 
GitLab