Changeset 260312 in webkit

Timestamp:

Apr 18, 2020 9:01:02 AM (4 years ago)

Author:

Alexey Shvayka

Message:

RegExp.prototype[@@search] should use SameValue
​https://bugs.webkit.org/show_bug.cgi?id=173226

Reviewed by Yusuke Suzuki.

JSTests:

• stress/same-value-intrinsic.js: Added.
• test262/expectations.yaml: Mark 4 test cases as passing.

Source/JavaScriptCore:

This change exposes Object.is implementation as link-time-constant @sameValue and utilizes
it in RegExp.prototype[@@search] per spec [1], aligning JSC with V8 and SpiderMonkey.

[1]: ​https://tc39.es/ecma262/#sec-regexp.prototype-@@search (steps 5, 8)

• builtins/BuiltinNames.h:
• builtins/RegExpPrototype.js:

(Symbol.search):

• bytecode/LinkTimeConstant.h:
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):

• runtime/ObjectConstructor.cpp:
• runtime/ObjectConstructor.h:

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/same-value-intrinsic.js (added)
• JSTests/test262/expectations.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/builtins/BuiltinNames.h (modified) (1 diff)
• Source/JavaScriptCore/builtins/RegExpPrototype.js (modified) (2 diffs)
• Source/JavaScriptCore/bytecode/LinkTimeConstant.h (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSGlobalObject.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/ObjectConstructor.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/ObjectConstructor.h (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-04-18  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        RegExp.prototype[@@search] should use SameValue
+        https://bugs.webkit.org/show_bug.cgi?id=173226
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/same-value-intrinsic.js: Added.
+        * test262/expectations.yaml: Mark 4 test cases as passing.
+
 2020-04-17  Saam Barati  <sbarati@apple.com>
 

trunk/JSTests/test262/expectations.yaml

@@ -1658 +1658 @@
   default: 'Test262Error: Expected SameValue(«�», «null») to be true'
   strict mode: 'Test262Error: Expected SameValue(«�», «null») to be true'
-test/built-ins/RegExp/prototype/Symbol.search/set-lastindex-init-samevalue.js:
-  default: 'Test262Error: Expected SameValue(«-0», «0») to be true'
-  strict mode: 'Test262Error: Expected SameValue(«-0», «0») to be true'
-test/built-ins/RegExp/prototype/Symbol.search/set-lastindex-restore-samevalue.js:
-  default: 'Test262Error: Expected SameValue(«-0», «0») to be true'
-  strict mode: 'Test262Error: Expected SameValue(«-0», «0») to be true'
 test/built-ins/RegExp/prototype/Symbol.search/u-lastindex-advance.js:
   default: 'Test262Error: Expected SameValue(«1», «-1») to be true'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-04-18  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        RegExp.prototype[@@search] should use SameValue
+        https://bugs.webkit.org/show_bug.cgi?id=173226
+
+        Reviewed by Yusuke Suzuki.
+
+        This change exposes Object.is implementation as link-time-constant @sameValue and utilizes
+        it in RegExp.prototype[@@search] per spec [1], aligning JSC with V8 and SpiderMonkey.
+
+        [1]: https://tc39.es/ecma262/#sec-regexp.prototype-@@search (steps 5, 8)
+
+        * builtins/BuiltinNames.h:
+        * builtins/RegExpPrototype.js:
+        (Symbol.search):
+        * bytecode/LinkTimeConstant.h:
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::init):
+        * runtime/ObjectConstructor.cpp:
+        * runtime/ObjectConstructor.h:
+
 2020-04-18  Angelos Oikonomopoulos  <angelos@igalia.com>
 

trunk/Source/JavaScriptCore/builtins/BuiltinNames.h

@@ -123 +123 @@
     macro(isArraySlow) \
     macro(isConstructor) \
+    macro(sameValue) \
     macro(concatMemcpy) \
     macro(appendMemcpy) \

trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js

@@ -404 +404 @@
     var previousLastIndex = regexp.lastIndex;
 
-    // 5.If SameValue(previousLastIndex, 0) is false, then
+    // 5. If SameValue(previousLastIndex, 0) is false, then
     // 5.a. Perform ? Set(rx, "lastIndex", 0, true).
-    // FIXME: Add SameValue support. https://bugs.webkit.org/show_bug.cgi?id=173226
-    if (previousLastIndex !== 0)
+    if (!@sameValue(previousLastIndex, 0))
         regexp.lastIndex = 0;
 
@@ -416 +415 @@
     // 8. If SameValue(currentLastIndex, previousLastIndex) is false, then
     // 8.a. Perform ? Set(rx, "lastIndex", previousLastIndex, true).
-    // FIXME: Add SameValue support. https://bugs.webkit.org/show_bug.cgi?id=173226
-    if (regexp.lastIndex !== previousLastIndex)
+    if (!@sameValue(regexp.lastIndex, previousLastIndex))
         regexp.lastIndex = previousLastIndex;
 

trunk/Source/JavaScriptCore/bytecode/LinkTimeConstant.h

@@ -75 +75 @@
     v(thisTimeValue, nullptr) \
     v(isConstructor, nullptr) \
+    v(sameValue, nullptr) \
     v(regExpProtoFlagsGetter, nullptr) \
     v(regExpProtoGlobalGetter, nullptr) \

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -1136 +1136 @@
             init.set(JSFunction::create(init.vm, jsCast<JSGlobalObject*>(init.owner), 1, String(), esSpecIsConstructor, NoIntrinsic));
         });
+    m_linkTimeConstants[static_cast<unsigned>(LinkTimeConstant::sameValue)].initLater([] (const Initializer<JSCell>& init) {
+            init.set(JSFunction::create(init.vm, jsCast<JSGlobalObject*>(init.owner), 2, String(), objectConstructorIs, ObjectIsIntrinsic));
+        });
 
     // RegExp.prototype helpers.

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

@@ -55 +55 @@
 EncodedJSValue JSC_HOST_CALL objectConstructorIsFrozen(JSGlobalObject*, CallFrame*);
 EncodedJSValue JSC_HOST_CALL objectConstructorIsExtensible(JSGlobalObject*, CallFrame*);
-EncodedJSValue JSC_HOST_CALL objectConstructorIs(JSGlobalObject*, CallFrame*);
 
 }

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h

@@ -126 +126 @@
 bool toPropertyDescriptor(JSGlobalObject*, JSValue, PropertyDescriptor&);
 
+EncodedJSValue JSC_HOST_CALL objectConstructorIs(JSGlobalObject*, CallFrame*);
+
 } // namespace JSC