address CRs

Author: Yifan Zhu

libc/include/llvm-libc-types/pthread_rwlock_t.h

@@ -12,13 +12,13 @@
 #include "llvm-libc-types/__futex_word.h"
 #include "llvm-libc-types/pid_t.h"
 typedef struct {
-  bool __is_pshared;
-  char __preference;
+  unsigned __is_pshared : 1;
+  unsigned __preference : 1;
   int __state;
   pid_t __writier_tid;
   __futex_word __wait_queue_mutex;
-  __futex_word __pending_reader;
-  __futex_word __pending_writer;
+  __futex_word __pending_readers;
+  __futex_word __pending_writers;
   __futex_word __reader_serialization;
   __futex_word __writer_serialization;
 } pthread_rwlock_t;

libc/spec/posix.td

@@ -113,7 +113,8 @@ def POSIX : StandardSpec<"POSIX"> {
   NamedType PThreadRWLockAttrTType = NamedType<"pthread_rwlockattr_t">;
   PtrType PThreadRWLockAttrTPtr = PtrType<PThreadRWLockAttrTType>;
   ConstType ConstPThreadRWLockAttrTPtr = ConstType<PThreadRWLockAttrTPtr>;
-  ConstType ConstRestrictedPThreadRWLockAttrTPtr = ConstType<RestrictedPtrType<PThreadRWLockAttrTType>>;
+  RestrictedPtrType RestrictedPThreadRWLockAttrTPtr = RestrictedPtrType<PThreadRWLockAttrTType>;
+  ConstType ConstRestrictedPThreadRWLockAttrTPtr = ConstType<RestrictedPThreadRWLockAttrTPtr>;
 
   NamedType PThreadMutexAttrTType = NamedType<"pthread_mutexattr_t">;
   PtrType PThreadMutexAttrTPtr = PtrType<PThreadMutexAttrTType>;
@@ -1283,12 +1284,12 @@ def POSIX : StandardSpec<"POSIX"> {
       FunctionSpec<
         "pthread_rwlock_timedrdlock",
         RetValSpec<IntType>,
-        [ArgSpec<RestrictedPThreadRWLockTPtr>, ArgSpec<ConstRestructTimeSpecPtr>]
+        [ArgSpec<RestrictedPThreadRWLockTPtr>, ArgSpec<ConstRestrictStructTimeSpecPtr>]
       >,
       FunctionSpec<
         "pthread_rwlock_timedwrlock",
         RetValSpec<IntType>,
-        [ArgSpec<RestrictedPThreadRWLockTPtr>, ArgSpec<ConstRestructTimeSpecPtr>]
+        [ArgSpec<RestrictedPThreadRWLockTPtr>, ArgSpec<ConstRestrictStructTimeSpecPtr>]
       >,
       FunctionSpec<
         "pthread_rwlock_rdlock",

libc/spec/spec.td

@@ -126,7 +126,8 @@ def TimeTType : NamedType<"time_t">;
 def StructTimeSpec : NamedType<"struct timespec">;
 def StructTimeSpecPtr : PtrType<StructTimeSpec>;
 def ConstStructTimeSpecPtr : ConstType<StructTimeSpecPtr>;
-def ConstRestructTimeSpecPtr : ConstType<RestrictedPtrType<StructTimeSpec>>;
+def RestrictStructTimeSpecPtr : RestrictedPtrType<StructTimeSpec>;
+def ConstRestrictStructTimeSpecPtr : ConstType<RestrictStructTimeSpecPtr>;
 
 def BSearchCompareT : NamedType<"__bsearchcompare_t">;
 def QSortCompareT : NamedType<"__qsortcompare_t">;

libc/src/__support/macros/attributes.h

@@ -42,4 +42,10 @@
 #define LIBC_CONSTINIT
 #endif
 
+#ifdef __clang__
+#define LIBC_PREFERED_TYPE(TYPE) [[clang::preferred_type(TYPE)]]
+#else
+#define LIBC_PREFERED_TYPE(TYPE)
+#endif
+
 #endif // LLVM_LIBC_SRC___SUPPORT_MACROS_ATTRIBUTES_H

libc/src/__support/threads/linux/CMakeLists.txt

@@ -54,6 +54,7 @@ add_header_library(
     .raw_mutex
     libc.src.__support.common
     libc.src.__support.OSUtil.osutil
+    libc.src.__support.CPP.limits
   COMPILE_OPTIONS
     -DLIBC_COPT_RWLOCK_DEFAULT_SPIN_COUNT=${LIBC_CONF_RWLOCK_DEFAULT_SPIN_COUNT}
     ${monotonicity_flags}