Changeset 191037 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Oct 14, 2015, 12:08:54 AM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r191030.
​https://bugs.webkit.org/show_bug.cgi?id=150116

caused js/class-syntax-method-names.html to crash on debug
builds (Requested by alexchristensen_ on #webkit).

Reverted changeset:

"[ES6] Class expression should have lexical environment that
has itself as an imutable binding"
​https://bugs.webkit.org/show_bug.cgi?id=150089
​http://trac.webkit.org/changeset/191030

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1924 +1924 @@
 
     AutoPopScopeRef classScope(this, pushScope());
-    classScope->setIsLexicalScope();
-    classScope->preventVarDeclarations();
     classScope->setStrictMode();
 
@@ -1933 +1931 @@
         info.className = className;
         next();
-        failIfTrue(classScope->declareLexicalVariable(className, true) & DeclarationResult::InvalidStrictMode, "'", className->impl(), "' is not a valid class name");
+        failIfTrue(classScope->declareVariable(className) & DeclarationResult::InvalidStrictMode, "'", className->impl(), "' is not a valid class name");
     } else if (requirements == FunctionNeedsName) {
         if (match(OPENBRACE))
@@ -2050 +2048 @@
     }
 
+    popScope(classScope, TreeBuilder::NeedsFreeVariableInfo);
     consumeOrFail(CLOSEBRACE, "Expected a closing '}' after a class body");
 
-    auto classExpression = context.createClassExpr(location, *className, classScope->finalizeLexicalEnvironment(), constructor, parentClass, instanceMethods, staticMethods);
-    popScope(classScope, TreeBuilder::NeedsFreeVariableInfo);
-    return classExpression;
+    return context.createClassExpr(location, *className, constructor, parentClass, instanceMethods, staticMethods);
 }
 #endif