commit 5336ec3d5e289595ba8310606b5e4f8e3da5ea53
author sbarati@apple.com <sbarati@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Nov 26 02:12:01 2019 +0000
committer sbarati@apple.com <sbarati@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Nov 26 02:12:01 2019 +0000
tree 88276c1f9a315d5b74ab6f4866194920c372da2e
parent 433263e412056649262c24114cee6c2d7b0a97b3

Unreviewed. Fix 32-bit build.

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



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@252871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index ccc17a6..f78665a 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2019-11-25  Saam Barati  <sbarati@apple.com>
+
+        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  <ysuzuki@apple.com>
 
         [JSC] Introduce IsoHeapCellType

Source/JavaScriptCore/bytecode/GetByValHistory.h

diff --git a/Source/JavaScriptCore/bytecode/GetByValHistory.h b/Source/JavaScriptCore/bytecode/GetByValHistory.h
index 83cbae7..bdc0d33 100644
--- a/Source/JavaScriptCore/bytecode/GetByValHistory.h
+++ b/Source/JavaScriptCore/bytecode/GetByValHistory.h
@@ -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)
     {