Annotate Proxy and ExecutionException for nullness

Author: cpovirk

src/java.base/share/classes/java/lang/reflect/Proxy.java

@@ -25,6 +25,9 @@
 
 package java.lang.reflect;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.framework.qual.AnnotatedFor;
+
 import java.lang.module.ModuleDescriptor;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -282,6 +285,7 @@
  * @revised 9
  * @spec JPMS
  */
+@AnnotatedFor({"nullness"})
 public class Proxy implements java.io.Serializable {
     private static final long serialVersionUID = -2222568056686623797L;
 
@@ -373,7 +377,7 @@ protected Proxy(InvocationHandler h) {
      */
     @Deprecated
     @CallerSensitive
-    public static Class<?> getProxyClass(ClassLoader loader,
+    public static Class<?> getProxyClass(@Nullable ClassLoader loader,
                                          Class<?>... interfaces)
         throws IllegalArgumentException
     {
@@ -400,7 +404,7 @@ public static Class<?> getProxyClass(ClassLoader loader,
      * @return  a Constructor of the proxy class taking single
      *          {@code InvocationHandler} parameter
      */
-    private static Constructor<?> getProxyConstructor(Class<?> caller,
+    private static Constructor<?> getProxyConstructor(@Nullable Class<?> caller,
                                                       ClassLoader loader,
                                                       Class<?>... interfaces)
     {
@@ -991,7 +995,7 @@ private static Module getDynamicModule(ClassLoader loader) {
      * @spec JPMS
      */
     @CallerSensitive
-    public static Object newProxyInstance(ClassLoader loader,
+    public static Object newProxyInstance(@Nullable ClassLoader loader,
                                           Class<?>[] interfaces,
                                           InvocationHandler h) {
         Objects.requireNonNull(h);
@@ -1008,7 +1012,7 @@ public static Object newProxyInstance(ClassLoader loader,
         return newProxyInstance(caller, cons, h);
     }
 
-    private static Object newProxyInstance(Class<?> caller, // null if no SecurityManager
+    private static Object newProxyInstance(@Nullable Class<?> caller, // null if no SecurityManager
                                            Constructor<?> cons,
                                            InvocationHandler h) {
         /*

src/java.base/share/classes/java/util/Iterator.java

@@ -64,7 +64,7 @@
 @CFComment({"nullness: This @Covariant annotation is sound, but it would not be sound on",
             "ListIterator (a subclass of Iterator), which supports a set operation."
 })
-@AnnotatedFor({"lock"})
+@AnnotatedFor({"lock", "nullness"})
 @Covariant({0})
 public interface Iterator<E> {
     /**

src/java.base/share/classes/java/util/concurrent/ExecutionException.java

@@ -35,6 +35,10 @@
 
 package java.util.concurrent;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.dataflow.qual.SideEffectFree;
+import org.checkerframework.framework.qual.AnnotatedFor;
+
 /**
  * Exception thrown when attempting to retrieve the result of a task
  * that aborted by throwing an exception. This exception can be
@@ -44,6 +48,7 @@
  * @since 1.5
  * @author Doug Lea
  */
+@AnnotatedFor({"nullness"})
 public class ExecutionException extends Exception {
     private static final long serialVersionUID = 7830266012832686185L;
 
@@ -52,6 +57,7 @@ public class ExecutionException extends Exception {
      * The cause is not initialized, and may subsequently be
      * initialized by a call to {@link #initCause(Throwable) initCause}.
      */
+    @SideEffectFree
     protected ExecutionException() { }
 
     /**
@@ -61,7 +67,8 @@ protected ExecutionException() { }
      *
      * @param message the detail message
      */
-    protected ExecutionException(String message) {
+    @SideEffectFree
+    protected ExecutionException(@Nullable String message) {
         super(message);
     }
 
@@ -73,7 +80,8 @@ protected ExecutionException(String message) {
      * @param  cause the cause (which is saved for later retrieval by the
      *         {@link #getCause()} method)
      */
-    public ExecutionException(String message, Throwable cause) {
+    @SideEffectFree
+    public ExecutionException(@Nullable String message, @Nullable Throwable cause) {
         super(message, cause);
     }
 
@@ -86,7 +94,8 @@ public ExecutionException(String message, Throwable cause) {
      * @param  cause the cause (which is saved for later retrieval by the
      *         {@link #getCause()} method)
      */
-    public ExecutionException(Throwable cause) {
+    @SideEffectFree
+    public ExecutionException(@Nullable Throwable cause) {
         super(cause);
     }
 }