Changeset 275569 in webkit

Timestamp:

Apr 6, 2021 4:28:53 PM (3 years ago)

Author:

Alexey Shvayka

Message:

Symbol and BigInt wrapper objects should perform OrdinaryToPrimitive
​https://bugs.webkit.org/show_bug.cgi?id=224208

Reviewed by Yusuke Suzuki.

JSTests:

• stress/bigint-object-ordinary-toprimitive.js: Added.
• stress/symbol-object-ordinary-toprimitive.js: Added.

Source/JavaScriptCore:

ES6 introduced Symbol.toPrimitive as the only way to override ToPrimitive;
if it's nullish, OrdinaryToPrimitive [1] is performed unconditionally.

This patch removes two redundant defaultValue() overrides, fixing JSC to call
(possibly userland) toString() / valueOf() methods of a) Symbol objects whose
Symbol.toPrimitive was removed, and b) BigInt wrapper objects.

Aligns JSC with V8 and SpiderMonkey. Coercion of primitives is unaffected.
Also, removes dummy BigIntObject::internalValue() override.

[1]: ​https://tc39.es/ecma262/#sec-toprimitive (step 2.d)

• runtime/BigIntObject.cpp:

(JSC::BigIntObject::defaultValue): Deleted.

• runtime/BigIntObject.h:
• runtime/SymbolObject.cpp:

(JSC::SymbolObject::defaultValue): Deleted.

• runtime/SymbolObject.h:

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/bigint-object-ordinary-toprimitive.js (added)
• JSTests/stress/symbol-object-ordinary-toprimitive.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/BigIntObject.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/BigIntObject.h (modified) (1 diff)
• Source/JavaScriptCore/runtime/SymbolObject.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/SymbolObject.h (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-04-06  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        Symbol and BigInt wrapper objects should perform OrdinaryToPrimitive
+        https://bugs.webkit.org/show_bug.cgi?id=224208
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/bigint-object-ordinary-toprimitive.js: Added.
+        * stress/symbol-object-ordinary-toprimitive.js: Added.
+
 2021-04-06  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-04-06  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        Symbol and BigInt wrapper objects should perform OrdinaryToPrimitive
+        https://bugs.webkit.org/show_bug.cgi?id=224208
+
+        Reviewed by Yusuke Suzuki.
+
+        ES6 introduced Symbol.toPrimitive as the only way to override ToPrimitive;
+        if it's nullish, OrdinaryToPrimitive [1] is performed unconditionally.
+
+        This patch removes two redundant defaultValue() overrides, fixing JSC to call
+        (possibly userland) toString() / valueOf() methods of a) Symbol objects whose
+        Symbol.toPrimitive was removed, and b) BigInt wrapper objects.
+
+        Aligns JSC with V8 and SpiderMonkey. Coercion of primitives is unaffected.
+        Also, removes dummy BigIntObject::internalValue() override.
+
+        [1]: https://tc39.es/ecma262/#sec-toprimitive (step 2.d)
+
+        * runtime/BigIntObject.cpp:
+        (JSC::BigIntObject::defaultValue): Deleted.
+        * runtime/BigIntObject.h:
+        * runtime/SymbolObject.cpp:
+        (JSC::SymbolObject::defaultValue): Deleted.
+        * runtime/SymbolObject.h:
+
 2021-04-06  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/JavaScriptCore/runtime/BigIntObject.cpp

@@ -57 +57 @@
 }
 
-JSValue BigIntObject::defaultValue(const JSObject* object, JSGlobalObject*, PreferredPrimitiveType)
-{
-    const BigIntObject* bigIntObject = jsCast<const BigIntObject*>(object);
-    return bigIntObject->internalValue();
-}
-
 } // namespace JSC

trunk/Source/JavaScriptCore/runtime/BigIntObject.h

@@ -45 +45 @@
     DECLARE_EXPORT_INFO;
 
-    JSValue internalValue() const { return JSWrapperObject::internalValue(); }
-
     static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
     {
         return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
     }
-
-    static JSValue defaultValue(const JSObject*, JSGlobalObject*, PreferredPrimitiveType);
 
 private:

trunk/Source/JavaScriptCore/runtime/SymbolObject.cpp

@@ -48 +48 @@
 }
 
-JSValue SymbolObject::defaultValue(const JSObject* object, JSGlobalObject*, PreferredPrimitiveType)
-{
-    const SymbolObject* symbolObject = jsCast<const SymbolObject*>(object);
-    return symbolObject->internalValue();
-}
-
 } // namespace JSC

trunk/Source/JavaScriptCore/runtime/SymbolObject.h

@@ -61 +61 @@
     }
 
-    static JSValue defaultValue(const JSObject*, JSGlobalObject*, PreferredPrimitiveType);
-
 private:
     JS_EXPORT_PRIVATE void finishCreation(VM&, Symbol*);