Updated nullability annotations in jre_emul's native headers.

PiperOrigin-RevId: 733856216

Author: tomball

jre_emul/Classes/IOSArray.h

@@ -23,12 +23,19 @@
 
 #import <Foundation/NSArray.h>
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability"
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
 @class IOSClass;
 
 /**
  * An abstract class that represents a Java array.  Like a Java array,
  * an IOSArray is fixed-size but its elements are mutable.
  */
+NS_ASSUME_NONNULL_BEGIN
 @interface IOSArray<__covariant ObjectType> : NSMutableArray<ObjectType> {
  @public
   /**
@@ -59,6 +66,7 @@
 - (void *)buffer;
 
 @end
+NS_ASSUME_NONNULL_END
 
 CF_EXTERN_C_BEGIN
 void IOSArray_throwOutOfBoundsWithMsg(jint size, jint index);
@@ -80,4 +88,7 @@ __attribute__((always_inline)) inline void IOSArray_checkRange(
   }
 }
 
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
 #endif // IOSARRAY_H

jre_emul/Classes/IOSArrayClass.h

@@ -24,6 +24,13 @@
 
 #import "IOSClass.h"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability"
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
 @interface IOSArrayClass : IOSClass {
   // An IOSClass is used instead of a Class so a IOSPrimitiveClass can be used.
   IOSClass *componentType_;
@@ -32,5 +39,10 @@
 - (instancetype)initWithComponentType:(IOSClass *)type;
 
 @end
+NS_ASSUME_NONNULL_END
+
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
 
 #endif // _IOSArrayClass_H_

jre_emul/Classes/IOSClass.h

@@ -29,6 +29,12 @@
 #import "java/lang/reflect/GenericDeclaration.h"
 #import "java/lang/reflect/Type.h"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability"
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
 @class IOSObjectArray;
 @class JavaLangClassLoader;
 @class JavaLangReflectConstructor;
@@ -45,6 +51,7 @@
  * instances: those representing real classes and interfaces, those
  * representing primitive types, and those representing array classes.
  */
+NS_ASSUME_NONNULL_BEGIN
 @interface IOSClass : NSObject <JavaLangReflectAnnotatedElement,
     JavaLangReflectGenericDeclaration, JavaIoSerializable,
     JavaLangReflectType, NSCopying> {
@@ -99,17 +106,17 @@
 
 // Class.getMethod(String, Class...)
 - (JavaLangReflectMethod *)getMethod:(NSString *)name
-                      parameterTypes:(IOSObjectArray *)types;
+                      parameterTypes:(nullable IOSObjectArray *)types;
 
 // Class.getDeclaredMethod(String, Class...)
 - (JavaLangReflectMethod *)getDeclaredMethod:(NSString *)name
-                              parameterTypes:(IOSObjectArray *)types;
+                              parameterTypes:(nullable IOSObjectArray *)types;
 
 // Class.getDeclaredConstructor(Class...)
-- (JavaLangReflectConstructor *)getDeclaredConstructor:(IOSObjectArray *)types;
+- (JavaLangReflectConstructor *)getDeclaredConstructor:(nullable IOSObjectArray *)types;
 
 // Class.getConstructor(Class)
-- (JavaLangReflectConstructor *)getConstructor:(IOSObjectArray *)types;
+- (JavaLangReflectConstructor *)getConstructor:(nullable IOSObjectArray *)types;
 
 // Class.getConstructors()
 - (IOSObjectArray *)getConstructors;
@@ -130,10 +137,10 @@
 + (IOSClass *)forName:(NSString *)className;
 + (IOSClass *)forName:(NSString *)className
            initialize:(jboolean)load
-          classLoader:(JavaLangClassLoader *)loader;
+          classLoader:(nullable JavaLangClassLoader *)loader;
 
 // Class.cast(Object)
-- (id)cast:(id)throwable;
+- (id)cast:(nullable id)throwable;
 
 // Class.getEnclosingClass()
 - (IOSClass *)getEnclosingClass;
@@ -154,9 +161,8 @@
 - (IOSObjectArray *)getGenericInterfaces;
 - (IOSObjectArray *)getTypeParameters;
 
-- (id<JavaLangAnnotationAnnotation>)
-      getAnnotationWithIOSClass:(IOSClass *)annotationClass;
-- (jboolean)isAnnotationPresentWithIOSClass:(IOSClass *)annotationType;
+- (id<JavaLangAnnotationAnnotation>)getAnnotationWithIOSClass:(nullable IOSClass *)annotationClass;
+- (jboolean)isAnnotationPresentWithIOSClass:(nullable IOSClass *)annotationType;
 - (IOSObjectArray *)getAnnotations;
 - (IOSObjectArray *)getDeclaredAnnotations;
 - (id<JavaLangAnnotationAnnotation>)
@@ -252,4 +258,10 @@ J2OBJC_STATIC_INIT(IOSClass)
 
 J2OBJC_TYPE_LITERAL_HEADER(IOSClass)
 
+NS_ASSUME_NONNULL_END
+
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
+
 #endif // _IOSClass_H_

jre_emul/Classes/IOSConcreteClass.h

@@ -23,6 +23,13 @@
 #import "IOSClass.h"
 #import "IOSMetadata.h"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability"
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
 @interface IOSConcreteClass : IOSClass {
   Class class_;
 }
@@ -32,5 +39,10 @@
 - (instancetype)initWithClass:(Class)cls;
 
 @end
+NS_ASSUME_NONNULL_END
+
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
 
 #endif // _IOSConcreteClass_H_

jre_emul/Classes/IOSObjectArray.h

@@ -24,14 +24,21 @@
 
 #import "IOSArray.h"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability"
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
 @class IOSClass;
 @class IOSObjectArray;
 
 /**
  * An emulation class that represents a Java object array.  Like a Java array,
  * an IOSObjectArray is fixed-size but its elements are mutable.
  */
-@interface IOSObjectArray<__covariant ObjectType> : IOSArray<ObjectType> {
+NS_ASSUME_NONNULL_BEGIN
+@interface IOSObjectArray<__covariant ObjectType> : IOSArray <ObjectType> {
  @public
   /**
    * The type of elements in this array.
@@ -46,15 +53,15 @@
   ObjectType __strong buffer_[0] __attribute__((aligned(__alignof__(volatile_id))));
 }
 
-@property (readonly) IOSClass *elementType;
+@property(readonly) IOSClass *elementType;
 
 /** Create an array from a C object array, length, and type. */
-+ (instancetype)newArrayWithObjects:(const ObjectType *)objects
++ (instancetype)newArrayWithObjects:(const _Nonnull ObjectType *_Nonnull)objects
                               count:(NSUInteger)count
                                type:(IOSClass *)type;
 
 /** Create an autoreleased array from a C object array, length, and type. */
-+ (instancetype)arrayWithObjects:(const ObjectType *)objects
++ (instancetype)arrayWithObjects:(const _Nonnull ObjectType *_Nonnull)objects
                            count:(NSUInteger)count
                             type:(IOSClass *)type;
 
@@ -101,18 +108,19 @@
  * @throws IndexOutOfBoundsException
  * if the specified length is greater than the array size.
  */
-- (void)getObjects:(NSObject **)buffer length:(NSUInteger)length;
+- (void)getObjects:(NSObject *_Nonnull *_Nonnull)buffer length:(NSUInteger)length;
 
 @end
+NS_ASSUME_NONNULL_END
 
 /**
  * Gets element at a specified index, functional equivalent to objectAtIndex:.
  * @throws IndexOutOfBoundsException
  * if index is out of range
  * @return the element at index.
  */
-__attribute__((always_inline)) inline id IOSObjectArray_Get(
-    __unsafe_unretained IOSObjectArray *array, jint index) {
+__attribute__((always_inline)) inline id _Nullable IOSObjectArray_Get(
+    __unsafe_unretained IOSObjectArray *_Nonnull array, jint index) {
   IOSArray_checkIndex(array->size_, index);
   return ALWAYS_RETAINED_AUTORELEASED_RETURN_VALUE(array->buffer_[index]);
 }
@@ -123,7 +131,8 @@ __attribute__((always_inline)) inline id IOSObjectArray_Get(
  * if index is out of range
  * @return the replacement object.
  */
-FOUNDATION_EXPORT id IOSObjectArray_Set(IOSObjectArray *array, NSUInteger index, id value);
+FOUNDATION_EXPORT id _Nullable IOSObjectArray_Set(IOSObjectArray *_Nonnull array, NSUInteger index,
+                                                  id _Nullable value);
 
 /**
  * Sets element at a specified index, same as IOSObjectArray_Set(), but this function
@@ -132,22 +141,28 @@ FOUNDATION_EXPORT id IOSObjectArray_Set(IOSObjectArray *array, NSUInteger index,
  * if index is out of range
  * @return the replacement object.
  */
-FOUNDATION_EXPORT id IOSObjectArray_SetAndConsume(IOSObjectArray *array, NSUInteger index,
-                                                  id __attribute__((ns_consumed)) value);
+FOUNDATION_EXPORT id _Nullable IOSObjectArray_SetAndConsume(IOSObjectArray *_Nonnull array,
+                                                            NSUInteger index,
+                                                            id _Nullable
+                                                            __attribute__((ns_consumed)) value);
 
 // Internal only. Provides a pointer to an element with the array itself.
 // Used for translating certain compound expressions.
 typedef struct JreArrayRef {
-  __unsafe_unretained IOSObjectArray *arr;
-  __strong id *pValue;
+  __unsafe_unretained IOSObjectArray *_Nonnull arr;
+  __strong id _Nonnull *_Nullable pValue;
 } JreArrayRef;
 
 // Internal only functions.
 __attribute__((always_inline)) inline JreArrayRef IOSObjectArray_GetRef(
-    __unsafe_unretained IOSObjectArray *array, jint index) {
+    __unsafe_unretained IOSObjectArray *_Nonnull array, jint index) {
   IOSArray_checkIndex(array->size_, index);
-  return (JreArrayRef){ .arr = array, .pValue = &array->buffer_[index] };
+  return (JreArrayRef){.arr = array, .pValue = &array->buffer_[index]};
 }
-FOUNDATION_EXPORT id IOSObjectArray_SetRef(JreArrayRef ref, id value);
+FOUNDATION_EXPORT id _Nullable IOSObjectArray_SetRef(JreArrayRef ref, id _Nullable value);
+
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
 
-#endif // IOSObjectArray_H
+#endif  // IOSObjectArray_H