Changeset 273107 in webkit for trunk/Source/JavaScriptCore/parser/VariableEnvironment.h

Timestamp:

Feb 18, 2021, 3:48:28 PM (4 years ago)

Author:

Caio Lima

Message:

[JSC] Implement private static method
​https://bugs.webkit.org/show_bug.cgi?id=219181

Reviewed by Yusuke Suzuki.

JSTests:

• stress/class-private-method-access.js: Added.
• stress/private-accessor-static-non-static.js: Added.
• stress/private-getter-inner-class.js:
• stress/static-private-methods-and-accessor-inner-class.js: Added.
• stress/static-private-methods-and-accessor-multiple-evaluation.js: Added.
• stress/static-private-methods-and-accessors-postfix-node.js: Added.
• stress/static-private-methods-and-accessors-prefix-node.js: Added.
• test262/config.yaml:

Source/JavaScriptCore:

This patch is implementing static private methods and accessors
proposal based on ​https://github.com/tc39/proposal-static-class-features.
This implementation diverge a bit from private methods&accessors on the
brand check, because we are using a simpler way to perform static
brand checks. Since only the class constructor is allowed to access
its private methods and accessors, we save it on @privateClassBrand
on class lexical scope and compare it with the receiver of the static
private method (and accessors) using === operation.
While this genenrates more bytecodes than check_private_brand, we
don't need to perform a Structure transition to install a brand,
and avoid allocation of a private symbol. Since each evaluation of a
class generates a different constructor object, we preserve the semantics
that private methods are lexically scoped.

• builtins/BuiltinNames.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitCreatePrivateBrand):
(JSC::BytecodeGenerator::emitInstallPrivateBrand):
(JSC::BytecodeGenerator::emitInstallPrivateClassBrand):
(JSC::BytecodeGenerator::emitGetPrivateBrand):
(JSC::BytecodeGenerator::emitCheckPrivateBrand):

• bytecompiler/BytecodeGenerator.h:
• bytecompiler/NodesCodegen.cpp:

(JSC::BaseDotNode::emitGetPropertyValue):
(JSC::BaseDotNode::emitPutProperty):
(JSC::PostfixNode::emitDot):
(JSC::PrefixNode::emitDot):
(JSC::ClassExprNode::emitBytecode):

• parser/Parser.cpp:

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

• parser/Parser.h:

(JSC::Scope::declarePrivateMethod):
(JSC::Scope::declarePrivateAccessor):
(JSC::Scope::declarePrivateSetter):
(JSC::Scope::declarePrivateGetter):

• parser/VariableEnvironment.cpp:

(JSC::VariableEnvironment::declarePrivateAccessor):
(JSC::VariableEnvironment::declarePrivateSetter):
(JSC::VariableEnvironment::declarePrivateGetter):
(JSC::VariableEnvironment::declarePrivateMethod):

• parser/VariableEnvironment.h:

(JSC::PrivateNameEntry::isStatic const):
(JSC::VariableEnvironment::isEmpty const):
(JSC::VariableEnvironment::declareStaticPrivateMethod):
(JSC::VariableEnvironment::declarePrivateSetter):
(JSC::VariableEnvironment::declareStaticPrivateSetter):
(JSC::VariableEnvironment::declarePrivateGetter):
(JSC::VariableEnvironment::declareStaticPrivateGetter):
(JSC::VariableEnvironment::hasStaticPrivateMethodOrAccessor const):
(JSC::VariableEnvironment::hasInstancePrivateMethodOrAccessor const):
(JSC::VariableEnvironment::hasPrivateMethodOrAccessor const): Deleted.

File:

• trunk/Source/JavaScriptCore/parser/VariableEnvironment.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/parser/VariableEnvironment.h

@@ -111 +111 @@
     ALWAYS_INLINE bool isGetter() const { return m_bits & IsGetter; }
     ALWAYS_INLINE bool isField() const { return !isPrivateMethodOrAcessor(); }
+    ALWAYS_INLINE bool isStatic() const { return m_bits & IsStatic; }
 
     bool isPrivateMethodOrAcessor() const { return isMethod() || isSetter() || isGetter(); }
