Add generators flags for tests depending on generators features (#1259)

* Add missing generators feature flags

* Generate files

* Add generators flags

* fixup! Add generators flags

89 files changed, 89 insertions, 28 deletions

diff --git a/src/arguments/default/gen-func-decl.template b/src/arguments/default/gen-func-decl.template
index 36bd0e796..b9828f144 100644
--- a/src/arguments/default/gen-func-decl.template
+++ b/src/arguments/default/gen-func-decl.template
@@ -11,6 +11,7 @@ info: |
     Most ECMAScript functions make an arguments object available to their code. Depending upon the
     characteristics of the function definition, its arguments object is either an ordinary object
     or an arguments exotic object.
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/arguments/default/gen-func-expr.template b/src/arguments/default/gen-func-expr.template
index 6d3392264..079f9ad32 100644
--- a/src/arguments/default/gen-func-expr.template
+++ b/src/arguments/default/gen-func-expr.template
@@ -11,6 +11,7 @@ info: |
     Most ECMAScript functions make an arguments object available to their code. Depending upon the
     characteristics of the function definition, its arguments object is either an ordinary object
     or an arguments exotic object.
+features: [generators]
 ---*/
 
 var callCount = 0;
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 bee74b6fb..8f740055a 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
@@ -13,6 +13,7 @@ info: |
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
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 2cac174f7..683123be5 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
@@ -13,6 +13,7 @@ info: |
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
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 91ab5086f..ccf57caee 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
@@ -13,6 +13,7 @@ info: |
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
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 039476cbd..cf14e0f29 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
@@ -13,6 +13,7 @@ info: |
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/src/declarations/redeclare-with-generator-declaration.case b/src/declarations/redeclare-with-generator-declaration.case
index 91b8398bc..930831494 100644
--- a/src/declarations/redeclare-with-generator-declaration.case
+++ b/src/declarations/redeclare-with-generator-declaration.case
@@ -5,6 +5,7 @@
 desc: >
   redeclaration with GeneratorDeclaration
 template: redeclare
+features: [generators]
 ---*/
 
 //- 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 bee74b6fb..8f740055a 100644
--- a/src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
+++ b/src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
@@ -13,6 +13,7 @@ info: |
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
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 2cac174f7..683123be5 100644
--- a/src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
+++ b/src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
@@ -13,6 +13,7 @@ info: |
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/src/dstr-binding-for-await/ary-ptrn-elem-ary-empty-init.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-empty-init.case
index fcec666f2..7883e387e 100644
--- a/src/dstr-binding-for-await/ary-ptrn-elem-ary-empty-init.case
+++ b/src/dstr-binding-for-await/ary-ptrn-elem-ary-empty-init.case
@@ -15,6 +15,7 @@ info: |
        b. Let v be ? GetValue(defaultValue).
     4. Return the result of performing BindingInitialization of BindingPattern
        with v and environment as the arguments.
+features: [generators]
 ---*/
 
 //- setup
diff --git a/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-gen.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-gen.case
index 5b1736e88..824946d12 100644
--- a/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-gen.case
+++ b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-gen.case
@@ -16,6 +16,7 @@ info: |
           [...]
     6. If environment is undefined, return PutValue(lhs, v).
     7. Return InitializeReferencedBinding(lhs, v).
+features: [generators]
 ---*/
 
 //- elems
diff --git a/src/dstr-binding-for-await/ary-ptrn-elision-iter-close.case b/src/dstr-binding-for-await/ary-ptrn-elision-iter-close.case
index 18c0046a3..74f3faad8 100644
--- a/src/dstr-binding-for-await/ary-ptrn-elision-iter-close.case
+++ b/src/dstr-binding-for-await/ary-ptrn-elision-iter-close.case
@@ -5,6 +5,7 @@
 template: iter-close
 desc: >
   The iterator is properly consumed by the destructuring pattern
+features: [generators]
 ---*/
 
 //- setup
diff --git a/src/dstr-binding-for-await/ary-ptrn-rest-id-iter-close.case b/src/dstr-binding-for-await/ary-ptrn-rest-id-iter-close.case
index 2127b9eda..d0ca05982 100644
--- a/src/dstr-binding-for-await/ary-ptrn-rest-id-iter-close.case
+++ b/src/dstr-binding-for-await/ary-ptrn-rest-id-iter-close.case
@@ -5,6 +5,7 @@
 template: iter-close
 desc: >
   The iterator is properly consumed by the destructuring pattern
+features: [generators]
 ---*/
 
 //- setup
diff --git a/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-gen.case b/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-gen.case
index 3eb8bcd5d..fa45deca8 100644
--- a/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-gen.case
+++ b/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-gen.case
@@ -16,6 +16,7 @@ info: |
           ii. ReturnIfAbrupt(hasNameProperty).
           iii. If hasNameProperty is false, perform SetFunctionName(v,
                bindingId).
+features: [generators]
 ---*/
 
 //- elems
diff --git a/src/dstr-binding/ary-ptrn-elem-ary-empty-init.case b/src/dstr-binding/ary-ptrn-elem-ary-empty-init.case
index df0c90fdb..763a25930 100644
--- a/src/dstr-binding/ary-ptrn-elem-ary-empty-init.case
+++ b/src/dstr-binding/ary-ptrn-elem-ary-empty-init.case
@@ -15,6 +15,7 @@ info: |
        b. Let v be ? GetValue(defaultValue).
     4. Return the result of performing BindingInitialization of BindingPattern
        with v and environment as the arguments.
+features: [generators]
 ---*/
 
 //- setup
diff --git a/src/dstr-binding/ary-ptrn-elem-id-init-fn-name-gen.case b/src/dstr-binding/ary-ptrn-elem-id-init-fn-name-gen.case
index 04587c07c..db53d00c8 100644
--- a/src/dstr-binding/ary-ptrn-elem-id-init-fn-name-gen.case
+++ b/src/dstr-binding/ary-ptrn-elem-id-init-fn-name-gen.case
@@ -17,6 +17,7 @@ info: |
           [...]
     7. If environment is undefined, return PutValue(lhs, v).
     8. Return InitializeReferencedBinding(lhs, v).
+features: [generators]
 ---*/
 
 //- elems
diff --git a/src/dstr-binding/ary-ptrn-elision-iter-close.case b/src/dstr-binding/ary-ptrn-elision-iter-close.case
index 18c0046a3..74f3faad8 100644
--- a/src/dstr-binding/ary-ptrn-elision-iter-close.case
+++ b/src/dstr-binding/ary-ptrn-elision-iter-close.case
@@ -5,6 +5,7 @@
 template: iter-close
 desc: >
   The iterator is properly consumed by the destructuring pattern
+features: [generators]
 ---*/
 
 //- setup
diff --git a/src/dstr-binding/ary-ptrn-rest-id-iter-close.case b/src/dstr-binding/ary-ptrn-rest-id-iter-close.case
index 2127b9eda..d0ca05982 100644
--- a/src/dstr-binding/ary-ptrn-rest-id-iter-close.case
+++ b/src/dstr-binding/ary-ptrn-rest-id-iter-close.case
@@ -5,6 +5,7 @@
 template: iter-close
 desc: >
   The iterator is properly consumed by the destructuring pattern
+features: [generators]
 ---*/
 
 //- setup
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
index 3523cd63b..c486163c4 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
@@ -5,7 +5,7 @@ path: language/statements/class/dstr-gen-meth-dflt-
 name: class expression method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
index bb257929b..254135195 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
@@ -5,7 +5,7 @@ path: language/statements/class/dstr-gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static.template b/src/dstr-binding/default/cls-decl-gen-meth-static.template
index 7fe1a43bd..150c19e2a 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-static.template
@@ -5,7 +5,7 @@ path: language/statements/class/dstr-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/src/dstr-binding/default/cls-decl-gen-meth.template b/src/dstr-binding/default/cls-decl-gen-meth.template
index 73fbf2c3a..2df18311d 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth.template
@@ -5,7 +5,7 @@ path: language/statements/class/dstr-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
index b8963fdc0..29d90bd76 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
@@ -5,7 +5,7 @@ path: language/expressions/class/dstr-gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
index fd512fc01..652189ce2 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
@@ -5,7 +5,7 @@ path: language/expressions/class/dstr-gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static.template b/src/dstr-binding/default/cls-expr-gen-meth-static.template
index 847c11f3c..9bcb541a3 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-static.template
@@ -5,7 +5,7 @@ path: language/expressions/class/dstr-gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/src/dstr-binding/default/cls-expr-gen-meth.template b/src/dstr-binding/default/cls-expr-gen-meth.template
index cf62b3a5d..1f1e47904 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth.template
@@ -5,7 +5,7 @@ path: language/expressions/class/dstr-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/src/dstr-binding/default/gen-func-decl-dflt.template b/src/dstr-binding/default/gen-func-decl-dflt.template
index a5eb965ab..52f8d9cb5 100644
--- a/src/dstr-binding/default/gen-func-decl-dflt.template
+++ b/src/dstr-binding/default/gen-func-decl-dflt.template
@@ -5,7 +5,7 @@ path: language/statements/generators/dstr-dflt-
 name: generator function declaration (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
 
diff --git a/src/dstr-binding/default/gen-func-decl.template b/src/dstr-binding/default/gen-func-decl.template
index 8e9b6dea0..68f176115 100644
--- a/src/dstr-binding/default/gen-func-decl.template
+++ b/src/dstr-binding/default/gen-func-decl.template
@@ -5,7 +5,7 @@ path: language/statements/generators/dstr-
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
 
diff --git a/src/dstr-binding/default/gen-func-expr-dflt.template b/src/dstr-binding/default/gen-func-expr-dflt.template
index f3f16ae6d..87ed77993 100644
--- a/src/dstr-binding/default/gen-func-expr-dflt.template
+++ b/src/dstr-binding/default/gen-func-expr-dflt.template
@@ -5,7 +5,7 @@ path: language/expressions/generators/dstr-dflt-
 name: generator function expression (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
 
diff --git a/src/dstr-binding/default/gen-func-expr.template b/src/dstr-binding/default/gen-func-expr.template
index 8292448a6..bbcea8cc0 100644
--- a/src/dstr-binding/default/gen-func-expr.template
+++ b/src/dstr-binding/default/gen-func-expr.template
@@ -5,7 +5,7 @@ path: language/expressions/generators/dstr-
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
 
diff --git a/src/dstr-binding/default/gen-meth.template b/src/dstr-binding/default/gen-meth.template
index bd4e9938e..50bf05105 100644
--- a/src/dstr-binding/default/gen-meth.template
+++ b/src/dstr-binding/default/gen-meth.template
@@ -5,7 +5,7 @@ path: language/expressions/object/dstr-gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     GeneratorMethod :
         * PropertyName ( StrictFormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/default/gen-method-dflt.template b/src/dstr-binding/default/gen-method-dflt.template
index 0a75534c6..59aa756e3 100644
--- a/src/dstr-binding/default/gen-method-dflt.template
+++ b/src/dstr-binding/default/gen-method-dflt.template
@@ -5,7 +5,7 @@ path: language/expressions/object/dstr-gen-meth-dflt-
 name: generator method (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorMethod :
         * PropertyName ( StrictFormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-dflt.template b/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
index 48479af1b..4f51d6a21 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
@@ -5,7 +5,7 @@ path: language/statements/class/dstr-gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
index ba0ee6375..d72276425 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
@@ -5,7 +5,7 @@ path: language/statements/class/dstr-gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-static.template b/src/dstr-binding/error/cls-decl-gen-meth-static.template
index 21467eb02..7785f7ec7 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-static.template
@@ -5,7 +5,7 @@ path: language/statements/class/dstr-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/src/dstr-binding/error/cls-decl-gen-meth.template b/src/dstr-binding/error/cls-decl-gen-meth.template
index 347402fd9..f313d1c0e 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth.template
@@ -5,7 +5,7 @@ path: language/statements/class/dstr-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-dflt.template b/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
index e6bdc2476..9595e42c9 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
@@ -5,7 +5,7 @@ path: language/expressions/class/dstr-gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
index 75cd41fe8..6a4aaec82 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
@@ -5,7 +5,7 @@ path: language/expressions/class/dstr-gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-static.template b/src/dstr-binding/error/cls-expr-gen-meth-static.template
index 73c67100f..a1304926c 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-static.template
@@ -5,7 +5,7 @@ path: language/expressions/class/dstr-gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/src/dstr-binding/error/cls-expr-gen-meth.template b/src/dstr-binding/error/cls-expr-gen-meth.template
index 4a90b4d7a..c17343906 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth.template
@@ -5,7 +5,7 @@ path: language/expressions/class/dstr-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/src/dstr-binding/error/gen-func-decl-dflt.template b/src/dstr-binding/error/gen-func-decl-dflt.template
index 523836662..f88a13f08 100644
--- a/src/dstr-binding/error/gen-func-decl-dflt.template
+++ b/src/dstr-binding/error/gen-func-decl-dflt.template
@@ -5,7 +5,7 @@ path: language/statements/generators/dstr-dflt-
 name: generator function declaration (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
 
diff --git a/src/dstr-binding/error/gen-func-decl.template b/src/dstr-binding/error/gen-func-decl.template
index 3e3f83e16..1a507ccd7 100644
--- a/src/dstr-binding/error/gen-func-decl.template
+++ b/src/dstr-binding/error/gen-func-decl.template
@@ -5,7 +5,7 @@ path: language/statements/generators/dstr-
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
 
diff --git a/src/dstr-binding/error/gen-func-expr-dflt.template b/src/dstr-binding/error/gen-func-expr-dflt.template
index 2689749a2..e45f94ec9 100644
--- a/src/dstr-binding/error/gen-func-expr-dflt.template
+++ b/src/dstr-binding/error/gen-func-expr-dflt.template
@@ -5,7 +5,7 @@ path: language/expressions/generators/dstr-dflt-
 name: generator function expression (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
 
diff --git a/src/dstr-binding/error/gen-func-expr.template b/src/dstr-binding/error/gen-func-expr.template
index 8351bb5e5..7554ef722 100644
--- a/src/dstr-binding/error/gen-func-expr.template
+++ b/src/dstr-binding/error/gen-func-expr.template
@@ -5,7 +5,7 @@ path: language/expressions/generators/dstr-
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
 
diff --git a/src/dstr-binding/error/gen-meth-dflt.template b/src/dstr-binding/error/gen-meth-dflt.template
index d738d6b2d..24e7aa2bc 100644
--- a/src/dstr-binding/error/gen-meth-dflt.template
+++ b/src/dstr-binding/error/gen-meth-dflt.template
@@ -5,7 +5,7 @@ path: language/expressions/object/dstr-gen-meth-dflt-
 name: generator method (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
-features: [destructuring-binding, default-parameters]
+features: [generators, destructuring-binding, default-parameters]
 info: |
     GeneratorMethod :
         * PropertyName ( StrictFormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/error/gen-meth.template b/src/dstr-binding/error/gen-meth.template
index 2abd12f53..821d08a2d 100644
--- a/src/dstr-binding/error/gen-meth.template
+++ b/src/dstr-binding/error/gen-meth.template
@@ -5,7 +5,7 @@ path: language/expressions/object/dstr-gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
-features: [destructuring-binding]
+features: [generators, destructuring-binding]
 info: |
     GeneratorMethod :
         * PropertyName ( StrictFormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/obj-ptrn-id-init-fn-name-gen.case b/src/dstr-binding/obj-ptrn-id-init-fn-name-gen.case
index 977d9f08d..57ccf457a 100644
--- a/src/dstr-binding/obj-ptrn-id-init-fn-name-gen.case
+++ b/src/dstr-binding/obj-ptrn-id-init-fn-name-gen.case
@@ -16,6 +16,7 @@ info: |
           ii. ReturnIfAbrupt(hasNameProperty).
           iii. If hasNameProperty is false, perform SetFunctionName(v,
                bindingId).
+features: [generators]
 ---*/
 
 //- elems
diff --git a/src/function-forms/default/cls-decl-gen-meth-static.template b/src/function-forms/default/cls-decl-gen-meth-static.template
index fd8639a30..70577ea99 100644
--- a/src/function-forms/default/cls-decl-gen-meth-static.template
+++ b/src/function-forms/default/cls-decl-gen-meth-static.template
@@ -55,6 +55,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/default/cls-decl-gen-meth.template b/src/function-forms/default/cls-decl-gen-meth.template
index 731f43730..675da7674 100644
--- a/src/function-forms/default/cls-decl-gen-meth.template
+++ b/src/function-forms/default/cls-decl-gen-meth.template
@@ -55,6 +55,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/default/cls-expr-gen-meth-static.template b/src/function-forms/default/cls-expr-gen-meth-static.template
index 7cd524ed3..d1480f8df 100644
--- a/src/function-forms/default/cls-expr-gen-meth-static.template
+++ b/src/function-forms/default/cls-expr-gen-meth-static.template
@@ -57,6 +57,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/default/cls-expr-gen-meth.template b/src/function-forms/default/cls-expr-gen-meth.template
index bc863bfd3..1a537ca14 100644
--- a/src/function-forms/default/cls-expr-gen-meth.template
+++ b/src/function-forms/default/cls-expr-gen-meth.template
@@ -57,6 +57,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/default/gen-func-decl.template b/src/function-forms/default/gen-func-decl.template
index 14e737972..d5bd846c1 100644
--- a/src/function-forms/default/gen-func-decl.template
+++ b/src/function-forms/default/gen-func-decl.template
@@ -34,6 +34,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/default/gen-func-expr.template b/src/function-forms/default/gen-func-expr.template
index a59300437..9939273a7 100644
--- a/src/function-forms/default/gen-func-expr.template
+++ b/src/function-forms/default/gen-func-expr.template
@@ -34,6 +34,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/default/gen-meth.template b/src/function-forms/default/gen-meth.template
index 3e2fe8ac6..ee6be34f9 100644
--- a/src/function-forms/default/gen-meth.template
+++ b/src/function-forms/default/gen-meth.template
@@ -39,6 +39,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/error/cls-decl-gen-meth-static.template b/src/function-forms/error/cls-decl-gen-meth-static.template
index 272f03796..513de136b 100644
--- a/src/function-forms/error/cls-decl-gen-meth-static.template
+++ b/src/function-forms/error/cls-decl-gen-meth-static.template
@@ -55,6 +55,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/error/cls-decl-gen-meth.template b/src/function-forms/error/cls-decl-gen-meth.template
index 31389ed89..0519d9541 100644
--- a/src/function-forms/error/cls-decl-gen-meth.template
+++ b/src/function-forms/error/cls-decl-gen-meth.template
@@ -55,6 +55,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/error/cls-expr-gen-meth-static.template b/src/function-forms/error/cls-expr-gen-meth-static.template
index ac61f1c02..a292acfdd 100644
--- a/src/function-forms/error/cls-expr-gen-meth-static.template
+++ b/src/function-forms/error/cls-expr-gen-meth-static.template
@@ -57,6 +57,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/error/cls-expr-gen-meth.template b/src/function-forms/error/cls-expr-gen-meth.template
index 804d2d8a1..a9a32455b 100644
--- a/src/function-forms/error/cls-expr-gen-meth.template
+++ b/src/function-forms/error/cls-expr-gen-meth.template
@@ -57,6 +57,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/error/gen-func-decl.template b/src/function-forms/error/gen-func-decl.template
index 4f6cbeb0e..b70157131 100644
--- a/src/function-forms/error/gen-func-decl.template
+++ b/src/function-forms/error/gen-func-decl.template
@@ -34,6 +34,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/error/gen-func-expr.template b/src/function-forms/error/gen-func-expr.template
index c84b1d596..c200cd4e3 100644
--- a/src/function-forms/error/gen-func-expr.template
+++ b/src/function-forms/error/gen-func-expr.template
@@ -34,6 +34,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/error/gen-meth.template b/src/function-forms/error/gen-meth.template
index ddc1db97b..dc9c40f1a 100644
--- a/src/function-forms/error/gen-meth.template
+++ b/src/function-forms/error/gen-meth.template
@@ -39,6 +39,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/function-forms/syntax/cls-decl-gen-meth-static.template b/src/function-forms/syntax/cls-decl-gen-meth-static.template
index c0db9b499..bcac53120 100644
--- a/src/function-forms/syntax/cls-decl-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-decl-gen-meth-static.template
@@ -55,6 +55,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 class C {
diff --git a/src/function-forms/syntax/cls-decl-gen-meth.template b/src/function-forms/syntax/cls-decl-gen-meth.template
index 786b317a2..d33a04149 100644
--- a/src/function-forms/syntax/cls-decl-gen-meth.template
+++ b/src/function-forms/syntax/cls-decl-gen-meth.template
@@ -55,6 +55,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 class C {
diff --git a/src/function-forms/syntax/cls-expr-gen-meth-static.template b/src/function-forms/syntax/cls-expr-gen-meth-static.template
index 7bf6f00e1..077fca09e 100644
--- a/src/function-forms/syntax/cls-expr-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-gen-meth-static.template
@@ -57,6 +57,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 0, class {
diff --git a/src/function-forms/syntax/cls-expr-gen-meth.template b/src/function-forms/syntax/cls-expr-gen-meth.template
index 33891b3a2..f385dd8d9 100644
--- a/src/function-forms/syntax/cls-expr-gen-meth.template
+++ b/src/function-forms/syntax/cls-expr-gen-meth.template
@@ -57,6 +57,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 0, class {
diff --git a/src/function-forms/syntax/gen-func-decl.template b/src/function-forms/syntax/gen-func-decl.template
index 6dd1da6ec..6d7fbbf61 100644
--- a/src/function-forms/syntax/gen-func-decl.template
+++ b/src/function-forms/syntax/gen-func-decl.template
@@ -34,6 +34,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 function* f(/*{ params }*/) {
diff --git a/src/function-forms/syntax/gen-func-expr.template b/src/function-forms/syntax/gen-func-expr.template
index 141e88e98..f9cffd7da 100644
--- a/src/function-forms/syntax/gen-func-expr.template
+++ b/src/function-forms/syntax/gen-func-expr.template
@@ -34,6 +34,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 0, function*(/*{ params }*/) {
diff --git a/src/function-forms/syntax/gen-meth.template b/src/function-forms/syntax/gen-meth.template
index c44507f91..49797b0f6 100644
--- a/src/function-forms/syntax/gen-meth.template
+++ b/src/function-forms/syntax/gen-meth.template
@@ -39,6 +39,7 @@ info: |
         b. Let formalStatus be IteratorBindingInitialization for formals with
            iteratorRecord and env as arguments.
     [...]
+features: [generators]
 ---*/
 
 0, {
diff --git a/src/generators/default/class-decl-method.template b/src/generators/default/class-decl-method.template
index ad4959030..334145980 100644
--- a/src/generators/default/class-decl-method.template
+++ b/src/generators/default/class-decl-method.template
@@ -15,6 +15,7 @@ info: |
 
   GeneratorMethod :
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/default/class-decl-static-method.template b/src/generators/default/class-decl-static-method.template
index dcd8f4e68..e25ce70a5 100644
--- a/src/generators/default/class-decl-static-method.template
+++ b/src/generators/default/class-decl-static-method.template
@@ -15,6 +15,7 @@ info: |
 
   GeneratorMethod :
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/default/class-expr-method.template b/src/generators/default/class-expr-method.template
index 8580bb939..7ab56d1cb 100644
--- a/src/generators/default/class-expr-method.template
+++ b/src/generators/default/class-expr-method.template
@@ -15,6 +15,7 @@ info: |
 
   GeneratorMethod :
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/default/class-expr-static-method.template b/src/generators/default/class-expr-static-method.template
index dd6e4ef0f..609097dbc 100644
--- a/src/generators/default/class-expr-static-method.template
+++ b/src/generators/default/class-expr-static-method.template
@@ -15,6 +15,7 @@ info: |
 
   GeneratorMethod :
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/default/declaration.template b/src/generators/default/declaration.template
index c9454f692..a1a248a81 100644
--- a/src/generators/default/declaration.template
+++ b/src/generators/default/declaration.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorDeclaration :
     function * BindingIdentifier ( FormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/default/expression-named.template b/src/generators/default/expression-named.template
index 1a2ad892d..a914bd426 100644
--- a/src/generators/default/expression-named.template
+++ b/src/generators/default/expression-named.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorExpression:
     function * BindingIdentifier opt ( FormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/default/expression.template b/src/generators/default/expression.template
index f66994b8b..147988109 100644
--- a/src/generators/default/expression.template
+++ b/src/generators/default/expression.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorExpression:
     function * BindingIdentifier opt ( FormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/default/obj-method.template b/src/generators/default/obj-method.template
index d909462bc..7cf8b9812 100644
--- a/src/generators/default/obj-method.template
+++ b/src/generators/default/obj-method.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorMethod[Yield, Await]:
     * PropertyName[?Yield, ?Await] ( UniqueFormalParameters[+Yield, ~Await] ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/non-strict/declaration.template b/src/generators/non-strict/declaration.template
index 5409b5134..49f8045e3 100644
--- a/src/generators/non-strict/declaration.template
+++ b/src/generators/non-strict/declaration.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorDeclaration[Yield, Await, Default]:
     function * BindingIdentifier[?Yield, ?Await] ( FormalParameters[+Yield, ~Await] ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/non-strict/expression-named.template b/src/generators/non-strict/expression-named.template
index 43448e096..30dd92156 100644
--- a/src/generators/non-strict/expression-named.template
+++ b/src/generators/non-strict/expression-named.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorExpression:
     function * BindingIdentifier opt ( FormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/non-strict/expression.template b/src/generators/non-strict/expression.template
index 285a84b75..7e2db5f8c 100644
--- a/src/generators/non-strict/expression.template
+++ b/src/generators/non-strict/expression.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorExpression:
     function * BindingIdentifier opt ( FormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/non-strict/obj-method.template b/src/generators/non-strict/obj-method.template
index 67b6e2337..9360d5099 100644
--- a/src/generators/non-strict/obj-method.template
+++ b/src/generators/non-strict/obj-method.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorMethod[Yield, Await]:
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/generators/syntax/class-decl-method.template b/src/generators/syntax/class-decl-method.template
index 0dd8b66af..0bffb7201 100644
--- a/src/generators/syntax/class-decl-method.template
+++ b/src/generators/syntax/class-decl-method.template
@@ -15,6 +15,7 @@ info: |
 
   GeneratorMethod :
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 class C { *gen() {
diff --git a/src/generators/syntax/class-decl-static-method.template b/src/generators/syntax/class-decl-static-method.template
index 217e85491..2a1b84f58 100644
--- a/src/generators/syntax/class-decl-static-method.template
+++ b/src/generators/syntax/class-decl-static-method.template
@@ -15,6 +15,7 @@ info: |
 
   GeneratorMethod :
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 class C {static *gen() {
diff --git a/src/generators/syntax/class-expr-method.template b/src/generators/syntax/class-expr-method.template
index 9ee72a08d..f4f524e9d 100644
--- a/src/generators/syntax/class-expr-method.template
+++ b/src/generators/syntax/class-expr-method.template
@@ -15,6 +15,7 @@ info: |
 
   GeneratorMethod :
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var C = class {*gen() {
diff --git a/src/generators/syntax/class-expr-static-method.template b/src/generators/syntax/class-expr-static-method.template
index c6dd24225..62b1e85f7 100644
--- a/src/generators/syntax/class-expr-static-method.template
+++ b/src/generators/syntax/class-expr-static-method.template
@@ -15,6 +15,7 @@ info: |
 
   GeneratorMethod :
     * PropertyName ( UniqueFormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var C = class { static *gen() {
diff --git a/src/generators/syntax/declaration.template b/src/generators/syntax/declaration.template
index 99b003f28..0924dd588 100644
--- a/src/generators/syntax/declaration.template
+++ b/src/generators/syntax/declaration.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorDeclaration :
     function * BindingIdentifier ( FormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 function *gen() {
diff --git a/src/generators/syntax/expression-named.template b/src/generators/syntax/expression-named.template
index 17cd90d22..036257899 100644
--- a/src/generators/syntax/expression-named.template
+++ b/src/generators/syntax/expression-named.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorExpression:
     function * BindingIdentifier opt ( FormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var gen = function *g() {
diff --git a/src/generators/syntax/expression.template b/src/generators/syntax/expression.template
index 03622695d..21e808540 100644
--- a/src/generators/syntax/expression.template
+++ b/src/generators/syntax/expression.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorExpression:
     function * BindingIdentifier opt ( FormalParameters ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var gen = function *() {
diff --git a/src/generators/syntax/obj-method.template b/src/generators/syntax/obj-method.template
index 4da204356..124e9747d 100644
--- a/src/generators/syntax/obj-method.template
+++ b/src/generators/syntax/obj-method.template
@@ -9,6 +9,7 @@ info: |
 
   GeneratorMethod[Yield, Await]:
     * PropertyName[?Yield, ?Await] ( UniqueFormalParameters[+Yield, ~Await] ) { GeneratorBody }
+features: [generators]
 ---*/
 
 var obj = {
diff --git a/src/spread/mult-err-expr-throws.case b/src/spread/mult-err-expr-throws.case
index e06e549f8..e3cb140f9 100644
--- a/src/spread/mult-err-expr-throws.case
+++ b/src/spread/mult-err-expr-throws.case
@@ -12,6 +12,7 @@ info: |
     2. Let spreadRef be the result of evaluating AssignmentExpression.
     3. Let iterator be GetIterator(GetValue(spreadRef) ).
     4. ReturnIfAbrupt(iterator).
+features: [generators]
 ---*/
 
 //- error