Updated nullability annotations in jre_emul's native headers.

PiperOrigin-RevId: 733856216

Author: tomball

jre_emul/Classes/IOSArray.h

@@ -23,12 +23,18 @@
 
 #import <Foundation/NSArray.h>
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#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 +65,7 @@
 - (void *)buffer;
 
 @end
+NS_ASSUME_NONNULL_END
 
 CF_EXTERN_C_BEGIN
 void IOSArray_throwOutOfBoundsWithMsg(jint size, jint index);
@@ -80,4 +87,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,13 +24,22 @@
 
 #import "IOSClass.h"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
 @interface IOSArrayClass : IOSClass {
   // An IOSClass is used instead of a Class so a IOSPrimitiveClass can be used.
-  IOSClass *componentType_;
+  IOSClass *_Nonnull componentType_;
 }
 
-- (instancetype)initWithComponentType:(IOSClass *)type;
+- (instancetype)initWithComponentType:(IOSClass * _Nonnull)type;
 
 @end
 
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
+
 #endif // _IOSArrayClass_H_

jre_emul/Classes/IOSClass.h

@@ -29,6 +29,11 @@
 #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-completeness"
+#endif
+
 @class IOSObjectArray;
 @class JavaLangClassLoader;
 @class JavaLangReflectConstructor;
@@ -45,6 +50,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 +105,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 +136,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 +160,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>)
@@ -219,7 +224,7 @@ CF_EXTERN_C_BEGIN
 IOSClass *IOSClass_forName_(NSString *className);
 // Class.forName(String, boolean, ClassLoader)
 IOSClass *IOSClass_forName_initialize_classLoader_(
-    NSString *className, jboolean load, JavaLangClassLoader *loader);
+    NSString *className, jboolean load, JavaLangClassLoader * _Nullable loader);
 
 // Lookup a IOSClass from its associated ObjC class, protocol or component type.
 IOSClass *IOSClass_fromClass(Class cls);
@@ -252,4 +257,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,14 +23,23 @@
 #import "IOSClass.h"
 #import "IOSMetadata.h"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
 @interface IOSConcreteClass : IOSClass {
-  Class class_;
+  Class _Nonnull class_;
 }
 
-- (instancetype)initWithClass:(Class)cls
-                     metadata:(const J2ObjcClassInfo *)metadata;
-- (instancetype)initWithClass:(Class)cls;
+- (instancetype)initWithClass:(Class _Nonnull)cls
+                     metadata:(const J2ObjcClassInfo * _Nonnull)metadata;
+- (instancetype)initWithClass:(Class _Nonnull)cls;
 
 @end
 
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
+
 #endif // _IOSConcreteClass_H_

jre_emul/Classes/IOSMetadata.h

@@ -24,6 +24,11 @@
 
 #import "J2ObjC_types.h"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
 // Current metadata structure version
 #define J2OBJC_METADATA_VERSION 7
 
@@ -88,4 +93,8 @@ typedef struct J2ObjcClassInfo {
   ptr_idx annotationsIdx;
 } J2ObjcClassInfo;
 
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
+
 #endif  // JreEmulation_IOSMetadata_h

jre_emul/Classes/IOSObjectArray.h

@@ -24,14 +24,20 @@
 
 #import "IOSArray.h"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#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 +52,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,7 +107,7 @@
  * @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
 
@@ -111,8 +117,8 @@
  * 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 +129,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 +139,30 @@ 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);
+
+NS_ASSUME_NONNULL_END
+
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
 
-#endif // IOSObjectArray_H
+#endif  // IOSObjectArray_H

jre_emul/Classes/IOSPrimitiveArray.h

@@ -36,6 +36,13 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wzero-length-array"
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
 @class JavaLangBoolean;
 @class JavaLangByte;
 @class JavaLangCharacter;
@@ -774,9 +781,12 @@ __attribute__((always_inline)) inline jdouble *IOSDoubleArray_GetRef(
   return &array->buffer_[index];
 }
 
+NS_ASSUME_NONNULL_END
 
-#undef PRIMITIVE_ARRAY_INTERFACE
-#undef PRIMITIVE_ARRAY_C_INTERFACE
-
+#if __has_feature(nullability)
 #pragma clang diagnostic pop
+#endif
+
+#pragma clang diagnostic pop // ignored "-Wzero-length-array"
+
 #endif // IOSPrimitiveArray_H

jre_emul/Classes/IOSPrimitiveClass.h

@@ -28,14 +28,14 @@
 // be used with Java reflection routines.  This class is minimal because Java
 // primitive types have/need little runtime support, other than their name.
 @interface IOSPrimitiveClass : IOSClass {
-  NSString *name_;
-  NSString *type_;
+  NSString * _Nonnull name_;
+  NSString * _Nonnull type_;
 }
 
-- (instancetype)initWithName:(NSString *)name type:(NSString *)type;
+- (instancetype)initWithName:(NSString * _Nonnull)name type:(NSString * _Nonnull)type;
 
 // For a primitive type, return its associated wrapper class.
-- (IOSClass *)wrapperClass;
+- (IOSClass * _Nonnull)wrapperClass;
 
 @end
 

jre_emul/Classes/IOSProtocolClass.h

@@ -24,7 +24,7 @@
 
 @interface IOSProtocolClass : IOSClass
 
-- (instancetype)initWithProtocol:(Protocol *)protocol;
+- (instancetype)initWithProtocol:(Protocol * _Nonnull)protocol;
 
 @end