Title: [224545] trunk/Source/WTF
Revision
224545
Author
msab...@apple.com
Date
2017-11-07 13:19:33 -0800 (Tue, 07 Nov 2017)

Log Message

Add SPI function pointers qualifiers for CPU(ARM64E)
https://bugs.webkit.org/show_bug.cgi?id=179383

Reviewed by Mark Lam.

For ARM64E, use the appropriate SPI qualifiers for helper function pointers.

* wtf/BlockPtr.h:
(WTF::BlockPtr<R):

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (224544 => 224545)


--- trunk/Source/WTF/ChangeLog	2017-11-07 20:52:40 UTC (rev 224544)
+++ trunk/Source/WTF/ChangeLog	2017-11-07 21:19:33 UTC (rev 224545)
@@ -1,3 +1,15 @@
+2017-11-07  Michael Saboff  <msab...@apple.com>
+
+        Add SPI function pointers qualifiers for CPU(ARM64E)
+        https://bugs.webkit.org/show_bug.cgi?id=179383
+
+        Reviewed by Mark Lam.
+
+        For ARM64E, use the appropriate SPI qualifiers for helper function pointers.
+
+        * wtf/BlockPtr.h:
+        (WTF::BlockPtr<R):
+
 2017-10-31  Filip Pizlo  <fpi...@apple.com>
 
         bmalloc should support strictly type-segregated isolated heaps

Modified: trunk/Source/WTF/wtf/BlockPtr.h (224544 => 224545)


--- trunk/Source/WTF/wtf/BlockPtr.h	2017-11-07 20:52:40 UTC (rev 224544)
+++ trunk/Source/WTF/wtf/BlockPtr.h	2017-11-07 21:19:33 UTC (rev 224545)
@@ -26,6 +26,13 @@
 #pragma once
 
 #include <Block.h>
+#if CPU(ARM64E)
+#include <WebKitAdditions/BlockQualifiers.h>
+#else
+#define WTF_COPY_FUNCTION_POINTER_QUALIFIER
+#define WTF_DISPOSE_FUNCTION_POINTER_QUALIFIER
+#define WTF_INVOKE_FUNCTION_POINTER_QUALIFIER
+#endif
 #include <utility>
 #include <wtf/Assertions.h>
 
@@ -46,8 +53,8 @@
         struct Descriptor {
             uintptr_t reserved;
             uintptr_t size;
-            void (*copy)(void *dst, const void *src);
-            void (*dispose)(const void *);
+            void (*WTF_COPY_FUNCTION_POINTER_QUALIFIER copy)(void *dst, const void *src);
+            void (*WTF_DISPOSE_FUNCTION_POINTER_QUALIFIER dispose)(const void *);
         };
 
         struct Block {
@@ -54,7 +61,7 @@
             void* isa;
             int32_t flags;
             int32_t reserved;
-            R (*invoke)(void *, Args...);
+            R (*WTF_INVOKE_FUNCTION_POINTER_QUALIFIER invoke)(void *, Args...);
             const struct Descriptor* descriptor;
             F f;
         };
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to