Changeset 181503 in webkit

Timestamp:

Mar 14, 2015, 9:58:55 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

parseClass should popScope after pushScope
​https://bugs.webkit.org/show_bug.cgi?id=142689

Reviewed by Benjamin Poulain.

Source/JavaScriptCore:

Pop the parser scope as needed.

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseClass):

LayoutTests:

Added a regression test for the test case that caught this bug.

• TestExpectations: Skipped the test since ES6 class syntax isn't enabled by default.
• js/class-syntax-scoping-expected.txt: Added.
• js/class-syntax-scoping.html: Added.
• js/script-tests/class-syntax-scoping.js: Added.

(test):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/js/class-syntax-scoping-expected.txt (added)
• LayoutTests/js/class-syntax-scoping.html (added)
• LayoutTests/js/script-tests/class-syntax-scoping.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        parseClass should popScope after pushScope
+        https://bugs.webkit.org/show_bug.cgi?id=142689
+
+        Reviewed by Benjamin Poulain.
+
+        Added a regression test for the test case that caught this bug.
+
+        * TestExpectations: Skipped the test since ES6 class syntax isn't enabled by default.
+        * js/class-syntax-scoping-expected.txt: Added.
+        * js/class-syntax-scoping.html: Added.
+        * js/script-tests/class-syntax-scoping.js: Added.
+        (test):
+
 2015-03-14  Michael Saboff  <msaboff@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -72 +72 @@
 webkit.org/b/140491 js/class-syntax-expression.html [ Failure ]
 webkit.org/b/140491 js/class-syntax-extends.html [ Failure ]
+webkit.org/b/140491 js/class-syntax-scoping.html [ Failure ]
 webkit.org/b/140491 js/class-syntax-super.html [ Failure ]
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        parseClass should popScope after pushScope
+        https://bugs.webkit.org/show_bug.cgi?id=142689
+
+        Reviewed by Benjamin Poulain.
+
+        Pop the parser scope as needed.
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseClass):
+
 2015-03-14  Dean Jackson  <dino@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1553 +1553 @@
     semanticFailIfFalse(constructor, "Class declaration without a constructor is not supported yet");
 
+    failIfFalse(popScope(classScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
     consumeOrFail(CLOSEBRACE, "Expected a closing '}' after a class body");