Title: [258784] trunk/Source/WTF
- Revision
- 258784
- Author
- [email protected]
- Date
- 2020-03-20 13:34:51 -0700 (Fri, 20 Mar 2020)
Log Message
Add correct annotations to block isa pointer
https://bugs.webkit.org/show_bug.cgi?id=209355
<rdar://problem/60431606>
Patch by Oliver Hunt <oliver@nerget,com> on 2020-03-20
Reviewed by Keith Miller.
Trivial definition update.
* wtf/BlockPtr.h:
(WTF::BlockPtr<R):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (258783 => 258784)
--- trunk/Source/WTF/ChangeLog 2020-03-20 20:19:56 UTC (rev 258783)
+++ trunk/Source/WTF/ChangeLog 2020-03-20 20:34:51 UTC (rev 258784)
@@ -1,3 +1,16 @@
+2020-03-20 Oliver Hunt <oliver@nerget,com>
+
+ Add correct annotations to block isa pointer
+ https://bugs.webkit.org/show_bug.cgi?id=209355
+ <rdar://problem/60431606>
+
+ Reviewed by Keith Miller.
+
+ Trivial definition update.
+
+ * wtf/BlockPtr.h:
+ (WTF::BlockPtr<R):
+
2020-03-20 Tim Horton <[email protected]>
Upstream a variety of Cocoa-platform HAVE and ENABLE macros
Modified: trunk/Source/WTF/wtf/BlockPtr.h (258783 => 258784)
--- trunk/Source/WTF/wtf/BlockPtr.h 2020-03-20 20:19:56 UTC (rev 258783)
+++ trunk/Source/WTF/wtf/BlockPtr.h 2020-03-20 20:34:51 UTC (rev 258784)
@@ -35,10 +35,16 @@
#define WTF_COPY_FUNCTION_POINTER_QUALIFIER __ptrauth_block_copy_helper
#define WTF_DISPOSE_FUNCTION_POINTER_QUALIFIER __ptrauth_block_destroy_helper
#define WTF_INVOKE_FUNCTION_POINTER_QUALIFIER __ptrauth_block_invocation_pointer
+#ifdef __ptrauth_objc_isa_pointer
+#define WTF_ISA_POINTER_QUALIFIER __ptrauth_objc_isa_pointer
#else
+#define WTF_ISA_POINTER_QUALIFIER
+#endif
+#else
#define WTF_COPY_FUNCTION_POINTER_QUALIFIER
#define WTF_DISPOSE_FUNCTION_POINTER_QUALIFIER
#define WTF_INVOKE_FUNCTION_POINTER_QUALIFIER
+#define WTF_ISA_POINTER_QUALIFIER
#endif
namespace WTF {
@@ -63,7 +69,7 @@
};
struct Block {
- void* isa;
+ void* WTF_ISA_POINTER_QUALIFIER isa;
int32_t flags;
int32_t reserved;
R (*WTF_INVOKE_FUNCTION_POINTER_QUALIFIER invoke)(void *, Args...);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
