Changeset 205335 in webkit

Timestamp:

Sep 1, 2016 8:42:09 PM (8 years ago)

Author:

Yusuke Suzuki

Message:

Add toJS for JSC::PrivateName
​https://bugs.webkit.org/show_bug.cgi?id=161522

Reviewed by Ryosuke Niwa.

Source/JavaScriptCore:

Add the export annotation.
And we perform refactoring RefPtr<SymbolImpl> => Ref<SymbolImpl> for PrivateName,
since PrivateName never holds null SymbolImpl pointer. And along with this change,
we changed SymbolImpl* to SymbolImpl& in PrivateName::uid() callers.

• runtime/Completion.cpp:

(JSC::createSymbolForEntryPointModule):

• runtime/IdentifierInlines.h:

(JSC::Identifier::fromUid):

• runtime/JSFunction.cpp:

(JSC::JSFunction::setFunctionName):

• runtime/PrivateName.h:

(JSC::PrivateName::PrivateName):
(JSC::PrivateName::uid): Ugly const_cast. But const annotation is meaningless for SymbolImpl.
StringImpl should be observed as an immutable object. (Of course, its hash members etc. are mutable.
But most of the users (One of the exceptions is the concurrent JIT compiling thread!) should not care about this.)
(JSC::PrivateName::operator==):
(JSC::PrivateName::operator!=):

• runtime/PropertyName.h:

(JSC::PropertyName::PropertyName):

• runtime/Symbol.cpp:

(JSC::Symbol::finishCreation):

• runtime/Symbol.h:
• runtime/SymbolConstructor.cpp:

(JSC::symbolConstructorKeyFor):

Source/WebCore:

JSC::PrivateName is the wrapper to create and hold the ES6 Symbol instance.
This patch adds toJS support for JSC::PrivateName.
Later, the module integration patch will use this feature to call
DeferredWrapper::{resolve,reject} with JSC::PrivateName.

• bindings/js/JSDOMBinding.h:

(WebCore::toJS):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/Completion.cpp (modified) (1 diff)
• JavaScriptCore/runtime/IdentifierInlines.h (modified) (1 diff)
• JavaScriptCore/runtime/JSFunction.cpp (modified) (1 diff)
• JavaScriptCore/runtime/PrivateName.h (modified) (2 diffs)
• JavaScriptCore/runtime/PropertyName.h (modified) (1 diff)
• JavaScriptCore/runtime/Symbol.cpp (modified) (1 diff)
• JavaScriptCore/runtime/Symbol.h (modified) (1 diff)
• JavaScriptCore/runtime/SymbolConstructor.cpp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMBinding.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-01  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Add toJS for JSC::PrivateName
+        https://bugs.webkit.org/show_bug.cgi?id=161522
+
+        Reviewed by Ryosuke Niwa.
+
+        Add the export annotation.
+        And we perform refactoring RefPtr<SymbolImpl> => Ref<SymbolImpl> for PrivateName,
+        since PrivateName never holds null SymbolImpl pointer. And along with this change,
+        we changed SymbolImpl* to SymbolImpl& in PrivateName::uid() callers.
+
+        * runtime/Completion.cpp:
+        (JSC::createSymbolForEntryPointModule):
+        * runtime/IdentifierInlines.h:
+        (JSC::Identifier::fromUid):
+        * runtime/JSFunction.cpp:
+        (JSC::JSFunction::setFunctionName):
+        * runtime/PrivateName.h:
+        (JSC::PrivateName::PrivateName):
+        (JSC::PrivateName::uid): Ugly const_cast. But const annotation is meaningless for SymbolImpl.
+        StringImpl should be observed as an immutable object. (Of course, its hash members etc. are mutable.
+        But most of the users (One of the exceptions is the concurrent JIT compiling thread!) should not care about this.)
+        (JSC::PrivateName::operator==):
+        (JSC::PrivateName::operator!=):
+        * runtime/PropertyName.h:
+        (JSC::PropertyName::PropertyName):
+        * runtime/Symbol.cpp:
+        (JSC::Symbol::finishCreation):
+        * runtime/Symbol.h:
+        * runtime/SymbolConstructor.cpp:
+        (JSC::symbolConstructorKeyFor):
+
 2016-09-01  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Completion.cpp

@@ -143 +143 @@
     // Generate the unique key for the source-provided module.
     PrivateName privateName(PrivateName::Description, "EntryPointModule");
-    return Symbol::create(vm, *privateName.uid());
+    return Symbol::create(vm, privateName.uid());
 }
 

trunk/Source/JavaScriptCore/runtime/IdentifierInlines.h

