Title: [260878] trunk/Source/_javascript_Core
- Revision
- 260878
- Author
- [email protected]
- Date
- 2020-04-28 23:23:10 -0700 (Tue, 28 Apr 2020)
Log Message
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
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (260877 => 260878)
--- trunk/Source/_javascript_Core/ChangeLog 2020-04-29 06:14:38 UTC (rev 260877)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-04-29 06:23:10 UTC (rev 260878)
@@ -1,3 +1,20 @@
+2020-04-28 Commit Queue <[email protected]>
+
+ 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
+
2020-04-28 Yusuke Suzuki <[email protected]>
Unreviewed, speculative build fix on watchOS part 2
Modified: trunk/Source/_javascript_Core/runtime/JSBigInt.cpp (260877 => 260878)
--- trunk/Source/_javascript_Core/runtime/JSBigInt.cpp 2020-04-29 06:14:38 UTC (rev 260877)
+++ trunk/Source/_javascript_Core/runtime/JSBigInt.cpp 2020-04-29 06:23:10 UTC (rev 260878)
@@ -228,11 +228,11 @@
// First, build the MSD by shifting the mantissa appropriately.
if (msdTopBit < mantissaTopBit) {
remainingMantissaBits = mantissaTopBit - msdTopBit;
- digit = static_cast<Digit>(mantissa >> remainingMantissaBits);
+ digit = mantissa >> remainingMantissaBits;
mantissa = mantissa << (64 - remainingMantissaBits);
} else {
ASSERT(msdTopBit >= mantissaTopBit);
- digit = static_cast<Digit>(mantissa << (msdTopBit - mantissaTopBit));
+ digit = mantissa << (msdTopBit - mantissaTopBit);
mantissa = 0;
}
result->setDigit(digits - 1, digit);
@@ -318,7 +318,6 @@
JSBigInt* m_bigInt;
};
-#if USE(BIGINT32)
class Int32BigIntImpl {
public:
explicit Int32BigIntImpl(int32_t value)
@@ -332,7 +331,6 @@
{
ASSERT(length());
ASSERT_UNUSED(i, i == 0);
- static_assert(sizeof(Digit) == sizeof(uint64_t), "INT32_MAX can be represented with length() == 1 only when Digit is 64bit");
if (sign())
return -static_cast<int64_t>(m_value);
return m_value;
@@ -344,7 +342,6 @@
friend struct JSBigInt::ImplResult;
int32_t m_value;
};
-#endif
ALWAYS_INLINE JSBigInt::ImplResult::ImplResult(HeapBigIntImpl& heapImpl)
: payload(heapImpl.m_bigInt)
@@ -1361,7 +1358,6 @@
{
return compareImpl(HeapBigIntImpl { x }, HeapBigIntImpl { y });
}
-#if USE(BIGINT32)
JSBigInt::ComparisonResult JSBigInt::compare(int32_t x, JSBigInt* y)
{
return compareImpl(Int32BigIntImpl { x }, HeapBigIntImpl { y });
@@ -1370,7 +1366,6 @@
{
return compareImpl(HeapBigIntImpl { x }, Int32BigIntImpl { y });
}
-#endif
template <typename BigIntImpl1, typename BigIntImpl2>
JSBigInt::ImplResult JSBigInt::absoluteAdd(JSGlobalObject* globalObject, BigIntImpl1 x, BigIntImpl2 y, bool resultSign)
Modified: trunk/Source/_javascript_Core/runtime/JSBigInt.h (260877 => 260878)
--- trunk/Source/_javascript_Core/runtime/JSBigInt.h 2020-04-29 06:14:38 UTC (rev 260877)
+++ trunk/Source/_javascript_Core/runtime/JSBigInt.h 2020-04-29 06:23:10 UTC (rev 260878)
@@ -138,7 +138,6 @@
bool equalsToNumber(JSValue);
JS_EXPORT_PRIVATE bool equalsToInt32(int32_t);
static ComparisonResult compare(JSBigInt* x, JSBigInt* y);
-#if USE(BIGINT32)
static ComparisonResult compare(int32_t x, JSBigInt* y);
static ComparisonResult compare(JSBigInt* x, int32_t y);
static ComparisonResult compare(int32_t x, int32_t y)
@@ -149,7 +148,6 @@
return JSBigInt::ComparisonResult::LessThan;
return JSBigInt::ComparisonResult::GreaterThan;
}
-#endif
bool getPrimitiveNumber(JSGlobalObject*, double& number, JSValue& result) const;
double toNumber(JSGlobalObject*) const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
