Class names should be parsed in strict mode

Author: Kevin Smith

lib/Parser/Parse.cpp

@@ -7859,6 +7859,9 @@ ParseNodeClass * Parser::ParseClassDecl(BOOL isDeclaration, LPCOLESTR pNameHint,
         cbMinConstructor = this->GetScanner()->IecpMinTok();
     }
 
+    BOOL strictSave = m_fUseStrictMode;
+    m_fUseStrictMode = TRUE;
+
     this->GetScanner()->Scan();
     if (m_token.tk == tkID)
     {
@@ -7875,9 +7878,6 @@ ParseNodeClass * Parser::ParseClassDecl(BOOL isDeclaration, LPCOLESTR pNameHint,
         GetCurrentFunctionNode()->grfpn |= PNodeFlags::fpnArguments_overriddenByDecl;
     }
 
-    BOOL strictSave = m_fUseStrictMode;
-    m_fUseStrictMode = TRUE;
-
     ParseNodeVar * pnodeDeclName = nullptr;
     if (isDeclaration)
     {

test/es6/classes.js

@@ -72,6 +72,12 @@ var tests = [
       assert.throws(function () { eval("class { }") }, SyntaxError);
     }
   },
+  {
+    name: "Class names are parsed in strict mode",
+    body: function () {
+      assert.throws(function () { eval("class l\u0065t { }") }, SyntaxError);
+    }
+  },
   {
     name: "Class methods may not have an octal name",
     body: function () {

test/es6/generators-syntax.js

@@ -96,6 +96,7 @@ var tests = [
             assert.throws(function () { eval("function* gf() { var gfe = function* yield() { } }"); }, SyntaxError, "Cannot name generator function expression 'yield' in generator body", "The use of a keyword for an identifier is invalid");
 
             assert.throws(function () { eval("function* gf() { class yield { } }"); }, SyntaxError, "Cannot name class 'yield' in generator body", "The use of a keyword for an identifier is invalid");
+            assert.throws(function () { eval("function f() { class yield { } }"); }, SyntaxError, "Can name class 'yield'");
 
             // TODO: Is this correct or a spec bug that will be fixed?
             // var yield = 10; function* gf() { var o = { yield }; } gf();
@@ -134,8 +135,6 @@ var tests = [
             assert.doesNotThrow(function () { eval("function f() { function* yield() { } }"); }, "Can name generator function 'yield' in non-generator body");
             assert.doesNotThrow(function () { eval("function f() { var fe = function yield() { } }"); }, "Can name function expression 'yield' in non-generator body");
 
-            assert.doesNotThrow(function () { eval("function f() { class yield { } }"); }, "Can name class 'yield' in non-generator body");
-
             assert.doesNotThrow(function () { eval("function f() { var o = { yield: 10 } }"); }, "Can name object literal property 'yield' in non-generator body");
             assert.doesNotThrow(function () { eval("function f() { var o = { get yield() { } } }"); }, "Can name accessor method 'yield' in non-generator body");
             assert.doesNotThrow(function () { eval("function f() { var o = { yield() { } } }"); }, "Can name concise method 'yield' in non-generator body");