<!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>[260878] trunk/Source/JavaScriptCore</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/260878">260878</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-28 23:23:10 -0700 (Tue, 28 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/260876">r260876</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/260877">r260877</a>.
https://bugs.webkit.org/show_bug.cgi?id=211165

Broke build (Requested by yusukesuzuki on #webkit).

Reverted changesets:

"Unreviewed, build fix on watchOS"
https://bugs.webkit.org/show_bug.cgi?id=210978
https://trac.webkit.org/changeset/260876

"Unreviewed, speculative build fix on watchOS part 2"
https://bugs.webkit.org/show_bug.cgi?id=210978
https://trac.webkit.org/changeset/260877</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBigIntcpp">trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBigInth">trunk/Source/JavaScriptCore/runtime/JSBigInt.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (260877 => 260878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2020-04-29 06:14:38 UTC (rev 260877)
+++ trunk/Source/JavaScriptCore/ChangeLog       2020-04-29 06:23:10 UTC (rev 260878)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2020-04-28  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r260876 and r260877.
+        https://bugs.webkit.org/show_bug.cgi?id=211165
+
+        Broke build (Requested by yusukesuzuki on #webkit).
+
+        Reverted changesets:
+
+        "Unreviewed, build fix on watchOS"
+        https://bugs.webkit.org/show_bug.cgi?id=210978
+        https://trac.webkit.org/changeset/260876
+
+        "Unreviewed, speculative build fix on watchOS part 2"
+        https://bugs.webkit.org/show_bug.cgi?id=210978
+        https://trac.webkit.org/changeset/260877
+
</ins><span class="cx"> 2020-04-28  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, speculative build fix on watchOS part 2
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBigIntcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp (260877 => 260878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp 2020-04-29 06:14:38 UTC (rev 260877)
+++ trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp    2020-04-29 06:23:10 UTC (rev 260878)
</span><span class="lines">@@ -228,11 +228,11 @@
</span><span class="cx">     // First, build the MSD by shifting the mantissa appropriately.
</span><span class="cx">     if (msdTopBit < mantissaTopBit) {
</span><span class="cx">         remainingMantissaBits = mantissaTopBit - msdTopBit;
</span><del>-        digit = static_cast<Digit>(mantissa >> remainingMantissaBits);
</del><ins>+        digit = mantissa >> remainingMantissaBits;
</ins><span class="cx">         mantissa = mantissa << (64 - remainingMantissaBits);
</span><span class="cx">     } else {
</span><span class="cx">         ASSERT(msdTopBit >= mantissaTopBit);
</span><del>-        digit = static_cast<Digit>(mantissa << (msdTopBit - mantissaTopBit));
</del><ins>+        digit = mantissa << (msdTopBit - mantissaTopBit);
</ins><span class="cx">         mantissa = 0;
</span><span class="cx">     }
</span><span class="cx">     result->setDigit(digits - 1, digit);
</span><span class="lines">@@ -318,7 +318,6 @@
</span><span class="cx">     JSBigInt* m_bigInt;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-#if USE(BIGINT32)
</del><span class="cx"> class Int32BigIntImpl {
</span><span class="cx"> public:
</span><span class="cx">     explicit Int32BigIntImpl(int32_t value)
</span><span class="lines">@@ -332,7 +331,6 @@
</span><span class="cx">     {
</span><span class="cx">         ASSERT(length());
</span><span class="cx">         ASSERT_UNUSED(i, i == 0);
</span><del>-        static_assert(sizeof(Digit) == sizeof(uint64_t), "INT32_MAX can be represented with length() == 1 only when Digit is 64bit");
</del><span class="cx">         if (sign())
</span><span class="cx">             return -static_cast<int64_t>(m_value);
</span><span class="cx">         return m_value;
</span><span class="lines">@@ -344,7 +342,6 @@
</span><span class="cx">     friend struct JSBigInt::ImplResult;
</span><span class="cx">     int32_t m_value;
</span><span class="cx"> };
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> ALWAYS_INLINE JSBigInt::ImplResult::ImplResult(HeapBigIntImpl& heapImpl)
</span><span class="cx">     : payload(heapImpl.m_bigInt)
</span><span class="lines">@@ -1361,7 +1358,6 @@
</span><span class="cx"> {
</span><span class="cx">     return compareImpl(HeapBigIntImpl { x }, HeapBigIntImpl { y });
</span><span class="cx"> }
</span><del>-#if USE(BIGINT32)
</del><span class="cx"> JSBigInt::ComparisonResult JSBigInt::compare(int32_t x, JSBigInt* y)
</span><span class="cx"> {
</span><span class="cx">     return compareImpl(Int32BigIntImpl { x }, HeapBigIntImpl { y });
</span><span class="lines">@@ -1370,7 +1366,6 @@
</span><span class="cx"> {
</span><span class="cx">     return compareImpl(HeapBigIntImpl { x }, Int32BigIntImpl { y });
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> template <typename BigIntImpl1, typename BigIntImpl2>
</span><span class="cx"> JSBigInt::ImplResult JSBigInt::absoluteAdd(JSGlobalObject* globalObject, BigIntImpl1 x, BigIntImpl2 y, bool resultSign)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBigInth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSBigInt.h (260877 => 260878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBigInt.h   2020-04-29 06:14:38 UTC (rev 260877)
+++ trunk/Source/JavaScriptCore/runtime/JSBigInt.h      2020-04-29 06:23:10 UTC (rev 260878)
</span><span class="lines">@@ -138,7 +138,6 @@
</span><span class="cx">     bool equalsToNumber(JSValue);
</span><span class="cx">     JS_EXPORT_PRIVATE bool equalsToInt32(int32_t);
</span><span class="cx">     static ComparisonResult compare(JSBigInt* x, JSBigInt* y);
</span><del>-#if USE(BIGINT32)
</del><span class="cx">     static ComparisonResult compare(int32_t x, JSBigInt* y);
</span><span class="cx">     static ComparisonResult compare(JSBigInt* x, int32_t y);
</span><span class="cx">     static ComparisonResult compare(int32_t x, int32_t y)
</span><span class="lines">@@ -149,7 +148,6 @@
</span><span class="cx">             return JSBigInt::ComparisonResult::LessThan;
</span><span class="cx">         return JSBigInt::ComparisonResult::GreaterThan;
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     bool getPrimitiveNumber(JSGlobalObject*, double& number, JSValue& result) const;
</span><span class="cx">     double toNumber(JSGlobalObject*) const;
</span></span></pre>
</div>
</div>

</body>
</html>