svn commit: r339622 - in head/sys: compat/freebsd32 kern

[Brooks Davis]

Author: brooks
Date: Mon Oct 22 21:50:43 2018
New Revision: 339622
URL: https://svnweb.freebsd.org/changeset/base/339622

Log:
  Remove __restrict qualifiers from syscalls.master.
  
  The restruct qualifier is intended to aid code generation in the
  compiler, but the only access to storage through these pointers is via
  structs using copyin/copyout and the like which can not be written in C
  or C++ and thus the compiler gains nothing from the qualifiers.
  
  As such, the qualifiers add no value in current usage.
  
  Reviewed by:	kib
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D17574

Modified:
  head/sys/compat/freebsd32/syscalls.master
  head/sys/kern/syscalls.master

Modified: head/sys/compat/freebsd32/syscalls.master
==============================================================================
--- head/sys/compat/freebsd32/syscalls.master	Mon Oct 22 21:26:37 2018	(r339621)
+++ head/sys/compat/freebsd32/syscalls.master	Mon Oct 22 21:50:43 2018	(r339622)
@@ -1051,8 +1051,8 @@
 540	AUE_CHFLAGSAT	NOPROTO	{ int chflagsat(int fd, const char *path, \
 				    u_long flags, int atflag); }
 541	AUE_ACCEPT	NOPROTO	{ int accept4(int s, \
-				    struct sockaddr * __restrict name, \
-				    __socklen_t * __restrict anamelen, \
+				    struct sockaddr *name, \
+				    __socklen_t *anamelen, \
 				    int flags); }
 542	AUE_PIPE	NOPROTO	{ int pipe2(int *fildes, int flags); }
 543	AUE_AIO_MLOCK	STD	{ int freebsd32_aio_mlock( \

Modified: head/sys/kern/syscalls.master
==============================================================================
--- head/sys/kern/syscalls.master	Mon Oct 22 21:26:37 2018	(r339621)
+++ head/sys/kern/syscalls.master	Mon Oct 22 21:50:43 2018	(r339622)
@@ -144,23 +144,23 @@
 				    _Out_writes_bytes_(len) caddr_t buf, \
 				    size_t len, int flags, \
 				    _Out_writes_bytes_opt_(*fromlenaddr) \
-				    struct sockaddr * __restrict from, \
+				    struct sockaddr *from, \
 				    _Inout_opt_ \
-				    __socklen_t * __restrict fromlenaddr); }
+				    __socklen_t *fromlenaddr); }
 30	AUE_ACCEPT	STD	{ int accept(int s, \
 				    _Out_writes_bytes_opt_(*anamelen) \
-				    struct sockaddr * __restrict name, \
+				    struct sockaddr *name, \
 				    _Inout_opt_ \
-				    __socklen_t * __restrict anamelen); }
+				    __socklen_t *anamelen); }
 31	AUE_GETPEERNAME	STD	{ int getpeername(int fdes, \
 				    _Out_writes_bytes_(*alen) \
-				    struct sockaddr * __restrict asa, \
+				    struct sockaddr *asa, \
 				    _Inout_opt_ \
-				    __socklen_t * __restrict alen); }
+				    __socklen_t *alen); }
 32	AUE_GETSOCKNAME	STD	{ int getsockname(int fdes, \
 				    _Out_writes_bytes_(*alen) \
-				    struct sockaddr * __restrict asa, \
-				    _Inout_ __socklen_t * __restrict alen); }
+				    struct sockaddr *asa, \
+				    _Inout_ __socklen_t *alen); }
 33	AUE_ACCESS	STD	{ int access(_In_z_ char *path, int amode); }
 34	AUE_CHFLAGS	STD	{ int chflags(_In_z_ const char *path, \
 				    u_long flags); }
@@ -1273,9 +1273,9 @@
 				    u_long flags, int atflag); }
 541	AUE_ACCEPT	STD	{ int accept4(int s, \
 				    _Out_writes_bytes_opt_(*anamelen) \
-				    struct sockaddr * __restrict name, \
+				    struct sockaddr *name, \
 				    _Inout_opt_ \
-				    __socklen_t * __restrict anamelen, \
+				    __socklen_t *anamelen, \
 				    int flags); }
 542	AUE_PIPE	STD	{ int pipe2(_Out_writes_(2) int *fildes, \
 				    int flags); }