Changeset 291577 in webkit

Timestamp:

Mar 21, 2022 12:57:19 PM (4 months ago)

Author:

ysuzuki@apple.com

Message:

[JSC] ReferenceError when using extra parens in class fields
​https://bugs.webkit.org/show_bug.cgi?id=236843

Reviewed by Saam Barati.

JSTests:

• stress/class-field-initializer-should-have-variable-scope.js: Added.

(shouldBe):
(test1.const.a.x.B):
(test1):
(test2.const.a.x.B):
(test2):
(test3.B.prototype.b):
(test3.B):
(test3):

Source/JavaScriptCore:

class field initializer should create its own used-variables set
to capture used variables separately from the other variables since
it becomes independent CodeBlock internally later. The current code
was wrong since,

1. Incorrectly using the current set of class-scope.
2. Incorrectly marking only the last set while parseAssignmentExpression can create a new set inside it.

• parser/Parser.cpp:

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

• parser/Parser.h:

(JSC::Scope::markLastUsedVariablesSetAsCaptured):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/class-field-initializer-should-have-variable-scope.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (2 diffs)
• Source/JavaScriptCore/parser/Parser.h (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2022-03-21  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] ReferenceError when using extra parens in class fields
+        https://bugs.webkit.org/show_bug.cgi?id=236843
+
+        Reviewed by Saam Barati.
+
+        * stress/class-field-initializer-should-have-variable-scope.js: Added.
+        (shouldBe):
+        (test1.const.a.x.B):
+        (test1):
+        (test2.const.a.x.B):
+        (test2):
+        (test3.B.prototype.b):
+        (test3.B):
+        (test3):
+
 2022-03-08  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2022-03-21  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] ReferenceError when using extra parens in class fields
+        https://bugs.webkit.org/show_bug.cgi?id=236843
+
+        Reviewed by Saam Barati.
+
+        class field initializer should create its own used-variables set
+        to capture used variables separately from the other variables since
+        it becomes independent CodeBlock internally later. The current code
+        was wrong since,
+
+            1. Incorrectly using the current set of class-scope.
+            2. Incorrectly marking only the last set while parseAssignmentExpression can create a new set inside it.
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseClass):
+        * parser/Parser.h:
+        (JSC::Scope::markLastUsedVariablesSetAsCaptured):
+
 2022-03-21  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -3111 +3111 @@
             TreeExpression initializer = 0;
             if (consume(EQUAL)) {
+                size_t usedVariablesSize = currentScope()->currentUsedVariablesSize();
+                currentScope()->pushUsedVariableSet();
                 SetForScope overrideParsingClassFieldInitializer(m_parserState.isParsingClassFieldInitializer, true);
                 classScope->setExpectedSuperBinding(SuperBinding::Needed);
@@ -3116 +3118 @@
                 classScope->setExpectedSuperBinding(SuperBinding::NotNeeded);
                 failIfFalse(initializer, "Cannot parse initializer for class field");
-                classScope->markLastUsedVariablesSetAsCaptured();
+                classScope->markLastUsedVariablesSetAsCaptured(usedVariablesSize);
             }
             failIfFalse(autoSemiColon(), "Expected a ';' following a class field");

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -664 +664 @@
     }
 
-    void markLastUsedVariablesSetAsCaptured()
-    {
-        for (UniquedStringImpl* impl : m_usedVariables.last())
-            m_closedVariableCandidates.add(impl);
+    void markLastUsedVariablesSetAsCaptured(unsigned from)
+    {
+        for (unsigned index = from; index < m_usedVariables.size(); ++index) {
+            for (UniquedStringImpl* impl : m_usedVariables[index])
+                m_closedVariableCandidates.add(impl);
+        }
     }