Changeset 260878 in webkit
- Timestamp:
- Apr 28, 2020 11:23:10 PM (4 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r260877 r260878 1 2020-04-28 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, reverting r260876 and r260877. 4 https://bugs.webkit.org/show_bug.cgi?id=211165 5 6 Broke build (Requested by yusukesuzuki on #webkit). 7 8 Reverted changesets: 9 10 "Unreviewed, build fix on watchOS" 11 https://bugs.webkit.org/show_bug.cgi?id=210978 12 https://trac.webkit.org/changeset/260876 13 14 "Unreviewed, speculative build fix on watchOS part 2" 15 https://bugs.webkit.org/show_bug.cgi?id=210978 16 https://trac.webkit.org/changeset/260877 17 1 18 2020-04-28 Yusuke Suzuki <ysuzuki@apple.com> 2 19 -
trunk/Source/JavaScriptCore/runtime/JSBigInt.cpp
r260877 r260878 229 229 if (msdTopBit < mantissaTopBit) { 230 230 remainingMantissaBits = mantissaTopBit - msdTopBit; 231 digit = static_cast<Digit>(mantissa >> remainingMantissaBits);231 digit = mantissa >> remainingMantissaBits; 232 232 mantissa = mantissa << (64 - remainingMantissaBits); 233 233 } else { 234 234 ASSERT(msdTopBit >= mantissaTopBit); 235 digit = static_cast<Digit>(mantissa << (msdTopBit - mantissaTopBit));235 digit = mantissa << (msdTopBit - mantissaTopBit); 236 236 mantissa = 0; 237 237 } … … 319 319 }; 320 320 321 #if USE(BIGINT32)322 321 class Int32BigIntImpl { 323 322 public: … … 333 332 ASSERT(length()); 334 333 ASSERT_UNUSED(i, i == 0); 335 static_assert(sizeof(Digit) == sizeof(uint64_t), "INT32_MAX can be represented with length() == 1 only when Digit is 64bit");336 334 if (sign()) 337 335 return -static_cast<int64_t>(m_value); … … 345 343 int32_t m_value; 346 344 }; 347 #endif348 345 349 346 ALWAYS_INLINE JSBigInt::ImplResult::ImplResult(HeapBigIntImpl& heapImpl) … … 1362 1359 return compareImpl(HeapBigIntImpl { x }, HeapBigIntImpl { y }); 1363 1360 } 1364 #if USE(BIGINT32)1365 1361 JSBigInt::ComparisonResult JSBigInt::compare(int32_t x, JSBigInt* y) 1366 1362 { … … 1371 1367 return compareImpl(HeapBigIntImpl { x }, Int32BigIntImpl { y }); 1372 1368 } 1373 #endif1374 1369 1375 1370 template <typename BigIntImpl1, typename BigIntImpl2> -
trunk/Source/JavaScriptCore/runtime/JSBigInt.h
r260876 r260878 139 139 JS_EXPORT_PRIVATE bool equalsToInt32(int32_t); 140 140 static ComparisonResult compare(JSBigInt* x, JSBigInt* y); 141 #if USE(BIGINT32)142 141 static ComparisonResult compare(int32_t x, JSBigInt* y); 143 142 static ComparisonResult compare(JSBigInt* x, int32_t y); … … 150 149 return JSBigInt::ComparisonResult::GreaterThan; 151 150 } 152 #endif153 151 154 152 bool getPrimitiveNumber(JSGlobalObject*, double& number, JSValue& result) const;
Note: See TracChangeset
for help on using the changeset viewer.