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/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
 

jre_emul/Classes/J2ObjC_common.h

@@ -28,6 +28,11 @@
 #define __has_feature(x) 0  // Compatibility with non-clang compilers.
 #endif
 
+#if __has_feature(nullability)
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wnullability-completeness"
+#endif
+
 # ifndef OBJC_METHOD_FAMILY_NONE
 #  if __has_attribute(objc_method_family)
 #   define OBJC_METHOD_FAMILY_NONE __attribute__((objc_method_family(none)))
@@ -260,8 +265,7 @@ J2OBJC_VOLATILE_ACCESS_DEFN(Double, jdouble)
  * @define J2OBJC_TYPE_LITERAL_HEADER
  * @param TYPE The name of the type to declare the accessor for.
  */
-#define J2OBJC_TYPE_LITERAL_HEADER(TYPE) \
-  FOUNDATION_EXPORT IOSClass *TYPE##_class_(void);
+#define J2OBJC_TYPE_LITERAL_HEADER(TYPE) FOUNDATION_EXPORT IOSClass *_Nonnull TYPE##_class_(void);
 
 /*!
  * Defines the type literal accessor for a class or enum type. This macro should
@@ -271,7 +275,7 @@ J2OBJC_VOLATILE_ACCESS_DEFN(Double, jdouble)
  * @param TYPE The name of the type to define the accessor for.
  */
 #define J2OBJC_CLASS_TYPE_LITERAL_SOURCE(TYPE) \
-  IOSClass *TYPE##_class_(void) {              \
+  IOSClass *_Nonnull TYPE##_class_(void) {     \
     static IOSClass *cls;                      \
     static dispatch_once_t token;              \
     TYPE##_initialize();                       \
@@ -289,7 +293,7 @@ J2OBJC_VOLATILE_ACCESS_DEFN(Double, jdouble)
  * @param TYPE The name of the type to define the accessor for.
  */
 #define J2OBJC_INTERFACE_TYPE_LITERAL_SOURCE(TYPE)  \
-  IOSClass *TYPE##_class_(void) {                   \
+  IOSClass *_Nonnull TYPE##_class_(void) {          \
     static IOSClass *cls;                           \
     static dispatch_once_t token;                   \
     TYPE##_initialize();                            \
@@ -368,4 +372,8 @@ typedef struct J2ObjCClass_t J2ObjCClass_t;
 #define J2OBJC_CLASS_DECLARATION(name) \
     extern const J2ObjCClass_t J2OBJC_CLASS_SYMBOL(name)
 
+#if __has_feature(nullability)
+#pragma clang diagnostic pop
+#endif
+
 #endif // _J2OBJC_COMMON_H_

jre_emul/Classes/JavaObject.h

@@ -30,10 +30,10 @@
 @protocol JavaObject <NSObject>
 
 // Returns a copy of the object, if it implements java.lang.Cloneable.
-- (id)java_clone;
+- (id _Nonnull)java_clone;
 
 // Returns the IOSClass of the receiver.
-- (IOSClass *)java_getClass;
+- (IOSClass * _Nonnull)java_getClass;
 
 // Wakes up a waiting thread (if any).
 - (void)java_notify;