<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285317] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285317">285317</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-11-04 15:55:12 -0700 (Thu, 04 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>We need to PreferNumber when calling toPrimitive for coercion to BigInt
https://bugs.webkit.org/show_bug.cgi?id=232720

Patch by Alexey Shvayka <ashvayka@apple.com> on 2021-11-04
Reviewed by Saam Barati.

JSTests:

* stress/big-int-constructor.js:
* stress/bigint-asintn.js:
* stress/bigint-asuintn.js:

Source/JavaScriptCore:

The difference between "default" and "number" hints is observable only via
Symbol.toPrimitive method.

This patch aligns hints in ToBigInt [1] and BigInt constructor [2] with the
spec, V8, and SpiderMonkey.

[1]: https://tc39.es/ecma262/#sec-tobigint (step 1)
[2]: https://tc39.es/ecma262/#sec-bigint-constructor-number-value (step 2)

* runtime/BigIntConstructor.cpp:
(JSC::JSC_DEFINE_HOST_FUNCTION):
* runtime/JSCJSValue.cpp:
(JSC::JSValue::toBigInt const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsstressbigintconstructorjs">trunk/JSTests/stress/big-int-constructor.js</a></li>
<li><a href="#trunkJSTestsstressbigintasintnjs">trunk/JSTests/stress/bigint-asintn.js</a></li>
<li><a href="#trunkJSTestsstressbigintasuintnjs">trunk/JSTests/stress/bigint-asuintn.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeBigIntConstructorcpp">trunk/Source/JavaScriptCore/runtime/BigIntConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValuecpp">trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (285316 => 285317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2021-11-04 21:58:31 UTC (rev 285316)
+++ trunk/JSTests/ChangeLog     2021-11-04 22:55:12 UTC (rev 285317)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-11-04  Alexey Shvayka  <ashvayka@apple.com>
+
+        We need to PreferNumber when calling toPrimitive for coercion to BigInt
+        https://bugs.webkit.org/show_bug.cgi?id=232720
+
+        Reviewed by Saam Barati.
+
+        * stress/big-int-constructor.js:
+        * stress/bigint-asintn.js:
+        * stress/bigint-asuintn.js:
+
</ins><span class="cx"> 2021-11-04  Mikhail R. Gadelha  <mikhail@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unskip tests disabled because of the recent 32 bits issues
</span></span></pre></div>
<a id="trunkJSTestsstressbigintconstructorjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/big-int-constructor.js (285316 => 285317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/big-int-constructor.js      2021-11-04 21:58:31 UTC (rev 285316)
+++ trunk/JSTests/stress/big-int-constructor.js 2021-11-04 22:55:12 UTC (rev 285317)
</span><span class="lines">@@ -226,6 +226,16 @@
</span><span class="cx"> n = BigInt(o);
</span><span class="cx"> assert(n.toString() === "3256");
</span><span class="cx"> 
</span><ins>+o = {
+    [Symbol.toPrimitive](hint) {
+        this.toPrimitiveHint = hint;
+        return 42;
+    }
+}
+
+n = BigInt(o);
+assert(o.toPrimitiveHint === "number");
+
</ins><span class="cx"> // Assertion thows
</span><span class="cx"> 
</span><span class="cx"> assertThrowSyntaxError("aba");
</span></span></pre></div>
<a id="trunkJSTestsstressbigintasintnjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/bigint-asintn.js (285316 => 285317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/bigint-asintn.js    2021-11-04 21:58:31 UTC (rev 285316)
+++ trunk/JSTests/stress/bigint-asintn.js       2021-11-04 22:55:12 UTC (rev 285317)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx">     let toIndex = false;
</span><span class="cx">     let toBigInt = false;
</span><span class="cx">     let index = {
</span><del>-        [Symbol.toPrimitive]() {
</del><ins>+        [Symbol.toPrimitive](hint) {
+            shouldBe(hint, "number");
</ins><span class="cx">             shouldBe(toIndex, false);
</span><span class="cx">             shouldBe(toBigInt, false);
</span><span class="cx">             toIndex = true;
</span><span class="lines">@@ -34,7 +35,8 @@
</span><span class="cx">         }
</span><span class="cx">     };
</span><span class="cx">     let bigint = {
</span><del>-        [Symbol.toPrimitive]() {
</del><ins>+        [Symbol.toPrimitive](hint) {
+            shouldBe(hint, "number");
</ins><span class="cx">             shouldBe(toIndex, true);
</span><span class="cx">             shouldBe(toBigInt, false);
</span><span class="cx">             toBigInt = true;
</span></span></pre></div>
<a id="trunkJSTestsstressbigintasuintnjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/bigint-asuintn.js (285316 => 285317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/bigint-asuintn.js   2021-11-04 21:58:31 UTC (rev 285316)
+++ trunk/JSTests/stress/bigint-asuintn.js      2021-11-04 22:55:12 UTC (rev 285317)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx">     let toIndex = false;
</span><span class="cx">     let toBigInt = false;
</span><span class="cx">     let index = {
</span><del>-        [Symbol.toPrimitive]() {
</del><ins>+        [Symbol.toPrimitive](hint) {
+            shouldBe(hint, "number");
</ins><span class="cx">             shouldBe(toIndex, false);
</span><span class="cx">             shouldBe(toBigInt, false);
</span><span class="cx">             toIndex = true;
</span><span class="lines">@@ -34,7 +35,8 @@
</span><span class="cx">         }
</span><span class="cx">     };
</span><span class="cx">     let bigint = {
</span><del>-        [Symbol.toPrimitive]() {
</del><ins>+        [Symbol.toPrimitive](hint) {
+            shouldBe(hint, "number");
</ins><span class="cx">             shouldBe(toIndex, true);
</span><span class="cx">             shouldBe(toBigInt, false);
</span><span class="cx">             toBigInt = true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (285316 => 285317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-11-04 21:58:31 UTC (rev 285316)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-11-04 22:55:12 UTC (rev 285317)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-11-04  Alexey Shvayka  <ashvayka@apple.com>
+
+        We need to PreferNumber when calling toPrimitive for coercion to BigInt
+        https://bugs.webkit.org/show_bug.cgi?id=232720
+
+        Reviewed by Saam Barati.
+
+        The difference between "default" and "number" hints is observable only via
+        Symbol.toPrimitive method.
+
+        This patch aligns hints in ToBigInt [1] and BigInt constructor [2] with the
+        spec, V8, and SpiderMonkey.
+
+        [1]: https://tc39.es/ecma262/#sec-tobigint (step 1)
+        [2]: https://tc39.es/ecma262/#sec-bigint-constructor-number-value (step 2)
+
+        * runtime/BigIntConstructor.cpp:
+        (JSC::JSC_DEFINE_HOST_FUNCTION):
+        * runtime/JSCJSValue.cpp:
+        (JSC::JSValue::toBigInt const):
+
</ins><span class="cx"> 2021-11-03  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Clean up StructureStubInfo initialization
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeBigIntConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/BigIntConstructor.cpp (285316 => 285317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/BigIntConstructor.cpp        2021-11-04 21:58:31 UTC (rev 285316)
+++ trunk/Source/JavaScriptCore/runtime/BigIntConstructor.cpp   2021-11-04 22:55:12 UTC (rev 285317)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">     auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">     
</span><span class="cx">     JSValue value = callFrame->argument(0);
</span><del>-    JSValue primitive = value.toPrimitive(globalObject);
</del><ins>+    JSValue primitive = value.toPrimitive(globalObject, PreferNumber);
</ins><span class="cx">     RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> 
</span><span class="cx">     if (primitive.isInt32()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCJSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp (285316 => 285317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp       2021-11-04 21:58:31 UTC (rev 285316)
+++ trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp  2021-11-04 22:55:12 UTC (rev 285317)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">     VM& vm = globalObject->vm();
</span><span class="cx">     auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> 
</span><del>-    JSValue primitive = toPrimitive(globalObject);
</del><ins>+    JSValue primitive = toPrimitive(globalObject, PreferNumber);
</ins><span class="cx">     RETURN_IF_EXCEPTION(scope, { });
</span><span class="cx"> 
</span><span class="cx">     if (primitive.isBigInt())
</span></span></pre>
</div>
</div>

</body>
</html>