@zigc/lib 0.16.0-dev.3013 → 0.16.0-dev.3039

package/libc/include/any-darwin-any/dirent.h

@@ -67,6 +67,7 @@
 #include <sys/cdefs.h>
 #include <Availability.h>
 #include <sys/_pthread/_pthread_types.h> /* __darwin_pthread_mutex_t */
+#include <sys/_types/_size_t.h>
 
 _LIBC_SINGLE_BY_DEFAULT()
 
@@ -75,8 +76,8 @@ struct _telldir;		/* forward reference */
 /* structure describing an open directory. */
 typedef struct {
 	int	__dd_fd;	/* file descriptor associated with directory */
-	long	__dd_loc;	/* offset in current buffer */
-	long	__dd_size;	/* amount of data returned */
+	size_t	__dd_loc;	/* offset in current buffer */
+	size_t	__dd_size;	/* amount of data returned */
 	char *_LIBC_COUNT(__dd_len)	__dd_buf; /* data buffer */
 	int	__dd_len;	/* size of data buffer */
 	long	__dd_seek;	/* magic cookie returned */
@@ -110,6 +111,7 @@ int closedir(DIR *) __DARWIN_ALIAS(closedir);
 DIR *opendir(const char *) __DARWIN_ALIAS_I(opendir);
 
 struct dirent *readdir(DIR *) __DARWIN_INODE64(readdir);
+__deprecated_msg("This function cannot be used safely as it does not take into account the variability of {NAME_MAX}.  It is highly recommended that you use readdir(3) instead.")
 int readdir_r(DIR *, struct dirent *, struct dirent **) __DARWIN_INODE64(readdir_r);
 
 void rewinddir(DIR *) __DARWIN_ALIAS_I(rewinddir);
@@ -171,6 +173,34 @@ __END_DECLS
 #if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
 __BEGIN_DECLS
 
+int	 fdclosedir(DIR *)
+	__API_AVAILABLE(macos(26.4), ios(26.4), watchos(26.4), tvos(26.4), visionos(26.4));
+
+int	 fdscandir(int, struct dirent ***,
+	    int (*)(const struct dirent *), int (*)(const struct dirent **,
+	    const struct dirent **))
+	__DARWIN_INODE64(fdscandir)
+	__API_AVAILABLE(macos(26.4), ios(26.4), watchos(26.4), tvos(26.4), visionos(26.4));
+#ifdef __BLOCKS__
+int	 fdscandir_b(int, struct dirent ***,
+	    int (^)(const struct dirent *) __scandir_noescape,
+	    int (^)(const struct dirent **, const struct dirent **) __scandir_noescape)
+	__DARWIN_INODE64(fdscandir_b)
+	__API_AVAILABLE(macos(26.4), ios(26.4), watchos(26.4), tvos(26.4), visionos(26.4));
+#endif
+int	 scandirat(int, const char *, struct dirent ***,
+	    int (*)(const struct dirent *), int (*)(const struct dirent **,
+	    const struct dirent **))
+	__DARWIN_INODE64(scandirat)
+	__API_AVAILABLE(macos(26.4), ios(26.4), watchos(26.4), tvos(26.4), visionos(26.4));
+#ifdef __BLOCKS__
+int	 scandirat_b(int, const char *, struct dirent ***,
+	    int (^)(const struct dirent *) __scandir_noescape,
+	    int (^)(const struct dirent **, const struct dirent **) __scandir_noescape)
+	__DARWIN_INODE64(scandirat_b)
+	__API_AVAILABLE(macos(26.4), ios(26.4), watchos(26.4), tvos(26.4), visionos(26.4));
+#endif
+
 int getdirentries(int, char *_LIBC_COUNT(__nbytes), int __nbytes, long *)
 
 #if __DARWIN_64_BIT_INO_T

package/libc/include/any-darwin-any/dispatch/base.h

@@ -222,6 +222,12 @@
 #define DISPATCH_COLD
 #endif
 
+#if __has_attribute(no_sanitize)
+#define DISPATCH_NO_UBSAN __attribute__((no_sanitize("undefined")))
+#else
+#define DISPATCH_NO_UBSAN
+#endif
+
 #if __has_feature(assume_nonnull)
 #define DISPATCH_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
 #define DISPATCH_ASSUME_NONNULL_END   _Pragma("clang assume_nonnull end")
@@ -305,11 +311,13 @@
 
 #if __has_feature(enumerator_attributes)
 #define DISPATCH_ENUM_API_AVAILABLE(...) API_AVAILABLE(__VA_ARGS__)
+#define DISPATCH_ENUM_SPI_AVAILABLE(...) API_UNAVAILABLE(__VA_ARGS__)
 #define DISPATCH_ENUM_API_DEPRECATED(...) API_DEPRECATED(__VA_ARGS__)
 #define DISPATCH_ENUM_API_DEPRECATED_WITH_REPLACEMENT(...) \
 		API_DEPRECATED_WITH_REPLACEMENT(__VA_ARGS__)
 #else
 #define DISPATCH_ENUM_API_AVAILABLE(...)
+#define DISPATCH_ENUM_SPI_AVAILABLE(...)
 #define DISPATCH_ENUM_API_DEPRECATED(...)
 #define DISPATCH_ENUM_API_DEPRECATED_WITH_REPLACEMENT(...)
 #endif

package/libc/include/any-darwin-any/dispatch/dispatch_swift_shims.h

@@ -38,7 +38,8 @@ DISPATCH_REFINED_FOR_SWIFT DISPATCH_SWIFT_NAME(DispatchSerialQueue.init(__label:
 static inline dispatch_queue_serial_t
 dispatch_serial_queue_create_with_target_4swift(const char *_Nullable DISPATCH_UNSAFE_INDEXABLE label,
 		dispatch_queue_attr_t _Nullable attr, dispatch_queue_t _Nullable target) {
-	return dispatch_queue_create_with_target(label, attr, target);
+	return (dispatch_queue_serial_t)
+			dispatch_queue_create_with_target(label, attr, target);
 }
 
 DISPATCH_MALLOC DISPATCH_RETURNS_RETAINED DISPATCH_WARN_RESULT
@@ -47,7 +48,8 @@ DISPATCH_REFINED_FOR_SWIFT DISPATCH_SWIFT_NAME(DispatchConcurrentQueue.init(__la
 static inline dispatch_queue_concurrent_t
 dispatch_concurrent_queue_create_with_target_4swift(const char *_Nullable DISPATCH_UNSAFE_INDEXABLE label,
 		dispatch_queue_attr_t _Nullable attr, dispatch_queue_t _Nullable target) {
-	return dispatch_queue_create_with_target(label, attr, target);
+	return (dispatch_queue_concurrent_t)
+			dispatch_queue_create_with_target(label, attr, target);
 }
 #endif
 

package/libc/include/any-darwin-any/dispatch/once.h

@@ -76,6 +76,7 @@ dispatch_once(dispatch_once_t *predicate,
 
 #if DISPATCH_ONCE_INLINE_FASTPATH
 DISPATCH_INLINE DISPATCH_ALWAYS_INLINE DISPATCH_NONNULL_ALL DISPATCH_NOTHROW
+DISPATCH_NO_UBSAN
 DISPATCH_SWIFT3_UNAVAILABLE("Use lazily initialized globals instead")
 void
 _dispatch_once(dispatch_once_t *predicate,
@@ -102,7 +103,7 @@ dispatch_once_f(dispatch_once_t *predicate, void *_Nullable context,
 
 #if DISPATCH_ONCE_INLINE_FASTPATH
 DISPATCH_INLINE DISPATCH_ALWAYS_INLINE DISPATCH_NONNULL1 DISPATCH_NONNULL3
-DISPATCH_NOTHROW
+DISPATCH_NOTHROW DISPATCH_NO_UBSAN
 DISPATCH_SWIFT3_UNAVAILABLE("Use lazily initialized globals instead")
 void
 _dispatch_once_f(dispatch_once_t *predicate, void *_Nullable context,

package/libc/include/any-darwin-any/dispatch/workloop.h

@@ -136,6 +136,7 @@ void
 dispatch_workloop_set_autorelease_frequency(dispatch_workloop_t workloop,
 		dispatch_autorelease_frequency_t frequency);
 
+#ifdef __APPLE__
 /*!
   * @function dispatch_workloop_set_os_workgroup
   *
@@ -167,6 +168,7 @@ DISPATCH_REFINED_FOR_SWIFT
 void
 dispatch_workloop_set_os_workgroup(dispatch_workloop_t workloop,
 		os_workgroup_t workgroup);
+#endif
 
 __END_DECLS
 

package/libc/include/any-darwin-any/glob.h

@@ -55,14 +55,14 @@ typedef struct {
 	int gl_flags;		/* Copy of flags parameter to glob. */
 	char *_LIBC_CSTR *_LIBC_COUNT(gl_matchc)	gl_pathv; /* List of paths matching pattern. */
 				/* Copy of errfunc parameter to glob. */
-#ifdef __BLOCKS__
 	union {
-#endif /* __BLOCKS__ */
 		int (*gl_errfunc)(const char *, int);
 #ifdef __BLOCKS__
 		int (^gl_errblk)(const char *, int);
+#else
+		void *gl_errblk;
+#endif
 	};
-#endif /* __BLOCKS__ */
 
 	/*
 	 * Alternate filesystem access methods for glob; replacement
@@ -107,9 +107,11 @@ typedef struct {
 #define	GLOB_QUOTE	0x0400	/* Quote special chars with \. */
 #define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
 #define	GLOB_LIMIT	0x1000	/* limit number of returned paths */
-#ifdef __BLOCKS__
+#ifdef __APPLE__
 #define	_GLOB_ERR_BLOCK	0x80000000 /* (internal) error callback is a block */
-#endif /* __BLOCKS__ */
+#else
+#define	_GLOB_ERR_BLOCK	0x08000000 /* (internal) error callback is a block */
+#endif
 
 /* source compatibility, these are the old names */
 #define GLOB_MAXPATH	GLOB_LIMIT

package/libc/include/any-darwin-any/mach/arm/_structs.h

@@ -198,6 +198,7 @@ _STRUCT_ARM_THREAD_STATE64
 #define __DARWIN_ARM_THREAD_STATE64_FLAGS_IB_SIGNED_LR 0x2
 #define __DARWIN_ARM_THREAD_STATE64_FLAGS_KERNEL_SIGNED_PC 0x4
 #define __DARWIN_ARM_THREAD_STATE64_FLAGS_KERNEL_SIGNED_LR 0x8
+#define __DARWIN_ARM_THREAD_STATE64_FLAGS_CUSTOM_X18_ABI 0x10
 
 #define __DARWIN_ARM_THREAD_STATE64_USER_DIVERSIFIER_MASK 0xff000000
 

package/libc/include/any-darwin-any/mach/arm/exception.h

@@ -75,6 +75,7 @@
 #define EXC_ARM_MTE_TAGCHECK_FAIL       0x106   /* MTE Tag Check failure */
 #define EXC_ARM_MTE_CANONICAL_FAIL      0x107   /* MTE Canonical Tag access fail */
 
+
 /*
  *	EXC_BREAKPOINT
  */

package/libc/include/any-darwin-any/mach/arm/thread_status.h

@@ -89,7 +89,7 @@
 #define ARM_SME_ZA_STATE9        40
 #define ARM_SME_ZA_STATE10       41
 #define ARM_SME_ZA_STATE11       42
-#define ARM_SME_ZA_STATE12       42
+#define ARM_SME_ZA_STATE12       43
 #define ARM_SME_ZA_STATE13       44
 #define ARM_SME_ZA_STATE14       45
 #define ARM_SME_ZA_STATE15       46

package/libc/include/any-darwin-any/mach/kern_return.h

@@ -339,6 +339,10 @@
 /* A search or query operation did not return a result
  */
 
+#define KERN_INVALID_GUARD_OBJECT_SLOT  57
+/* Access to an guarded object slot attempted
+ */
+
 #define KERN_RETURN_MAX                 0x100
 /* Maximum return value allowable
  */

package/libc/include/any-darwin-any/mach/mach_host.h

@@ -52,7 +52,7 @@ typedef function_table_entry   *function_table_t;
 #endif /* AUTOTEST */
 
 #ifndef	mach_host_MSG_COUNT
-#define	mach_host_MSG_COUNT	35
+#define	mach_host_MSG_COUNT	36
 #endif	/* mach_host_MSG_COUNT */
 
 #include <Availability.h>
@@ -443,6 +443,23 @@ kern_return_t mach_zone_info_for_zone
 	mach_zone_info_t *info
 );
 
+/* Routine mach_memory_info_redacted */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_memory_info_redacted
+(
+	mach_port_t host,
+	mach_zone_name_array_t *names,
+	mach_msg_type_number_t *namesCnt,
+	mach_zone_info_array_t *info,
+	mach_msg_type_number_t *infoCnt,
+	mach_memory_info_array_t *memory_info,
+	mach_msg_type_number_t *memory_infoCnt
+);
+
 __END_DECLS
 
 /********************** Caution **************************/
@@ -787,6 +804,16 @@ __END_DECLS
 #ifdef  __MigPackStructs
 #pragma pack(pop)
 #endif
+
+#ifdef  __MigPackStructs
+#pragma pack(push, 4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__mach_memory_info_redacted_t __attribute__((unused));
+#ifdef  __MigPackStructs
+#pragma pack(pop)
+#endif
 #endif /* !__Request__mach_host_subsystem__defined */
 
 /* union of all requests */
@@ -821,6 +848,7 @@ union __RequestUnion__mach_host_subsystem {
 	__Request__host_get_multiuser_config_flags_t Request_host_get_multiuser_config_flags;
 	__Request__host_check_multiuser_mode_t Request_host_check_multiuser_mode;
 	__Request__mach_zone_info_for_zone_t Request_mach_zone_info_for_zone;
+	__Request__mach_memory_info_redacted_t Request_mach_memory_info_redacted;
 };
 #endif /* !__RequestUnion__mach_host_subsystem__defined */
 /* typedefs for all replies */
@@ -1217,6 +1245,26 @@ union __RequestUnion__mach_host_subsystem {
 #ifdef  __MigPackStructs
 #pragma pack(pop)
 #endif
+
+#ifdef  __MigPackStructs
+#pragma pack(push, 4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t names;
+		mach_msg_ool_descriptor_t info;
+		mach_msg_ool_descriptor_t memory_info;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t namesCnt;
+		mach_msg_type_number_t infoCnt;
+		mach_msg_type_number_t memory_infoCnt;
+	} __Reply__mach_memory_info_redacted_t __attribute__((unused));
+#ifdef  __MigPackStructs
+#pragma pack(pop)
+#endif
 #endif /* !__Reply__mach_host_subsystem__defined */
 
 /* union of all replies */
@@ -1251,6 +1299,7 @@ union __ReplyUnion__mach_host_subsystem {
 	__Reply__host_get_multiuser_config_flags_t Reply_host_get_multiuser_config_flags;
 	__Reply__host_check_multiuser_mode_t Reply_host_check_multiuser_mode;
 	__Reply__mach_zone_info_for_zone_t Reply_mach_zone_info_for_zone;
+	__Reply__mach_memory_info_redacted_t Reply_mach_memory_info_redacted;
 };
 #endif /* !__RequestUnion__mach_host_subsystem__defined */
 
@@ -1282,7 +1331,8 @@ union __ReplyUnion__mach_host_subsystem {
     { "host_set_multiuser_config_flags", 228 },\
     { "host_get_multiuser_config_flags", 229 },\
     { "host_check_multiuser_mode", 230 },\
-    { "mach_zone_info_for_zone", 231 }
+    { "mach_zone_info_for_zone", 231 },\
+    { "mach_memory_info_redacted", 235 }
 #endif
 
 #ifdef __AfterMigUserHeader

package/libc/include/any-darwin-any/mach/mach_traps.h

@@ -299,7 +299,11 @@ extern kern_return_t debug_control_port_for_pid(
 
 extern mach_error_t mach_vm_reclaim_update_kernel_accounting_trap(
 	mach_port_name_t target_tport,
-	uint64_t *bytes_reclaimed);
+	uint64_t *bytes_reclaimed,
+	uint64_t *next_deadline);
+
+extern kern_return_t thread_set_x86_64_compat(
+	uint32_t enable);
 
 
 __END_DECLS

package/libc/include/any-darwin-any/mach/mach_types.h

@@ -126,6 +126,7 @@ typedef mach_port_t             thread_t;
 typedef mach_port_t             thread_act_t;
 typedef mach_port_t             thread_inspect_t;
 typedef mach_port_t             thread_read_t;
+typedef mach_port_t             thread_suspension_token_t;
 typedef mach_port_t             ipc_space_t;
 typedef mach_port_t             ipc_space_read_t;
 typedef mach_port_t             ipc_space_inspect_t;
@@ -278,6 +279,9 @@ typedef unsigned int            mach_thread_flavor_t;
 typedef natural_t               ledger_item_t;
 #define LEDGER_ITEM_INFINITY    ((ledger_item_t) (~0))
 
+typedef uint32_t                ledger_entry_id_t;
+#define LEDGER_ENTRY_ID_INVALID ((ledger_entry_id_t)0)
+
 typedef int64_t                 ledger_amount_t;
 #define LEDGER_LIMIT_INFINITY   ((ledger_amount_t)((1ULL << 63) - 1))
 

package/libc/include/any-darwin-any/mach/mach_voucher_types.h

@@ -136,6 +136,15 @@ typedef mach_voucher_attr_recipe_command_t *mach_voucher_attr_recipe_command_arr
 #define MACH_VOUCHER_ATTR_AUTO_REDEEM           ((mach_voucher_attr_recipe_command_t)4)
 #define MACH_VOUCHER_ATTR_SEND_PREPROCESS       ((mach_voucher_attr_recipe_command_t)5)
 
+#if __BUILDING_XNU_LIB_UNITTEST__
+/*
+ * These are test-only voucher commands exposed so we have a means to
+ * unit test 'allowed voucher command' and 'disallowed voucher command' logic.
+ */
+#define MACH_VOUCHER_ATTR_UNIT_TEST_VECTOR_ALLOWED              ((mach_voucher_attr_recipe_command_t)6)
+#define MACH_VOUCHER_ATTR_UNIT_TEST_VECTOR_DISALLOWED   ((mach_voucher_attr_recipe_command_t)7)
+#endif /* __BUILDING_XNU_LIB_UNITTEST__ */
+
 /* redeem is on its way out? */
 #define MACH_VOUCHER_ATTR_REDEEM                ((mach_voucher_attr_recipe_command_t)10)
 

package/libc/include/any-darwin-any/mach/machine.h

@@ -410,6 +410,7 @@ typedef integer_t       cpu_threadtype_t;
 #define CPUFAMILY_ARM_TAHITI 0x75d4acb9
 #define CPUFAMILY_ARM_TUPAI 0x204526d0
 #define CPUFAMILY_ARM_HIDRA 0x1d5a87e8
+#define CPUFAMILY_ARM_SOTRA 0xf76c5b1a
 #define CPUFAMILY_ARM_THERA 0xab345f09
 #define CPUFAMILY_ARM_TILOS 0x01d7a72b
 

package/libc/include/any-darwin-any/mach/message.h

@@ -296,6 +296,7 @@ typedef struct {
 	unsigned int                  pad3 : 24;
 	mach_msg_descriptor_type_t    type : 8;
 } mach_msg_type_descriptor_t;
+xnu_static_assert_struct_size(mach_msg_type_descriptor_t, 12);
 
 typedef struct {
 	mach_port_t                   name;
@@ -304,6 +305,7 @@ typedef struct {
 	mach_msg_type_name_t          disposition : 8;
 	mach_msg_descriptor_type_t    type : 8;
 } mach_msg_port_descriptor_t;
+xnu_static_assert_struct_size_kernel_user(mach_msg_port_descriptor_t, 16, 12);
 
 
 typedef struct {
@@ -314,6 +316,7 @@ typedef struct {
 	unsigned int                  pad1: 8;
 	mach_msg_descriptor_type_t    type: 8;
 } mach_msg_ool_descriptor32_t;
+xnu_static_assert_struct_size(mach_msg_ool_descriptor32_t, 12);
 
 typedef struct {
 	uint64_t                      address;
@@ -323,6 +326,7 @@ typedef struct {
 	mach_msg_descriptor_type_t    type: 8;
 	mach_msg_size_t               size;
 } mach_msg_ool_descriptor64_t;
+xnu_static_assert_struct_size(mach_msg_ool_descriptor64_t, 16);
 
 typedef struct {
 	void                         *address;
@@ -337,6 +341,7 @@ typedef struct {
 	mach_msg_size_t               size;
 #endif
 } mach_msg_ool_descriptor_t;
+xnu_static_assert_struct_size_kernel_user64_user32(mach_msg_ool_descriptor_t, 16, 16, 12);
 
 typedef struct {
 	uint32_t                      address;
@@ -346,6 +351,7 @@ typedef struct {
 	mach_msg_type_name_t          disposition : 8;
 	mach_msg_descriptor_type_t    type : 8;
 } mach_msg_ool_ports_descriptor32_t;
+xnu_static_assert_struct_size(mach_msg_ool_descriptor32_t, 12);
 
 typedef struct {
 	uint64_t                      address;
@@ -355,6 +361,7 @@ typedef struct {
 	mach_msg_descriptor_type_t    type : 8;
 	mach_msg_size_t               count;
 } mach_msg_ool_ports_descriptor64_t;
+xnu_static_assert_struct_size(mach_msg_ool_ports_descriptor64_t, 16);
 
 typedef struct {
 	void                         *address;
@@ -369,6 +376,7 @@ typedef struct {
 	mach_msg_size_t               count;
 #endif
 } mach_msg_ool_ports_descriptor_t;
+xnu_static_assert_struct_size_kernel_user64_user32(mach_msg_ool_ports_descriptor_t, 16, 16, 12);
 
 typedef struct {
 	uint32_t                      context;
@@ -377,6 +385,7 @@ typedef struct {
 	mach_msg_type_name_t          disposition : 8;
 	mach_msg_descriptor_type_t    type : 8;
 } mach_msg_guarded_port_descriptor32_t;
+xnu_static_assert_struct_size(mach_msg_guarded_port_descriptor32_t, 12);
 
 typedef struct {
 	uint64_t                      context;
@@ -385,6 +394,7 @@ typedef struct {
 	mach_msg_descriptor_type_t    type : 8;
 	mach_port_name_t              name;
 } mach_msg_guarded_port_descriptor64_t;
+xnu_static_assert_struct_size(mach_msg_guarded_port_descriptor64_t, 16);
 
 typedef struct {
 	mach_port_context_t           context;
@@ -398,6 +408,7 @@ typedef struct {
 	mach_port_name_t              name;
 #endif /* defined(__LP64__) */
 } mach_msg_guarded_port_descriptor_t;
+xnu_static_assert_struct_size_kernel_user64_user32(mach_msg_guarded_port_descriptor_t, 16, 16, 12);
 
 /*
  * LP64support - This union definition is not really
@@ -411,10 +422,12 @@ typedef union {
 	mach_msg_type_descriptor_t            type;
 	mach_msg_guarded_port_descriptor_t    guarded_port;
 } mach_msg_descriptor_t;
+xnu_static_assert_struct_size_kernel_user64_user32(mach_msg_descriptor_t, 16, 16, 12);
 
 typedef struct {
 	mach_msg_size_t msgh_descriptor_count;
 } mach_msg_body_t;
+xnu_static_assert_struct_size(mach_msg_body_t, 4);
 
 #define MACH_MSG_BODY_NULL            ((mach_msg_body_t *) 0)
 #define MACH_MSG_DESCRIPTOR_NULL      ((mach_msg_descriptor_t *) 0)
@@ -427,6 +440,7 @@ typedef struct {
 	mach_port_name_t              msgh_voucher_port;
 	mach_msg_id_t                 msgh_id;
 } mach_msg_header_t;
+xnu_static_assert_struct_size_kernel_user(mach_msg_header_t, 32, 24);
 
 
 #define msgh_reserved                 msgh_voucher_port
@@ -436,6 +450,7 @@ typedef struct {
 	mach_msg_header_t             header;
 	mach_msg_body_t               body;
 } mach_msg_base_t;
+xnu_static_assert_struct_size_kernel_user(mach_msg_base_t, 36, 28);
 
 
 typedef unsigned int mach_msg_trailer_type_t;
@@ -449,6 +464,7 @@ typedef struct {
 	mach_msg_trailer_type_t       msgh_trailer_type;
 	mach_msg_trailer_size_t       msgh_trailer_size;
 } mach_msg_trailer_t;
+xnu_static_assert_struct_size(mach_msg_trailer_t, 8);
 
 /*
  *  The msgh_seqno field carries a sequence number
@@ -464,6 +480,7 @@ typedef struct {
 	mach_msg_trailer_size_t       msgh_trailer_size;
 	mach_port_seqno_t             msgh_seqno;
 } mach_msg_seqno_trailer_t;
+xnu_static_assert_struct_size(mach_msg_seqno_trailer_t, 12);
 
 typedef struct {
 	unsigned int                  val[2];
@@ -475,6 +492,7 @@ typedef struct {
 	mach_port_seqno_t             msgh_seqno;
 	security_token_t              msgh_sender;
 } mach_msg_security_trailer_t;
+xnu_static_assert_struct_size(mach_msg_security_trailer_t, 20);
 
 /*
  * The audit token is an opaque token which identifies
@@ -512,6 +530,7 @@ typedef struct {
 	security_token_t              msgh_sender;
 	audit_token_t                 msgh_audit;
 } mach_msg_audit_trailer_t;
+xnu_static_assert_struct_size(mach_msg_audit_trailer_t, 52);
 
 typedef struct {
 	mach_msg_trailer_type_t       msgh_trailer_type;
@@ -521,6 +540,7 @@ typedef struct {
 	audit_token_t                 msgh_audit;
 	mach_port_context_t           msgh_context;
 } mach_msg_context_trailer_t;
+xnu_static_assert_struct_size_kernel_user64_user32(mach_msg_context_trailer_t, 60, 60, 56);
 
 
 
@@ -546,6 +566,7 @@ typedef struct {
 	mach_msg_filter_id            msgh_ad;
 	msg_labels_t                  msgh_labels;
 } mach_msg_mac_trailer_t;
+xnu_static_assert_struct_size_kernel_user64_user32(mach_msg_mac_trailer_t, 68, 68, 64);
 
 
 #define MACH_MSG_TRAILER_MINIMUM_SIZE  sizeof(mach_msg_trailer_t)

package/libc/include/any-darwin-any/mach/port.h

@@ -91,6 +91,29 @@
 #include <mach/boolean.h>
 #include <mach/machine/vm_types.h>
 
+/*
+ * Helpers to declare and lock down the expected size for structures.
+ * Some structures must remain a constant size due to performance or ABI implications.
+ * It's not necessarily an issue if you need to bump a size passed to these macros: act judiciously.
+ */
+#if __arm64__
+#define xnu_static_assert_struct_size(name, expected_size) _Static_assert(\
+	sizeof(name) == expected_size, "struct changed size unexpectedly")
+#else /* __arm64__ */
+/* Don't bother trying to lock down structure sizes on !__arm64__ */
+#define xnu_static_assert_struct_size(name, expected_size) _Static_assert(0 == 0, "no-op assert")
+#endif /* __arm64__ */
+
+#define xnu_static_assert_struct_size_kernel_user(name, expected_kernel_size, expected_user_size) \
+	xnu_static_assert_struct_size(name, expected_user_size)
+#ifdef __LP64__
+#define xnu_static_assert_struct_size_kernel_user64_user32(name, _kern_size, expected_user64_size, _u32_size) \
+	xnu_static_assert_struct_size(name, expected_user64_size)
+#else /* __LP64__ */
+#define xnu_static_assert_struct_size_kernel_user64_user32(name, _kern_size, _u64_size, expected_user32_size) \
+	xnu_static_assert_struct_size(name, expected_user32_size)
+#endif /* __LP64__ */
+
 /*
  *	mach_port_name_t - the local identity for a Mach port
  *
@@ -341,8 +364,8 @@ typedef struct mach_service_port_info * mach_service_port_info_t;
  */
 #define MACH_PORT_CONNECTION_PORT_WITH_PORT_ARRAY "com.apple.developer.allow-connection-port-with-port-array"
 
-/* Allows 1p process to create provisional reply port (to be rename to weak reply port) */
-#define MACH_PORT_PROVISIONAL_REPLY_ENTITLEMENT "com.apple.private.allow-weak-reply-port"
+/* Allows 1p process to create weak reply port */
+#define MACH_PORT_WEAK_REPLY_ENTITLEMENT "com.apple.private.allow-weak-reply-port"
 
 /*
  * Flags for mach_port_options (used for
@@ -387,7 +410,8 @@ typedef struct mach_service_port_info * mach_service_port_info_t;
 	#define MPO_SERVICE_PORT                    MPO_SERVICE_PORT
 	#define MPO_CONNECTION_PORT                 MPO_CONNECTION_PORT
 	#define MPO_REPLY_PORT                      MPO_REPLY_PORT
-	#define MPO_PROVISIONAL_REPLY_PORT          MPO_PROVISIONAL_REPLY_PORT
+	#define MPO_WEAK_REPLY_PORT                 MPO_WEAK_REPLY_PORT
+	#define MPO_NOTIFICATION_PORT               MPO_NOTIFICATION_PORT
 	#define MPO_EXCEPTION_PORT                  MPO_EXCEPTION_PORT
 	#define MPO_CONNECTION_PORT_WITH_PORT_ARRAY MPO_CONNECTION_PORT_WITH_PORT_ARRAY
 __options_decl(mpo_flags_t, uint32_t, {
@@ -399,13 +423,19 @@ __options_decl(mpo_flags_t, uint32_t, {
 	MPO_CONNECTION_PORT                 = MPO_MAKE_PORT_TYPE(0, 2),  /* 0x800 */
 	/* Designate port as a reply port */
 	MPO_REPLY_PORT                      = MPO_MAKE_PORT_TYPE(0, 4),  /* 0x1000 */
-	/* Designate port as a provisional (fake) reply port */
-	MPO_PROVISIONAL_REPLY_PORT          = MPO_MAKE_PORT_TYPE(1, 0),  /* 0x4000 */
+	/* Designate port as a weak (fake) reply port */
+	MPO_WEAK_REPLY_PORT                 = MPO_MAKE_PORT_TYPE(1, 0),  /* 0x4000 */
+	/* Designate port as a notification port */
+	MPO_NOTIFICATION_PORT               = MPO_MAKE_PORT_TYPE(1, 1),  /* 0x4400 */
 	/* Used for hardened exceptions - immovable */
 	MPO_EXCEPTION_PORT                  = MPO_MAKE_PORT_TYPE(2, 0),  /* 0x8000 */
 	/* Can receive OOL port array descriptors */
 	MPO_CONNECTION_PORT_WITH_PORT_ARRAY = MPO_MAKE_PORT_TYPE(4, 0),  /* 0x10000 */
 });
+
+/* For bincompat: weak reply port used to be called provisional reply port */
+#define MPO_PROVISIONAL_REPLY_PORT MPO_WEAK_REPLY_PORT
+
 #define MPO_UNUSED_BITS         ~(MPO_OPTIONS_MASK | MPO_PORT_TYPE_MASK)
 
 /* Denotes an anonymous service */
@@ -455,7 +485,7 @@ enum mach_port_guard_exception_codes {
 	kGUARD_EXC_SET_CONTEXT                  = 4,
 	kGUARD_EXC_THREAD_SET_STATE             = 5,
 	kGUARD_EXC_EXCEPTION_BEHAVIOR_ENFORCE   = 6,
-	kGUARD_EXC_SERVICE_PORT_VIOLATION_FATAL = 7,        /* unused, for future sp defense enablement */
+	kGUARD_EXC_SERVICE_PORT_VIOLATION_FATAL = 7,
 	kGUARD_EXC_UNGUARDED                    = 8,
 	kGUARD_EXC_KOBJECT_REPLY_PORT_SEMANTICS = 9,
 	kGUARD_EXC_REQUIRE_REPLY_PORT_SEMANTICS = 10,
@@ -465,7 +495,7 @@ enum mach_port_guard_exception_codes {
 	kGUARD_EXC_INVALID_NOTIFICATION_REQ     = 65,
 	kGUARD_EXC_INVALID_MPO_ENTITLEMENT      = 66,
 	kGUARD_EXC_DESCRIPTOR_VIOLATION         = 67,
-	kGUARD_EXC_MSG_FILTERED                 = 128,
+	kGUARD_EXC_MSG_FILTERED                         = 128,
 	/* start of [optionally] non-fatal guards */
 	kGUARD_EXC_INVALID_RIGHT                = 256,
 	kGUARD_EXC_INVALID_NAME                 = 512,
@@ -481,18 +511,25 @@ enum mach_port_guard_exception_codes {
 	kGUARD_EXC_RCV_INVALID_NAME             = 1u << 19,
 	/* start of always non-fatal guards */
 	kGUARD_EXC_RCV_GUARDED_DESC             = 0x00100000,     /* for development only */
-	kGUARD_EXC_SERVICE_PORT_VIOLATION_NON_FATAL = 0x00100001, /* unused, for future sp defense enablement */
-	kGUARD_EXC_PROVISIONAL_REPLY_PORT       = 0x00100002, /* unused */
+	kGUARD_EXC_SERVICE_PORT_VIOLATION_NON_FATAL = 0x00100001, /* unused */
+	kGUARD_EXC_INVALID_NOTIFICATION_PORT    = 0x00100006,
+	kGUARD_EXC_MACH_EXC_THREAD_SET_STATE    = 0x00100007,
+	kGUARD_EXC_CV_NOTIFICATION_PORT_REQ     = 0x00100008,
+	kGUARD_EXC_WEAK_REPLY_PORT              = 0x00100002, /* unused */
 	kGUARD_EXC_OOL_PORT_ARRAY_CREATION      = 0x00100003, /* unused */
-	kGUARD_EXC_MOVE_PROVISIONAL_REPLY_PORT  = 0x00100004,
+	kGUARD_EXC_MOVE_WEAK_REPLY_PORT         = 0x00100004,
 	kGUARD_EXC_REPLY_PORT_SINGLE_SO_RIGHT   = 0x00100005,
 	kGUARD_EXC_MOD_REFS_NON_FATAL           = 1u << 21,
-	kGUARD_EXC_IMMOVABLE_NON_FATAL          = 1u << 22, /* unused*/
+	kGUARD_EXC_IMMOVABLE_NON_FATAL          = 1u << 22, /* unused */
 };
 
 #define MAX_FATAL_kGUARD_EXC_CODE               kGUARD_EXC_MSG_FILTERED
 #define MAX_OPTIONAL_kGUARD_EXC_CODE            kGUARD_EXC_RCV_INVALID_NAME
 
+/* Temporary! Should be removed after rdar://166892063 */
+#define kGUARD_EXC_PROVISIONAL_REPLY_PORT       kGUARD_EXC_WEAK_REPLY_PORT
+#define kGUARD_EXC_MOVE_PROVISIONAL_REPLY_PORT  kGUARD_EXC_MOVE_WEAK_REPLY_PORT
+
 
 /*
  * Mach port guard flags.