@@ -86 +86 @@
 inline Identifier Identifier::fromUid(const PrivateName& name)
 {
-    return *name.uid();
+    return name.uid();
 }
 

trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

@@ -600 +600 @@
     String name;
     if (value.isSymbol()) {
-        SymbolImpl* uid = asSymbol(value)->privateName().uid();
-        if (uid->isNullSymbol())
+        SymbolImpl& uid = asSymbol(value)->privateName().uid();
+        if (uid.isNullSymbol())
             name = emptyString();
         else
-            name = makeString('[', String(uid), ']');
+            name = makeString('[', String(&uid), ']');
     } else {
         VM& vm = exec->vm();

trunk/Source/JavaScriptCore/runtime/PrivateName.h

@@ -39 +39 @@
 
     explicit PrivateName(SymbolImpl& uid)
-        : m_uid(&uid)
+        : m_uid(uid)
     {
     }
@@ -49 +49 @@
     }
 
-    SymbolImpl* uid() const { return m_uid.get(); }
+    SymbolImpl& uid() const { return const_cast<SymbolImpl&>(m_uid.get()); }
 
-    bool operator==(const PrivateName& other) const { return uid() == other.uid(); }
-    bool operator!=(const PrivateName& other) const { return uid() != other.uid(); }
+    bool operator==(const PrivateName& other) const { return &uid() == &other.uid(); }
+    bool operator!=(const PrivateName& other) const { return &uid() != &other.uid(); }
 
 private:
-    RefPtr<SymbolImpl> m_uid;
+    Ref<SymbolImpl> m_uid;
 };
 

trunk/Source/JavaScriptCore/runtime/PropertyName.h

@@ -46 +46 @@
 
     PropertyName(const PrivateName& propertyName)
-        : m_impl(propertyName.uid())
+        : m_impl(&propertyName.uid())
     {
         ASSERT(m_impl);

trunk/Source/JavaScriptCore/runtime/Symbol.cpp

@@ -59 +59 @@
     ASSERT(inherits(info()));
 
-    vm.symbolImplToSymbolMap.set(m_privateName.uid(), this);
+    vm.symbolImplToSymbolMap.set(&m_privateName.uid(), this);
 }
 

trunk/Source/JavaScriptCore/runtime/Symbol.h

@@ -50 +50 @@
     static Symbol* create(VM&);
     static Symbol* create(ExecState*, JSString* description);
-    static Symbol* create(VM&, SymbolImpl& uid);
+    JS_EXPORT_PRIVATE static Symbol* create(VM&, SymbolImpl& uid);
 
     const PrivateName& privateName() const { return m_privateName; }

trunk/Source/JavaScriptCore/runtime/SymbolConstructor.cpp

@@ -118 +118 @@
         return JSValue::encode(throwTypeError(exec, scope, SymbolKeyForTypeError));
 
-    SymbolImpl* uid = asSymbol(symbolValue)->privateName().uid();
-    if (!uid->symbolRegistry())
+    SymbolImpl& uid = asSymbol(symbolValue)->privateName().uid();
+    if (!uid.symbolRegistry())
         return JSValue::encode(jsUndefined());
 
-    ASSERT(uid->symbolRegistry() == &vm.symbolRegistry());
-    return JSValue::encode(jsString(exec, vm.symbolRegistry().keyForSymbol(*uid)));
+    ASSERT(uid.symbolRegistry() == &vm.symbolRegistry());
+    return JSValue::encode(jsString(exec, vm.symbolRegistry().keyForSymbol(uid)));
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-01  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Add toJS for JSC::PrivateName
+        https://bugs.webkit.org/show_bug.cgi?id=161522
+
+        Reviewed by Ryosuke Niwa.
+
+        JSC::PrivateName is the wrapper to create and hold the ES6 Symbol instance.
+        This patch adds toJS support for JSC::PrivateName.
+        Later, the module integration patch will use this feature to call
+        DeferredWrapper::{resolve,reject} with JSC::PrivateName.
+
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::toJS):
+
 2016-09-01  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -265 +265 @@
 template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const Vector<RefPtr<T>>&);
 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const String&);
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const JSC::PrivateName&);
 
 JSC::JSValue toJSIterator(JSC::ExecState&, JSDOMGlobalObject&, JSC::JSValue);
@@ -577 +578 @@
 }
 
+inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject*, const JSC::PrivateName& privateName)
+{
+    return JSC::Symbol::create(exec->vm(), privateName.uid());
+}
+
 inline JSC::JSValue toJSIterator(JSC::ExecState& state, JSDOMGlobalObject&, JSC::JSValue value)
 {