@@ -131 +132 @@
         IsGetter = 1 << 3,
         IsSetter = 1 << 4,
+        IsStatic = 1 << 5,
     };
 
@@ -197 +199 @@
 
     bool isEverythingCaptured() const { return m_isEverythingCaptured; }
-    bool isEmpty() const { return !m_map.size(); }
+    bool isEmpty() const { return !m_map.size() && !privateNamesSize(); }
 
     using PrivateNamesRange = WTF::IteratorRange<PrivateNameEnvironment::iterator>;
@@ -205 +207 @@
 
     bool declarePrivateMethod(const Identifier& identifier) { return declarePrivateMethod(identifier.impl()); }
-    bool declarePrivateMethod(const RefPtr<UniquedStringImpl>& identifier);
-
-    bool declarePrivateAccessor(const RefPtr<UniquedStringImpl>&, PrivateNameEntry::Traits);
-
-    bool declarePrivateSetter(const Identifier& identifier) { return declarePrivateSetter(identifier.impl()); }
-    bool declarePrivateSetter(const RefPtr<UniquedStringImpl>& identifier);
-
-    bool declarePrivateGetter(const Identifier& identifier) { return declarePrivateGetter(identifier.impl()); }
-    bool declarePrivateGetter(const RefPtr<UniquedStringImpl>& identifier);
+    bool declarePrivateMethod(const RefPtr<UniquedStringImpl>& identifier, PrivateNameEntry::Traits addionalTraits = PrivateNameEntry::Traits::None);
+
+    enum class PrivateDeclarationResult {
+        Success,
+        DuplicatedName,
+        InvalidStaticNonStatic
+    };
+
+    PrivateDeclarationResult declarePrivateAccessor(const RefPtr<UniquedStringImpl>&, PrivateNameEntry accessorTraits);
+    
+    bool declareStaticPrivateMethod(const Identifier& identifier)
+    {
+        return declarePrivateMethod(identifier.impl(), static_cast<PrivateNameEntry::Traits>(PrivateNameEntry::Traits::IsMethod | PrivateNameEntry::Traits::IsStatic));
+    }
+
+    PrivateDeclarationResult declarePrivateSetter(const Identifier& identifier) { return declarePrivateSetter(identifier.impl()); }
+    PrivateDeclarationResult declareStaticPrivateSetter(const Identifier& identifier) { return declarePrivateSetter(identifier.impl(), PrivateNameEntry::Traits::IsStatic); }
+    PrivateDeclarationResult declarePrivateSetter(const RefPtr<UniquedStringImpl>& identifier, PrivateNameEntry::Traits modifierTraits = PrivateNameEntry::Traits::None);
+
+    PrivateDeclarationResult declarePrivateGetter(const Identifier& identifier) { return declarePrivateGetter(identifier.impl()); }
+    PrivateDeclarationResult declareStaticPrivateGetter(const Identifier& identifier) { return declarePrivateGetter(identifier.impl(), PrivateNameEntry::Traits::IsStatic); }
+    PrivateDeclarationResult declarePrivateGetter(const RefPtr<UniquedStringImpl>& identifier, PrivateNameEntry::Traits modifierTraits = PrivateNameEntry::Traits::None);
 
     Map::AddResult declarePrivateField(const RefPtr<UniquedStringImpl>& identifier)
@@ -254 +269 @@
     }
 
-    ALWAYS_INLINE bool hasPrivateMethodOrAccessor() const
+    ALWAYS_INLINE bool hasStaticPrivateMethodOrAccessor() const
     {
         if (!m_rareData)
@@ -260 +275 @@
 
         for (auto entry : privateNames()) {
-            if (entry.value.isPrivateMethodOrAcessor())
+            if (entry.value.isPrivateMethodOrAcessor() && entry.value.isStatic())
                 return true;
         }
-
+        
+        return false;
+    }
+    
+    ALWAYS_INLINE bool hasInstancePrivateMethodOrAccessor() const
+    {
+        if (!m_rareData)
+            return false;
+        
+        for (auto entry : privateNames()) {
+            if (entry.value.isPrivateMethodOrAcessor() && !entry.value.isStatic())
+                return true;
+        }
+        
         return false;
     }