Use reinterpret_cast_ptr in KeywordLookupGenerator, PropertyMapHashTable

commit-queue@webkit.org · commit-queue@webkit.org · commit 246e2d7c5e07 · 2021-08-05T15:14:42.000Z
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): Canonical link: https://commits.webkit.org/240289@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280687 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+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>
 
         [ARM64] Fix Zoom black screen during video meeting on Safari
diff --git a/Source/JavaScriptCore/KeywordLookupGenerator.py b/Source/JavaScriptCore/KeywordLookupGenerator.py
@@ -219,6 +219,8 @@ def printAsC(self):
 trie.fillOut()
 print("// This file was generated by KeywordLookupGenerator.py.  Do not edit.")
 print("""
+#include <wtf/StdLibExtras.h>
+
 #if CPU(NEEDS_ALIGNED_ACCESS)
 
 #define COMPARE_2CHARS(address, char1, char2) \\
@@ -258,16 +260,16 @@ def printAsC(self):
 
 
 #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)
 
diff --git a/Source/JavaScriptCore/runtime/PropertyMapHashTable.h b/Source/JavaScriptCore/runtime/PropertyMapHashTable.h
@@ -26,6 +26,7 @@
 #include "WriteBarrier.h"
 #include <wtf/HashTable.h>
 #include <wtf/MathExtras.h>
+#include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
 #include <wtf/text/AtomStringImpl.h>
 
@@ -548,13 +549,13 @@ inline T* PropertyTable::skipDeletedEntries(T* valuePtr, T* endValuePtr)
 inline PropertyTable::ValueType* PropertyTable::table()
 {
     // 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);
 }
 
 inline const PropertyTable::ValueType* PropertyTable::table() const
 {
     // 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);
 }
 
 inline unsigned PropertyTable::usedCount() const

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include "WriteBarrier.h"`
`27`	`27`	`#include <wtf/HashTable.h>`
`28`	`28`	`#include <wtf/MathExtras.h>`
	`29`	`+#include <wtf/StdLibExtras.h>`
`29`	`30`	`#include <wtf/Vector.h>`
`30`	`31`	`#include <wtf/text/AtomStringImpl.h>`
`31`	`32`
`@@ -548,13 +549,13 @@ inline T* PropertyTable::skipDeletedEntries(T* valuePtr, T* endValuePtr)`
`548`	`549`	`inline PropertyTable::ValueType* PropertyTable::table()`
`549`	`550`	`{`
`550`	`551`	`// The table of values lies after the hash index.`
`551`		`- return reinterpret_cast<ValueType*>(m_index + m_indexSize);`
	`552`	`+ return reinterpret_cast_ptr<ValueType*>(m_index + m_indexSize);`
`552`	`553`	`}`
`553`	`554`
`554`	`555`	`inline const PropertyTable::ValueType* PropertyTable::table() const`
`555`	`556`	`{`
`556`	`557`	`// The table of values lies after the hash index.`
`557`		`- return reinterpret_cast<const ValueType*>(m_index + m_indexSize);`
	`558`	`+ return reinterpret_cast_ptr<const ValueType*>(m_index + m_indexSize);`
`558`	`559`	`}`
`559`	`560`
`560`	`561`	`inline unsigned PropertyTable::usedCount() const`