Attachment 361219 Details for Bug 194277 – WIP

[patch] WIP

bug-194277-20190205140200.patch (text/plain), 32.71 KB, created by Yusuke Suzuki on 2019-02-05 14:02:01 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2019-02-05 14:02:01 PST

Size: 32.71 KB

patch

obsolete

>Subversion Revision: 240983
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 4c70a3c318c43aafbc8ee8ea961083f16a54ed19..0b0c90a55c4ce1907222458b001b6792892ad345 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,52 @@
>+2019-02-05  Yusuke Suzuki  <ysuzuki@apple.com>
>+
>+        [JSC] PrivateName to PublicName hash table is wasteful
>+        https://bugs.webkit.org/show_bug.cgi?id=194277
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * builtins/BuiltinNames.cpp:
>+        (JSC::BuiltinNames::BuiltinNames):
>+        * builtins/BuiltinNames.h:
>+        (JSC::BuiltinNames::lookUpPrivateName const):
>+        (JSC::BuiltinNames::appendExternalName):
>+        (JSC::BuiltinNames::lookUpPublicName const): Deleted.
>+        * builtins/BuiltinUtils.h:
>+        * bytecode/BytecodeDumper.cpp:
>+        (JSC::BytecodeDumper<Block>::dumpIdentifiers):
>+        * bytecompiler/NodesCodegen.cpp:
>+        (JSC::BytecodeIntrinsicNode::emit_intrinsic_getByIdDirectPrivate):
>+        (JSC::BytecodeIntrinsicNode::emit_intrinsic_putByIdDirectPrivate):
>+        * parser/Lexer.cpp:
>+        (JSC::Lexer<LChar>::parseIdentifier):
>+        (JSC::Lexer<UChar>::parseIdentifier):
>+        * parser/Parser.cpp:
>+        (JSC::Parser<LexerType>::createGeneratorParameters):
>+        (JSC::Parser<LexerType>::parseFunctionDeclaration):
>+        (JSC::Parser<LexerType>::parseAsyncFunctionDeclaration):
>+        (JSC::Parser<LexerType>::parseClassDeclaration):
>+        (JSC::Parser<LexerType>::parseExportDeclaration):
>+        (JSC::Parser<LexerType>::parseMemberExpression):
>+        * parser/ParserArena.h:
>+        (JSC::IdentifierArena::makeIdentifier):
>+        * runtime/CachedTypes.cpp:
>+        (JSC::CachedUniquedStringImpl::encode):
>+        (JSC::CachedUniquedStringImpl::decode const):
>+        * runtime/CommonIdentifiers.cpp:
>+        (JSC::CommonIdentifiers::CommonIdentifiers):
>+        (JSC::CommonIdentifiers::lookUpPrivateName const):
>+        (JSC::CommonIdentifiers::lookUpPublicName const): Deleted.
>+        * runtime/CommonIdentifiers.h:
>+        * runtime/ExceptionHelpers.cpp:
>+        (JSC::createUndefinedVariableError):
>+        * runtime/Identifier.cpp:
>+        (JSC::Identifier::dump const):
>+        * runtime/Identifier.h:
>+        * runtime/IdentifierInlines.h:
>+        (JSC::Identifier::fromUid):
>+        * tools/JSDollarVM.cpp:
>+        (JSC::functionGetPrivateProperty):
>+
> 2019-02-05  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] Shrink sizeof(UnlinkedCodeBlock)
>diff --git a/Source/JavaScriptCore/builtins/BuiltinNames.cpp b/Source/JavaScriptCore/builtins/BuiltinNames.cpp
>index a0f853a6e05dc4618ff04de59019b1ea13d6b37f..5594c6517d231a30398e1c4dfef7168e2818fe26 100644
>--- a/Source/JavaScriptCore/builtins/BuiltinNames.cpp
>+++ b/Source/JavaScriptCore/builtins/BuiltinNames.cpp
>@@ -38,13 +38,13 @@ namespace Symbols {
> JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL(INITIALIZE_BUILTIN_STATIC_SYMBOLS)
> #undef INITIALIZE_BUILTIN_STATIC_SYMBOLS
> 
>-#define INITIALIZE_BUILTIN_PRIVATE_NAMES(name) SymbolImpl::StaticSymbolImpl name##PrivateName { "PrivateSymbol." #name, SymbolImpl::s_flagIsPrivate };
>+#define INITIALIZE_BUILTIN_PRIVATE_NAMES(name) SymbolImpl::StaticSymbolImpl name##PrivateName { #name, SymbolImpl::s_flagIsPrivate };
> JSC_FOREACH_BUILTIN_FUNCTION_NAME(INITIALIZE_BUILTIN_PRIVATE_NAMES)
> JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_BUILTIN_PRIVATE_NAMES)
> #undef INITIALIZE_BUILTIN_PRIVATE_NAMES
> 
>-SymbolImpl::StaticSymbolImpl dollarVMPrivateName { "PrivateSymbol.$vm", SymbolImpl::s_flagIsPrivate };
>-SymbolImpl::StaticSymbolImpl polyProtoPrivateName { "PrivateSymbol.PolyProto", SymbolImpl::s_flagIsPrivate };
>+SymbolImpl::StaticSymbolImpl dollarVMPrivateName { "$vm", SymbolImpl::s_flagIsPrivate };
>+SymbolImpl::StaticSymbolImpl polyProtoPrivateName { "PolyProto", SymbolImpl::s_flagIsPrivate };
> 
> } // namespace Symbols
> 
>@@ -59,14 +59,10 @@ BuiltinNames::BuiltinNames(VM* vm, CommonIdentifiers* commonIdentifiers)
>     , m_dollarVMPrivateName(Identifier::fromUid(vm, &static_cast<SymbolImpl&>(Symbols::dollarVMPrivateName)))
>     , m_polyProtoPrivateName(Identifier::fromUid(vm, &static_cast<SymbolImpl&>(Symbols::polyProtoPrivateName)))
> {
>-    JSC_FOREACH_BUILTIN_FUNCTION_NAME(INITIALIZE_PRIVATE_TO_PUBLIC_ENTRY)
>-    JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PRIVATE_TO_PUBLIC_ENTRY)
>     JSC_FOREACH_BUILTIN_FUNCTION_NAME(INITIALIZE_PUBLIC_TO_PRIVATE_ENTRY)
>     JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PUBLIC_TO_PRIVATE_ENTRY)
>-    JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL(INITIALIZE_SYMBOL_PRIVATE_TO_PUBLIC_ENTRY)
>     JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL(INITIALIZE_SYMBOL_PUBLIC_TO_PRIVATE_ENTRY)
>-    m_privateToPublicMap.add(m_dollarVMPrivateName.impl(), &m_dollarVMName);
>-    m_publicToPrivateMap.add(m_dollarVMName.impl(), &m_dollarVMPrivateName);
>+    m_publicToPrivateMap.add(m_dollarVMName.impl(), static_cast<SymbolImpl*>(m_dollarVMPrivateName.impl()));
> }
> 
> } // namespace JSC
>diff --git a/Source/JavaScriptCore/builtins/BuiltinNames.h b/Source/JavaScriptCore/builtins/BuiltinNames.h
>index 4a701448e2a910bbf37c76220810f3532b6996b6..5569c9838ecfbd56efd48bfc4e70551c61e64862 100644
>--- a/Source/JavaScriptCore/builtins/BuiltinNames.h
>+++ b/Source/JavaScriptCore/builtins/BuiltinNames.h
>@@ -32,7 +32,7 @@
> 
> namespace JSC {
> 
>-#define INITIALIZE_BUILTIN_NAMES_IN_JSC(name) , m_##name(JSC::Identifier::fromString(vm, #name)), m_##name##PrivateName(JSC::Identifier::fromUid(vm, &static_cast<SymbolImpl&>(JSC::Symbols::name##PrivateName)))
>+#define INITIALIZE_BUILTIN_NAMES_IN_JSC(name) , m_##name(JSC::Identifier::fromString(vm, #name))
> #define INITIALIZE_BUILTIN_SYMBOLS(name) , m_##name##Symbol(JSC::Identifier::fromUid(vm, &static_cast<SymbolImpl&>(JSC::Symbols::name##Symbol))), m_##name##SymbolPrivateIdentifier(JSC::Identifier::fromString(vm, #name "Symbol"))
> #define DECLARE_BUILTIN_SYMBOLS(name) const JSC::Identifier m_##name##Symbol; const JSC::Identifier m_##name##SymbolPrivateIdentifier;
> #define DECLARE_BUILTIN_SYMBOL_ACCESSOR(name) \
>@@ -205,14 +205,12 @@ extern SymbolImpl::StaticSymbolImpl dollarVMPrivateName;
> extern SymbolImpl::StaticSymbolImpl polyProtoPrivateName;
> }
> 
>-#define INITIALIZE_PRIVATE_TO_PUBLIC_ENTRY(name) m_privateToPublicMap.add(m_##name##PrivateName.impl(), &m_##name);
>-#define INITIALIZE_PUBLIC_TO_PRIVATE_ENTRY(name) m_publicToPrivateMap.add(m_##name.impl(), &m_##name##PrivateName);
>+#define INITIALIZE_PUBLIC_TO_PRIVATE_ENTRY(name) m_publicToPrivateMap.add(m_##name.impl(), &static_cast<SymbolImpl&>(JSC::Symbols::name##PrivateName));
> 
> // We commandeer the publicToPrivateMap to allow us to convert private symbol names into the appropriate symbol.
> // e.g. @iteratorSymbol points to Symbol.iterator in this map rather than to a an actual private name.
> // FIXME: This is a weird hack and we shouldn't need to do this.
>-#define INITIALIZE_SYMBOL_PRIVATE_TO_PUBLIC_ENTRY(name) m_privateToPublicMap.add(m_##name##Symbol.impl(), &m_##name##SymbolPrivateIdentifier);
>-#define INITIALIZE_SYMBOL_PUBLIC_TO_PRIVATE_ENTRY(name) m_publicToPrivateMap.add(m_##name##SymbolPrivateIdentifier.impl(), &m_##name##Symbol);
>+#define INITIALIZE_SYMBOL_PUBLIC_TO_PRIVATE_ENTRY(name) m_publicToPrivateMap.add(m_##name##SymbolPrivateIdentifier.impl(), static_cast<SymbolImpl*>(m_##name##Symbol.impl()));
> 
> class BuiltinNames {
>     WTF_MAKE_NONCOPYABLE(BuiltinNames); WTF_MAKE_FAST_ALLOCATED;
>@@ -220,8 +218,7 @@ class BuiltinNames {
> public:
>     BuiltinNames(VM*, CommonIdentifiers*);
> 
>-    const Identifier* lookUpPrivateName(const Identifier&) const;
>-    const Identifier& lookUpPublicName(const Identifier&) const;
>+    SymbolImpl* lookUpPrivateName(const Identifier&) const;
>     
>     void appendExternalName(const Identifier& publicName, const Identifier& privateName);
> 
>@@ -240,25 +237,16 @@ class BuiltinNames {
>     const JSC::Identifier m_dollarVMName;
>     const JSC::Identifier m_dollarVMPrivateName;
>     const JSC::Identifier m_polyProtoPrivateName;
>-    typedef HashMap<RefPtr<UniquedStringImpl>, const Identifier*, IdentifierRepHash> BuiltinNamesMap;
>+    typedef HashMap<RefPtr<UniquedStringImpl>, SymbolImpl*, IdentifierRepHash> BuiltinNamesMap;
>     BuiltinNamesMap m_publicToPrivateMap;
>-    BuiltinNamesMap m_privateToPublicMap;
> };
> 
>-inline const Identifier* BuiltinNames::lookUpPrivateName(const Identifier& ident) const
>+inline SymbolImpl* BuiltinNames::lookUpPrivateName(const Identifier& ident) const
> {
>     auto iter = m_publicToPrivateMap.find(ident.impl());
>     if (iter != m_publicToPrivateMap.end())
>         return iter->value;
>-    return 0;
>-}
>-
>-inline const Identifier& BuiltinNames::lookUpPublicName(const Identifier& ident) const
>-{
>-    auto iter = m_privateToPublicMap.find(ident.impl());
>-    if (iter != m_privateToPublicMap.end())
>-        return *iter->value;
>-    return m_emptyIdentifier;
>+    return nullptr;
> }
> 
> inline void BuiltinNames::appendExternalName(const Identifier& publicName, const Identifier& privateName)
>@@ -268,8 +256,8 @@ inline void BuiltinNames::appendExternalName(const Identifier& publicName, const
>         ASSERT(publicName.string() != *key);
> #endif
> 
>-    m_privateToPublicMap.add(privateName.impl(), &publicName);
>-    m_publicToPrivateMap.add(publicName.impl(), &privateName);
>+    ASSERT(privateName.isSymbol());
>+    m_publicToPrivateMap.add(publicName.impl(), static_cast<SymbolImpl*>(privateName.impl()));
> }
> 
> } // namespace JSC
>diff --git a/Source/JavaScriptCore/builtins/BuiltinUtils.h b/Source/JavaScriptCore/builtins/BuiltinUtils.h
>index 941e529ff1fa8c39c278a320c98b99ac5a98c2f4..b9bb1130229e6f328d6fee7a0c86a8ac2864a610 100644
>--- a/Source/JavaScriptCore/builtins/BuiltinUtils.h
>+++ b/Source/JavaScriptCore/builtins/BuiltinUtils.h
>@@ -30,11 +30,11 @@
> 
> namespace JSC {
> 
>-#define INITIALIZE_BUILTIN_NAMES(name) , m_##name(JSC::Identifier::fromString(vm, #name)), m_##name##PrivateName(JSC::Identifier::fromUid(JSC::PrivateName(JSC::PrivateName::PrivateSymbol, "PrivateSymbol." #name ""_s)))
>-#define DECLARE_BUILTIN_NAMES(name) const JSC::Identifier m_##name; const JSC::Identifier m_##name##PrivateName;
>+#define INITIALIZE_BUILTIN_NAMES(name) , m_##name(JSC::Identifier::fromString(vm, #name))
>+#define DECLARE_BUILTIN_NAMES(name) const JSC::Identifier m_##name;
> #define DECLARE_BUILTIN_IDENTIFIER_ACCESSOR(name) \
>     const JSC::Identifier& name##PublicName() const { return m_##name; } \
>-    const JSC::Identifier& name##PrivateName() const { return m_##name##PrivateName; }
>+    JSC::Identifier name##PrivateName() const { return Identifier::fromUid(static_cast<SymbolImpl&>(Symbols::name##PrivateName)); }
> 
> class Identifier;
> class SourceCode;
>diff --git a/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp b/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp
>index 620dc9f6f63bfa101db2f44798e75fd0e6d45bbc..721d390552c92a8b3a264b08e9525812f8244f8e 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp
>+++ b/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp
>@@ -104,7 +104,7 @@ void BytecodeDumper<Block>::dumpIdentifiers()
>         m_out.printf("\nIdentifiers:\n");
>         size_t i = 0;
>         do {
>-            m_out.printf("  id%u = %s\n", static_cast<unsigned>(i), identifier(i).string().utf8().data());
>+            m_out.print("  id", static_cast<unsigned>(i), " = ", identifier(i), "\n");
>             ++i;
>         } while (i != count);
>     }
>diff --git a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>index 6d5045b831b9ee87e0f28b8eea706a945c52423f..4775ecad38e1985ed8c5104cee05d0bd661c1007 100644
>--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>@@ -967,10 +967,10 @@ RegisterID* BytecodeIntrinsicNode::emit_intrinsic_getByIdDirectPrivate(BytecodeG
>     RefPtr<RegisterID> base = generator.emitNode(node);
>     node = node->m_next;
>     ASSERT(node->m_expr->isString());
>-    const Identifier* ident = generator.vm()->propertyNames->lookUpPrivateName(static_cast<StringNode*>(node->m_expr)->value());
>-    ASSERT(ident);
>+    SymbolImpl* symbol = generator.vm()->propertyNames->lookUpPrivateName(static_cast<StringNode*>(node->m_expr)->value());
>+    ASSERT(symbol);
>     ASSERT(!node->m_next);
>-    return generator.emitDirectGetById(generator.finalDestination(dst), base.get(), *ident);
>+    return generator.emitDirectGetById(generator.finalDestination(dst), base.get(), Identifier::fromUid(*symbol));
> }
> 
> RegisterID* BytecodeIntrinsicNode::emit_intrinsic_argument(BytecodeGenerator& generator, RegisterID* dst)
>@@ -1018,14 +1018,14 @@ RegisterID* BytecodeIntrinsicNode::emit_intrinsic_putByIdDirectPrivate(BytecodeG
>     RefPtr<RegisterID> base = generator.emitNode(node);
>     node = node->m_next;
>     ASSERT(node->m_expr->isString());
>-    const Identifier* ident = generator.vm()->propertyNames->lookUpPrivateName(static_cast<StringNode*>(node->m_expr)->value());
>-    ASSERT(ident);
>+    SymbolImpl* symbol = generator.vm()->propertyNames->lookUpPrivateName(static_cast<StringNode*>(node->m_expr)->value());
>+    ASSERT(symbol);
>     node = node->m_next;
>     RefPtr<RegisterID> value = generator.emitNode(node);
> 
>     ASSERT(!node->m_next);
> 
>-    return generator.move(dst, generator.emitDirectPutById(base.get(), *ident, value.get(), PropertyNode::KnownDirect));
>+    return generator.move(dst, generator.emitDirectPutById(base.get(), Identifier::fromUid(*symbol), value.get(), PropertyNode::KnownDirect));
> }
> 
> RegisterID* BytecodeIntrinsicNode::emit_intrinsic_putByValDirect(BytecodeGenerator& generator, RegisterID* dst)
>diff --git a/Source/JavaScriptCore/parser/Lexer.cpp b/Source/JavaScriptCore/parser/Lexer.cpp
>index 122c4d91d4b17c54e714faf428b3194412f0ea18..2402a97f52f9825136df0b1ba09909764ace3b73 100644
>--- a/Source/JavaScriptCore/parser/Lexer.cpp
>+++ b/Source/JavaScriptCore/parser/Lexer.cpp
>@@ -975,9 +975,9 @@ template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer<LChar>::p
>                 return ERRORTOK;
>             }
>             if (isPrivateName)
>-                ident = m_vm->propertyNames->lookUpPrivateName(*ident);
>+                ident = &m_arena->makeIdentifier(m_vm, m_vm->propertyNames->lookUpPrivateName(*ident));
>             else if (*ident == m_vm->propertyNames->undefinedKeyword)
>-                tokenData->ident = &m_vm->propertyNames->builtinNames().undefinedPrivateName();
>+                tokenData->ident = &m_vm->propertyNames->undefinedPrivateName;
>             if (!ident)
>                 return INVALID_PRIVATE_NAME_ERRORTOK;
>         }
>@@ -1053,9 +1053,9 @@ template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer<UChar>::p
>                 return ERRORTOK;
>             }
>             if (isPrivateName)
>-                ident = m_vm->propertyNames->lookUpPrivateName(*ident);
>+                ident = &m_arena->makeIdentifier(m_vm, m_vm->propertyNames->lookUpPrivateName(*ident));
>             else if (*ident == m_vm->propertyNames->undefinedKeyword)
>-                tokenData->ident = &m_vm->propertyNames->builtinNames().undefinedPrivateName();
>+                tokenData->ident = &m_vm->propertyNames->undefinedPrivateName;
>             if (!ident)
>                 return INVALID_PRIVATE_NAME_ERRORTOK;
>         }
>diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
>index 1d223bc3a1236cd785bf04aee9e02e104c2b97bc..8c1466c5c6193f15007f8d03eca54dbad6dc44ce 100644
>--- a/Source/JavaScriptCore/parser/Parser.cpp
>+++ b/Source/JavaScriptCore/parser/Parser.cpp
>@@ -2284,15 +2284,15 @@ template <class TreeBuilder> typename TreeBuilder::FormalParameterList Parser<Le
>     };
> 
>     // @generator
>-    addParameter(m_vm->propertyNames->builtinNames().generatorPrivateName());
>+    addParameter(m_vm->propertyNames->generatorPrivateName);
>     // @generatorState
>-    addParameter(m_vm->propertyNames->builtinNames().generatorStatePrivateName());
>+    addParameter(m_vm->propertyNames->generatorStatePrivateName);
>     // @generatorValue
>-    addParameter(m_vm->propertyNames->builtinNames().generatorValuePrivateName());
>+    addParameter(m_vm->propertyNames->generatorValuePrivateName);
>     // @generatorResumeMode
>-    addParameter(m_vm->propertyNames->builtinNames().generatorResumeModePrivateName());
>+    addParameter(m_vm->propertyNames->generatorResumeModePrivateName);
>     // @generatorFrame
>-    addParameter(m_vm->propertyNames->builtinNames().generatorFramePrivateName());
>+    addParameter(m_vm->propertyNames->generatorFramePrivateName);
> 
>     return parameters;
> }
>@@ -2666,7 +2666,7 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseFunctionDecla
>         //
>         // In this case, we use "*default*" as this function declaration's name.
>         requirements = FunctionNameRequirements::None;
>-        functionInfo.name = &m_vm->propertyNames->builtinNames().starDefaultPrivateName();
>+        functionInfo.name = &m_vm->propertyNames->starDefaultPrivateName;
>     }
> 
>     failIfFalse((parseFunctionInfo(context, requirements, parseMode, true, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, functionInfo, FunctionDefinitionType::Declaration, functionConstructorParametersEndPosition)), "Cannot parse this function");
>@@ -2724,7 +2724,7 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseAsyncFunction
>         //
>         // In this case, we use "*default*" as this function declaration's name.
>         requirements = FunctionNameRequirements::None;
>-        functionInfo.name = &m_vm->propertyNames->builtinNames().starDefaultPrivateName();
>+        functionInfo.name = &m_vm->propertyNames->starDefaultPrivateName;
>     }
> 
>     failIfFalse((parseFunctionInfo(context, requirements, parseMode, true, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, functionInfo, FunctionDefinitionType::Declaration, functionConstructorParametersEndPosition)), "Cannot parse this async function");
>@@ -2770,7 +2770,7 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseClassDeclarat
>         //
>         // In this case, we use "*default*" as this class declaration's name.
>         requirements = FunctionNameRequirements::None;
>-        info.className = &m_vm->propertyNames->builtinNames().starDefaultPrivateName();
>+        info.className = &m_vm->propertyNames->starDefaultPrivateName;
>     }
> 
>     TreeClassExpression classExpr = parseClass(context, requirements, info);
>@@ -3407,7 +3407,7 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseExportDeclara
>         }
> 
>         if (!localName)
>-            localName = &m_vm->propertyNames->builtinNames().starDefaultPrivateName();
>+            localName = &m_vm->propertyNames->starDefaultPrivateName;
> 
>         if (isFunctionOrClassDeclaration) {
>             if (startsWithFunction) {
>@@ -3439,11 +3439,11 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseExportDeclara
>             TreeExpression expression = parseAssignmentExpression(context);
>             failIfFalse(expression, "Cannot parse expression");
> 
>-            DeclarationResultMask declarationResult = declareVariable(&m_vm->propertyNames->builtinNames().starDefaultPrivateName(), DeclarationType::ConstDeclaration);
>+            DeclarationResultMask declarationResult = declareVariable(&m_vm->propertyNames->starDefaultPrivateName, DeclarationType::ConstDeclaration);
>             if (declarationResult & DeclarationResult::InvalidDuplicateDeclaration)
>                 internalFailWithMessage(false, "Only one 'default' export is allowed");
> 
>-            TreeExpression assignment = context.createAssignResolve(location, m_vm->propertyNames->builtinNames().starDefaultPrivateName(), expression, start, start, tokenEndPosition(), AssignmentContext::ConstDeclarationStatement);
>+            TreeExpression assignment = context.createAssignResolve(location, m_vm->propertyNames->starDefaultPrivateName, expression, start, start, tokenEndPosition(), AssignmentContext::ConstDeclarationStatement);
>             result = context.createExprStatement(location, assignment, start, tokenEndPosition());
>             failIfFalse(autoSemiColon(), "Expected a ';' following a targeted export declaration");
>         }
>@@ -4733,7 +4733,7 @@ template <class TreeBuilder> TreeExpression Parser<LexerType>::parseMemberExpres
>                 semanticFailIfFalse(m_scriptMode == JSParserScriptMode::Module, "import.meta is only valid inside modules");
> 
>                 JSTokenLocation location(tokenLocation());
>-                base = context.createImportMetaExpr(location, createResolveAndUseVariable(context, &m_vm->propertyNames->builtinNames().metaPrivateName(), false, expressionStart, location));
>+                base = context.createImportMetaExpr(location, createResolveAndUseVariable(context, &m_vm->propertyNames->metaPrivateName, false, expressionStart, location));
>                 next();
>             } else {
>                 failIfTrue(match(IDENT), "\"import.\" can only followed with meta");
>diff --git a/Source/JavaScriptCore/parser/ParserArena.h b/Source/JavaScriptCore/parser/ParserArena.h
>index 85b48559717675f8e5ac9f22fdc5b76d1a7e4b44..9dd23ceb886822f41ae8a87c54482f70527e2641 100644
>--- a/Source/JavaScriptCore/parser/ParserArena.h
>+++ b/Source/JavaScriptCore/parser/ParserArena.h
>@@ -47,6 +47,7 @@ namespace JSC {
>         ALWAYS_INLINE const Identifier& makeIdentifier(VM*, const T* characters, size_t length);
>         ALWAYS_INLINE const Identifier& makeEmptyIdentifier(VM*);
>         ALWAYS_INLINE const Identifier& makeIdentifierLCharFromUChar(VM*, const UChar* characters, size_t length);
>+        ALWAYS_INLINE const Identifier& makeIdentifier(VM*, SymbolImpl*);
> 
>         const Identifier& makeNumericIdentifier(VM*, double number);
> 
>@@ -92,6 +93,13 @@ namespace JSC {
>         return m_identifiers.last();
>     }
> 
>+    ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifier(VM*, SymbolImpl* symbol)
>+    {
>+        ASSERT(!symbol);
>+        m_identifiers.append(Identifier::fromUid(*symbol));
>+        return m_identifiers.last();
>+    }
>+
>     ALWAYS_INLINE const Identifier& IdentifierArena::makeEmptyIdentifier(VM* vm)
>     {
>         return vm->propertyNames->emptyIdentifier;
>diff --git a/Source/JavaScriptCore/runtime/CachedTypes.cpp b/Source/JavaScriptCore/runtime/CachedTypes.cpp
>index b53dfd62aac4fd2511935f2f45f08e34c09370da..dd5ff7de2b157ffc72cf4fb7ec0e3e653568e55a 100644
>--- a/Source/JavaScriptCore/runtime/CachedTypes.cpp
>+++ b/Source/JavaScriptCore/runtime/CachedTypes.cpp
>@@ -534,12 +534,16 @@ class CachedUniquedStringImpl : public VariableLengthObject<UniquedStringImpl> {
>     {
>         m_isAtomic = string.isAtomic();
>         m_isSymbol = string.isSymbol();
>-        StringImpl* impl = const_cast<StringImpl*>(&string);
>+        RefPtr<StringImpl> impl = const_cast<StringImpl*>(&string);
>+
>         if (m_isSymbol) {
>-            SymbolImpl* symbol = static_cast<SymbolImpl*>(impl);
>+            SymbolImpl* symbol = static_cast<SymbolImpl*>(impl.get());
>             if (!symbol->isNullSymbol()) {
>-                Identifier uid = Identifier::fromUid(&encoder.vm(), symbol);
>-                impl = encoder.vm().propertyNames->lookUpPublicName(uid).string().impl();
>+                // We have special handling for well-known symbols.
>+                if (!symbol->isPrivate()) {
>+                    RELEASE_ASSERT(symbol->startsWith("Symbol."));
>+                    impl = makeString(String(symbol->substring(strlen("Symbol."))), "Symbol").impl();
>+                }
>             }
>         }
> 
>@@ -572,7 +576,7 @@ class CachedUniquedStringImpl : public VariableLengthObject<UniquedStringImpl> {
>                 return &SymbolImpl::createNullSymbol().leakRef();
> 
>             Identifier ident = Identifier::fromString(&decoder.vm(), buffer, m_length);
>-            String str = decoder.vm().propertyNames->lookUpPrivateName(ident)->string();
>+            String str = decoder.vm().propertyNames->lookUpPrivateName(ident);
>             StringImpl* impl = str.releaseImpl().get();
>             ASSERT(impl->isSymbol());
>             return static_cast<UniquedStringImpl*>(impl);
>diff --git a/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp b/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
>index 197370d110a75da60bdce44995bfe7c26a1893a2..a3c919b666ecef3b52f72a3f603f00cebffc0bd7 100644
>--- a/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
>+++ b/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
>@@ -41,6 +41,7 @@ CommonIdentifiers::CommonIdentifiers(VM* vm)
>     , useStrictIdentifier(Identifier::fromString(vm, "use strict"))
>     , timesIdentifier(Identifier::fromString(vm, "*"))
>     , m_builtinNames(new BuiltinNames(vm, this))
>+    JSC_PARSER_PRIVATE_NAMES(INITIALIZE_PRIVATE_NAME)
>     JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(INITIALIZE_KEYWORD)
>     JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PROPERTY_NAME)
>     JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL(INITIALIZE_SYMBOL)
>@@ -51,16 +52,11 @@ CommonIdentifiers::~CommonIdentifiers()
> {
> }
> 
>-const Identifier* CommonIdentifiers::lookUpPrivateName(const Identifier& ident) const
>+SymbolImpl* CommonIdentifiers::lookUpPrivateName(const Identifier& ident) const
> {
>     return m_builtinNames->lookUpPrivateName(ident);
> }
>     
>-Identifier CommonIdentifiers::lookUpPublicName(const Identifier& ident) const
>-{
>-    return m_builtinNames->lookUpPublicName(ident);
>-}
>-
> void CommonIdentifiers::appendExternalName(const Identifier& publicName, const Identifier& privateName)
> {
>     m_builtinNames->appendExternalName(publicName, privateName);
>diff --git a/Source/JavaScriptCore/runtime/CommonIdentifiers.h b/Source/JavaScriptCore/runtime/CommonIdentifiers.h
>index 80227f77a827d72c4f04d22de9a2225c3f95e389..42e23e908cdad5fb0d6926d54c56d5247737fbc9 100644
>--- a/Source/JavaScriptCore/runtime/CommonIdentifiers.h
>+++ b/Source/JavaScriptCore/runtime/CommonIdentifiers.h
>@@ -28,27 +28,19 @@
> #define JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(macro) \
>     macro(Array) \
>     macro(ArrayBuffer) \
>-    macro(ArrayIterator) \
>     macro(BYTES_PER_ELEMENT) \
>     macro(BigInt) \
>     macro(Boolean) \
>     macro(Collator) \
>-    macro(Credential) \
>     macro(Date) \
>     macro(DateTimeFormat) \
>-    macro(DataTransferItem) \
>-    macro(DataTransferItemList) \
>     macro(Error) \
>     macro(EvalError) \
>     macro(Function) \
>-    macro(GeneratorFunction) \
>     macro(Infinity) \
>     macro(Intl) \
>-    macro(JSON) \
>     macro(Loader) \
>-    macro(Map)\
>-    macro(MapIterator)\
>-    macro(Math) \
>+    macro(Map) \
>     macro(NaN) \
>     macro(Number) \
>     macro(NumberFormat) \
>@@ -60,15 +52,13 @@
>     macro(ReferenceError) \
>     macro(Reflect) \
>     macro(RegExp) \
>-    macro(Set)\
>-    macro(SetIterator)\
>+    macro(Set) \
>     macro(SharedArrayBuffer) \
>     macro(String) \
>     macro(Symbol) \
>     macro(SyntaxError) \
>     macro(TypeError) \
>     macro(URIError) \
>-    macro(UTC) \
>     macro(WeakMap)\
>     macro(WeakSet)\
>     macro(__defineGetter__) \
>@@ -80,7 +70,6 @@
>     macro(anonymous) \
>     macro(arguments) \
>     macro(as) \
>-    macro(assign) \
>     macro(async) \
>     macro(back) \
>     macro(bind) \
>@@ -121,7 +110,6 @@
>     macro(exec) \
>     macro(executionCount) \
>     macro(exitKind) \
>-    macro(fetch) \
>     macro(flags) \
>     macro(forEach) \
>     macro(formatMatcher) \
>@@ -140,7 +128,6 @@
>     macro(hour) \
>     macro(hourCycle) \
>     macro(hour12) \
>-    macro(href) \
>     macro(id) \
>     macro(ignoreCase) \
>     macro(ignorePunctuation) \
>@@ -184,7 +171,6 @@
>     macro(propertyIsEnumerable) \
>     macro(prototype) \
>     macro(raw) \
>-    macro(reload) \
>     macro(replace) \
>     macro(resolve) \
>     macro(second) \
>@@ -285,6 +271,16 @@
>     macro(toStringTag) \
>     macro(unscopables)
> 
>+#define JSC_PARSER_PRIVATE_NAMES(macro) \
>+    macro(generator) \
>+    macro(generatorState) \
>+    macro(generatorValue) \
>+    macro(generatorResumeMode) \
>+    macro(generatorFrame) \
>+    macro(meta) \
>+    macro(starDefault) \
>+    macro(undefined) \
>+
> namespace JSC {
>     
>     class BuiltinNames;
>@@ -308,6 +304,10 @@ namespace JSC {
>         std::unique_ptr<BuiltinNames> m_builtinNames;
> 
>     public:
>+
>+#define JSC_IDENTIFIER_DECLARE_PARSER_PRIVATE_NAME(name) const Identifier name##PrivateName;
>+        JSC_PARSER_PRIVATE_NAMES(JSC_IDENTIFIER_DECLARE_PARSER_PRIVATE_NAME)
>+#undef JSC_IDENTIFIER_DECLARE_PARSER_PRIVATE_NAME
>         
> #define JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL(name) const Identifier name##Keyword;
>         JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL)
>@@ -321,8 +321,7 @@ namespace JSC {
>         JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL(JSC_IDENTIFIER_DECLARE_PRIVATE_WELL_KNOWN_SYMBOL_GLOBAL)
> #undef JSC_IDENTIFIER_DECLARE_PRIVATE_WELL_KNOWN_SYMBOL_GLOBAL
> 
>-        const Identifier* lookUpPrivateName(const Identifier&) const;
>-        Identifier lookUpPublicName(const Identifier&) const;
>+        SymbolImpl* lookUpPrivateName(const Identifier&) const;
> 
>         // Callers of this method should make sure that identifiers given to this method 
>         // survive the lifetime of CommonIdentifiers and related VM.
>diff --git a/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp b/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp
>index 8a617b480f5bcf334eda8947f8eea1a4b64d1e5d..a37446e4d2762e4c24cbeab66dce191b54726491 100644
>--- a/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp
>+++ b/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp
>@@ -82,8 +82,7 @@ JSObject* createStackOverflowError(ExecState* exec, JSGlobalObject* globalObject
> JSObject* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
> {
>     if (ident.isPrivateName()) {
>-        VM& vm = exec->vm();
>-        String message(makeString("Can't find private variable: @", vm.propertyNames->lookUpPublicName(ident).string()));
>+        String message(makeString("Can't find private variable: PrivateSymbol.", ident.string()));
>         return createReferenceError(exec, message);
>     }
>     String message(makeString("Can't find variable: ", ident.string()));
>diff --git a/Source/JavaScriptCore/runtime/Identifier.cpp b/Source/JavaScriptCore/runtime/Identifier.cpp
>index f84b69e4d3d3f5df8b66ff76881efe495fdb242c..46f79c86ed6ec10db1a7437df317451f9e938ebb 100644
>--- a/Source/JavaScriptCore/runtime/Identifier.cpp
>+++ b/Source/JavaScriptCore/runtime/Identifier.cpp
>@@ -96,9 +96,14 @@ Identifier Identifier::from(VM* vm, double value)
> 
> void Identifier::dump(PrintStream& out) const
> {
>-    if (impl())
>+    if (impl()) {
>+        if (impl()->isSymbol()) {
>+            auto* symbol = static_cast<SymbolImpl*>(impl());
>+            if (symbol->isPrivate())
>+                out.print("PrivateSymbol.");
>+        }
>         out.print(impl());
>-    else
>+    } else
>         out.print("<null identifier>");
> }
> 
>diff --git a/Source/JavaScriptCore/runtime/Identifier.h b/Source/JavaScriptCore/runtime/Identifier.h
>index 54e84631d76def3215b29058ad0cf3cbd2bebb14..fa8d3421c41a2ed2c33100c22b4af6eb9ad1d316 100644
>--- a/Source/JavaScriptCore/runtime/Identifier.h
>+++ b/Source/JavaScriptCore/runtime/Identifier.h
>@@ -126,6 +126,7 @@ class Identifier {
>     static Identifier fromUid(VM*, UniquedStringImpl* uid);
>     static Identifier fromUid(ExecState*, UniquedStringImpl* uid);
>     static Identifier fromUid(const PrivateName&);
>+    static Identifier fromUid(SymbolImpl&);
> 
>     static Identifier createLCharFromUChar(VM* vm, const UChar* s, int length) { return Identifier(vm, add8(vm, s, length)); }
> 
>diff --git a/Source/JavaScriptCore/runtime/IdentifierInlines.h b/Source/JavaScriptCore/runtime/IdentifierInlines.h
>index 9b226a215de2b5cc2e53738c7fa76784dbe19e37..9964cc59c80861d9c2380ebab3e7e2cf1cf8ae09 100644
>--- a/Source/JavaScriptCore/runtime/IdentifierInlines.h
>+++ b/Source/JavaScriptCore/runtime/IdentifierInlines.h
>@@ -88,6 +88,11 @@ inline Identifier Identifier::fromUid(const PrivateName& name)
>     return name.uid();
> }
> 
>+inline Identifier Identifier::fromUid(SymbolImpl& symbol)
>+{
>+    return symbol;
>+}
>+
> template<unsigned charactersCount>
> inline Identifier Identifier::fromString(VM* vm, const char (&characters)[charactersCount])
> {
>diff --git a/Source/JavaScriptCore/tools/JSDollarVM.cpp b/Source/JavaScriptCore/tools/JSDollarVM.cpp
>index 6cc62ea6f333eda452268f4ee8d07b2fd332a82a..5a5a3cb8f300de284bcaa1b2381bb0b5e3e59d71 100644
>--- a/Source/JavaScriptCore/tools/JSDollarVM.cpp
>+++ b/Source/JavaScriptCore/tools/JSDollarVM.cpp
>@@ -1854,11 +1854,11 @@ static EncodedJSValue JSC_HOST_CALL functionGetPrivateProperty(ExecState* exec)
> 
>     String str = asString(exec->argument(1))->value(exec);
> 
>-    const Identifier* ident = vm.propertyNames->lookUpPrivateName(Identifier::fromString(exec, str));
>-    if (!ident)
>+    SymbolImpl* symbol = vm.propertyNames->lookUpPrivateName(Identifier::fromString(exec, str));
>+    if (!symbol)
>         return throwVMError(exec, scope, "Unknown private name.");
> 
>-    RELEASE_AND_RETURN(scope, JSValue::encode(exec->argument(0).get(exec, *ident)));
>+    RELEASE_AND_RETURN(scope, JSValue::encode(exec->argument(0).get(exec, symbol)));
> }
> 
> static EncodedJSValue JSC_HOST_CALL functionCreateRoot(ExecState* exec)

Actions: View | Formatted Diff | Diff

Attachments on bug 194277: 361158 | 361219 | 361238 | 361253 | 361261 | 361264 | 361266 | 361278 | 361282 | 361284