Changeset 280687 in webkit

Timestamp:

Aug 5, 2021, 8:14:42 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Use reinterpret_cast_ptr in KeywordLookupGenerator, PropertyMapHashTable
​https://bugs.webkit.org/show_bug.cgi?id=228819

Patch by Zan Dobersek <​zdobersek@igalia.com> on 2021-08-05
Reviewed by Adrian Perez de Castro.

Switch to using reinterpret_cast_ptr in KeywordLookupGenerator (which
generates the KeywordLookup.h header) and PropertyMapHashTable, reducing
a bit the GCC warning spewage when compiling for targets benefitting
from the reinterpret_cast_ptr workaround.

• KeywordLookupGenerator.py:
• runtime/PropertyMapHashTable.h:

(JSC::PropertyTable::table):
(JSC::PropertyTable::table const):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• KeywordLookupGenerator.py (modified) (2 diffs)
• runtime/PropertyMapHashTable.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-08-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        Use reinterpret_cast_ptr in KeywordLookupGenerator, PropertyMapHashTable
+        https://bugs.webkit.org/show_bug.cgi?id=228819
+
+        Reviewed by Adrian Perez de Castro.
+
+        Switch to using reinterpret_cast_ptr in KeywordLookupGenerator (which
+        generates the KeywordLookup.h header) and PropertyMapHashTable, reducing
+        a bit the GCC warning spewage when compiling for targets benefitting
+        from the reinterpret_cast_ptr workaround.
+
+        * KeywordLookupGenerator.py:
+        * runtime/PropertyMapHashTable.h:
+        (JSC::PropertyTable::table):
+        (JSC::PropertyTable::table const):
+
 2021-08-04  Yijia Huang  <yijia_huang@apple.com>
 

trunk/Source/JavaScriptCore/KeywordLookupGenerator.py

@@ -220 +220 @@
 print("// This file was generated by KeywordLookupGenerator.py.  Do not edit.")
 print("""
+#include <wtf/StdLibExtras.h>
+
 #if CPU(NEEDS_ALIGNED_ACCESS)
 
@@ -259 +261 @@
 
 #define COMPARE_2CHARS(address, char1, char2) \\
-    ((reinterpret_cast<const uint16_t*>(address))[0] == CHARPAIR_TOUINT16(char1, char2))
+    ((reinterpret_cast_ptr<const uint16_t*>(address))[0] == CHARPAIR_TOUINT16(char1, char2))
 #define COMPARE_2UCHARS(address, char1, char2) \\
-    ((reinterpret_cast<const uint32_t*>(address))[0] == UCHARPAIR_TOUINT32(char1, char2))
+    ((reinterpret_cast_ptr<const uint32_t*>(address))[0] == UCHARPAIR_TOUINT32(char1, char2))
 
 #if CPU(X86_64)
 
 #define COMPARE_4CHARS(address, char1, char2, char3, char4) \\
-    ((reinterpret_cast<const uint32_t*>(address))[0] == CHARQUAD_TOUINT32(char1, char2, char3, char4))
+    ((reinterpret_cast_ptr<const uint32_t*>(address))[0] == CHARQUAD_TOUINT32(char1, char2, char3, char4))
 #define COMPARE_4UCHARS(address, char1, char2, char3, char4) \\
-    ((reinterpret_cast<const uint64_t*>(address))[0] == UCHARQUAD_TOUINT64(char1, char2, char3, char4))
+    ((reinterpret_cast_ptr<const uint64_t*>(address))[0] == UCHARQUAD_TOUINT64(char1, char2, char3, char4))
 
 #else // CPU(X86_64)

trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h

@@ -27 +27 @@
 #include <wtf/HashTable.h>
 #include <wtf/MathExtras.h>
+#include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
 #include <wtf/text/AtomStringImpl.h>
@@ -549 +550 @@
 {
     // The table of values lies after the hash index.
-    return reinterpret_cast<ValueType*>(m_index + m_indexSize);
+    return reinterpret_cast_ptr<ValueType*>(m_index + m_indexSize);
 }
 
@@ -555 +556 @@
 {
     // The table of values lies after the hash index.
-    return reinterpret_cast<const ValueType*>(m_index + m_indexSize);
+    return reinterpret_cast_ptr<const ValueType*>(m_index + m_indexSize);
 }