Title: [252871] trunk/Source/_javascript_Core
Revision
252871
Author
[email protected]
Date
2019-11-25 18:12:01 -0800 (Mon, 25 Nov 2019)

Log Message

Unreviewed. Fix 32-bit build.

* bytecode/GetByValHistory.h:
(JSC::GetByValHistory::observeNonUID):
(JSC::GetByValHistory::observe):
(JSC::GetByValHistory::count const):
(JSC::GetByValHistory::filter const):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (252870 => 252871)


--- trunk/Source/_javascript_Core/ChangeLog	2019-11-26 01:55:32 UTC (rev 252870)
+++ trunk/Source/_javascript_Core/ChangeLog	2019-11-26 02:12:01 UTC (rev 252871)
@@ -1,3 +1,13 @@
+2019-11-25  Saam Barati  <[email protected]>
+
+        Unreviewed. Fix 32-bit build.
+
+        * bytecode/GetByValHistory.h:
+        (JSC::GetByValHistory::observeNonUID):
+        (JSC::GetByValHistory::observe):
+        (JSC::GetByValHistory::count const):
+        (JSC::GetByValHistory::filter const):
+
 2019-11-24  Yusuke Suzuki  <[email protected]>
 
         [JSC] Introduce IsoHeapCellType

Modified: trunk/Source/_javascript_Core/bytecode/GetByValHistory.h (252870 => 252871)


--- trunk/Source/_javascript_Core/bytecode/GetByValHistory.h	2019-11-26 01:55:32 UTC (rev 252870)
+++ trunk/Source/_javascript_Core/bytecode/GetByValHistory.h	2019-11-26 02:12:01 UTC (rev 252871)
@@ -33,7 +33,7 @@
 struct GetByValHistory {
     void observeNonUID()
     {
-        uint64_t count = Options::getByValICMaxNumberOfIdentifiers() + 1;
+        uintptr_t count = Options::getByValICMaxNumberOfIdentifiers() + 1;
         update(count, filter());
     }
 
@@ -44,24 +44,23 @@
             return;
         }
 
-        uint64_t count = this->count();
-        uint64_t filter = this->filter();
+        uintptr_t count = this->count();
+        uintptr_t filter = this->filter();
 
         TinyBloomFilter bloomFilter(filter);
-        uint64_t implBits = static_cast<uint64_t>(bitwise_cast<uintptr_t>(impl));
-        ASSERT(((implBits << 8) >> 8) == implBits);
+        uintptr_t implBits = bitwise_cast<uintptr_t>(impl);
+        ASSERT(((static_cast<uint64_t>(implBits) << 8) >> 8) == static_cast<uint64_t>(implBits));
         if (bloomFilter.ruleOut(implBits)) {
             bloomFilter.add(implBits);
             ++count;
+            update(count, bloomFilter.bits());
         }
-
-        update(count, bloomFilter.bits());
     }
 
-    uint64_t count() const { return m_payload >> 56; }
+    uintptr_t count() const { return static_cast<uintptr_t>(m_payload >> 56); }
 
 private:
-    uint64_t filter() const { return (m_payload << 8) >> 8; }
+    uintptr_t filter() const { return static_cast<uintptr_t>((m_payload << 8) >> 8); }
 
     void update(uint64_t count, uint64_t filter)
     {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to