Update to EISOP 3.40-eisop1 from 3.39-eisop1

README.md

@@ -107,23 +107,24 @@ resolve conflicts.  Then, discard the branch in the fork of jdk17u.
 The java.base module contains a copy of the Checker Framework qualifiers (type annotations).
 To update that copy, run from this directory:
 
+```
 (cd $CHECKERFRAMEWORK && rm -rf checker-qual/build/libs && ./gradlew :checker-qual:sourcesJar) && \
-rm -f checker-qual.jar && \
-cp -p $CHECKERFRAMEWORK/checker-qual/build/libs/checker-qual-*-sources.jar checker-qual.jar && \
+rm -f checker-qual-sources.jar && \
+cp -p $CHECKERFRAMEWORK/checker-qual/build/libs/checker-qual-*-sources.jar checker-qual-sources.jar && \
 (cd src/java.base/share/classes && rm -rf org/checkerframework && \
-  unzip ../../../../checker-qual.jar -x 'META-INF*' && \
-  rm -f org/checkerframework/checker/signedness/SignednessUtilExtra.java && \
+  unzip ../../../../checker-qual-sources.jar -x 'META-INF*' && \
   chmod -R u+w org/checkerframework) && \
-jar tf checker-qual.jar | grep '\.java$' | sed 's/\/[^/]*\.java/;/' | sed 's/\//./g' | sed 's/^/    exports /' | sort | uniq
+jar tf checker-qual-sources.jar | grep '\.java$' | sed 's/\/[^/]*\.java/;/' | sed 's/\//./g' | sed 's/^/    exports /' | sort | uniq
+```
 
-Copy the exports lines that were printed by the last command to
-src/java.base/share/classes/module-info.java .
-Commit the changes, including the changed top-level `checker-qual.jar` file.
+Copy/update the exports lines that were printed by the last command to
+`src/java.base/share/classes/module-info.java` .
+Commit the changes. Do not include the top-level `checker-qual-source.jar` file.
 
 
 ## The typetools/jdk17u repository
 
-The typetools/jdk17u repository is a merge of `openjdk/jdk17u` and `typetools/jdk`.
+The `typetools/jdk17u` repository is a merge of `openjdk/jdk17u` and `typetools/jdk`.
 That is, it is a fork of `openjdk/jdk17u`, with Checker Framework type annotations.
 
 **Do not edit the `typetools/jdk17u` repository.**
@@ -150,6 +151,7 @@ Clone jdk${VER}u repositories into, say, $t/libraries/ .
 Determine the last commit in both openjdk:jdk and in openjdk:jdk${VER}u:
 run `git log --graph | tac` on both and find the common prefix.
 
+```
 last_common_commit=d562d3fcbe22a0443037c5b447e1a41401275814
 cd $t/libraries
 git clone -- git@github.com:openjdk/jdk.git jdk-fork-openjdk-commit-${last_common_commit}
@@ -158,7 +160,7 @@ git reset --hard ${last_common_commit}
 
 cd $t/libraries/jdk-fork-${USER}-branch-jdk${VER}
 git pull ../jdk-fork-openjdk-commit-${last_common_commit}
-
+```
 
 
 ## Design

make/CompileInterimLangtools.gmk

@@ -83,7 +83,7 @@ define SetupInterimModule
       DISABLED_WARNINGS := module options, \
       JAVAC_FLAGS := \
           --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
-          -cp $(TOPDIR)/checker-qual.jar \
+          -cp $(TOPDIR)/src/java.base/share/classes/ \
           --add-reads $1.interim=ALL-UNNAMED \
           $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
           --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \

make/autoconf/spec.gmk.in

@@ -672,7 +672,7 @@ INTERIM_LANGTOOLS_ARGS := \
     --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
     --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
     --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
-    -cp $(TOPDIR)/checker-qual.jar \
+    -cp $(TOPDIR)/src/java.base/share/classes/ \
     $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
     #
 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main

src/java.base/share/classes/java/io/DataOutput.java

@@ -28,6 +28,7 @@
 import org.checkerframework.checker.index.qual.IndexOrHigh;
 import org.checkerframework.checker.index.qual.LTLengthOf;
 import org.checkerframework.checker.index.qual.NonNegative;
+import org.checkerframework.checker.signedness.qual.PolySigned;
 import org.checkerframework.framework.qual.AnnotatedFor;
 
 /**
@@ -99,7 +100,7 @@ public interface DataOutput {
      * @param      len   the number of bytes to write.
      * @throws     IOException  if an I/O error occurs.
      */
-    void write(byte b[], @IndexOrHigh({"#1"}) int off, @LTLengthOf(value={"#1"}, offset={"#2 - 1"}) @NonNegative int len) throws IOException;
+    void write(@PolySigned byte b[], @IndexOrHigh({"#1"}) int off, @LTLengthOf(value={"#1"}, offset={"#2 - 1"}) @NonNegative int len) throws IOException;
 
     /**
      * Writes a {@code boolean} value to this output stream.

src/java.base/share/classes/java/io/ObjectInput.java

@@ -30,6 +30,7 @@
 import org.checkerframework.checker.index.qual.LTEqLengthOf;
 import org.checkerframework.checker.index.qual.LTLengthOf;
 import org.checkerframework.checker.index.qual.NonNegative;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.framework.qual.AnnotatedFor;
 
 /**
@@ -54,7 +55,7 @@ public interface ObjectInput extends DataInput, AutoCloseable {
      * @throws    IOException If any of the usual Input/Output
      *            related exceptions occur.
      */
-    public Object readObject()
+    public @Nullable Object readObject()
         throws ClassNotFoundException, IOException;
 
     /**

src/java.base/share/classes/java/io/ObjectInputStream.java

@@ -478,7 +478,7 @@ protected ObjectInputStream() throws IOException, SecurityException {
      *          stream instead of objects.
      * @throws  IOException Any of the usual Input/Output related exceptions.
      */
-    public final Object readObject()
+    public final @Nullable Object readObject()
         throws IOException, ClassNotFoundException {
         return readObject(Object.class);
     }
@@ -558,7 +558,7 @@ private final Object readObject(Class<?> type)
      * @see #readObject()
      * @since 1.2
      */
-    protected Object readObjectOverride()
+    protected @Nullable Object readObjectOverride()
         throws IOException, ClassNotFoundException
     {
         return null;
@@ -613,7 +613,7 @@ protected Object readObjectOverride()
      * @throws  IOException if an I/O error occurs during deserialization
      * @since   1.4
      */
-    public Object readUnshared() throws IOException, ClassNotFoundException {
+    public @Nullable Object readUnshared() throws IOException, ClassNotFoundException {
         // if nested read, passHandle contains handle of enclosing object
         int outerHandle = passHandle;
         try {
@@ -1260,7 +1260,7 @@ public String readUTF() throws IOException {
      * @return the deserialization filter for the stream; may be null
      * @since 9
      */
-    public final ObjectInputFilter getObjectInputFilter() {
+    public final @Nullable ObjectInputFilter getObjectInputFilter() {
         return serialFilter;
     }
 
@@ -1345,7 +1345,7 @@ public final ObjectInputFilter getObjectInputFilter() {
      *       if the filter has already been set.
      * @since 9
      */
-    public final void setObjectInputFilter(ObjectInputFilter filter) {
+    public final void setObjectInputFilter(@Nullable ObjectInputFilter filter) {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {

src/java.base/share/classes/java/io/ObjectOutputStream.java

@@ -383,7 +383,7 @@ public final void writeObject(@Nullable Object obj) throws IOException {
      * @see #writeObject(Object)
      * @since 1.2
      */
-    protected void writeObjectOverride(Object obj) throws IOException {
+    protected void writeObjectOverride(@Nullable Object obj) throws IOException {
     }
 
     /**

src/java.base/share/classes/java/io/OutputStream.java

@@ -25,11 +25,11 @@
 
 package java.io;
 
-import org.checkerframework.checker.mustcall.qual.MustCall;
 import org.checkerframework.checker.index.qual.IndexOrHigh;
 import org.checkerframework.checker.index.qual.LTLengthOf;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.interning.qual.UsesObjectEquals;
+import org.checkerframework.checker.mustcall.qual.MustCall;
 import org.checkerframework.checker.signedness.qual.PolySigned;
 import org.checkerframework.framework.qual.AnnotatedFor;
 
@@ -88,12 +88,12 @@ private void ensureOpen() throws IOException {
             }
 
             @Override
-            public void write(int b) throws IOException {
+            public void write(@PolySigned int b) throws IOException {
                 ensureOpen();
             }
 
             @Override
-            public void write(byte b[], int off, int len) throws IOException {
+            public void write(@PolySigned byte b[], int off, int len) throws IOException {
                 Objects.checkFromIndexSize(off, len, b.length);
                 ensureOpen();
             }

src/java.base/share/classes/java/io/PrintWriter.java

@@ -76,7 +76,7 @@ public class PrintWriter extends Writer {
      *
      * @since 1.2
      */
-    protected Writer out;
+    protected @Nullable Writer out;
 
     private final boolean autoFlush;
     private boolean trouble = false;

src/java.base/share/classes/java/lang/Byte.java

@@ -166,7 +166,7 @@ private ByteCache() {}
     @Pure
     @StaticallyExecutable
     @IntrinsicCandidate
-    public static @Interned @NewObject @PolyIndex @PolyValue @PolySigned Byte valueOf(@PolyIndex @PolyValue @PolySigned byte b) {
+    public static @Interned @NewObject @PolyIndex @PolySigned @PolyValue Byte valueOf(@PolyIndex @PolySigned @PolyValue byte b) {
         final int offset = 128;
         return ByteCache.cache[(int)b + offset];
     }
@@ -380,7 +380,7 @@ public static byte parseByte(String s) throws NumberFormatException {
      */
     @StaticallyExecutable
     @Deprecated(since="9", forRemoval = true)
-    public @PolyIndex @PolyValue @PolySigned Byte(@PolyIndex @PolyValue @PolySigned byte value) {
+    public @PolyIndex @PolySigned @PolyValue Byte(@PolyIndex @PolySigned @PolyValue byte value) {
         this.value = value;
     }
 
@@ -415,7 +415,7 @@ public Byte(String s) throws NumberFormatException {
     @Pure
     @StaticallyExecutable
     @IntrinsicCandidate
-    public @PolyIndex @PolyValue @PolySigned byte byteValue(@PolyIndex @PolyValue @PolySigned Byte this) {
+    public @PolyIndex @PolySigned @PolyValue byte byteValue(@PolyIndex @PolySigned @PolyValue Byte this) {
         return value;
     }
 
@@ -426,7 +426,7 @@ public Byte(String s) throws NumberFormatException {
      */
     @Pure
     @StaticallyExecutable
-    public @PolyIndex @PolyValue @PolySigned short shortValue(@PolyIndex @PolyValue @PolySigned Byte this) {
+    public @PolyIndex @PolySigned @PolyValue short shortValue(@PolyIndex @PolySigned @PolyValue Byte this) {
         return (short)value;
     }
 
@@ -437,7 +437,7 @@ public Byte(String s) throws NumberFormatException {
      */
     @Pure
     @StaticallyExecutable
-    public @PolyIndex @PolyValue @PolySigned int intValue(@PolyIndex @PolyValue @PolySigned Byte this) {
+    public @PolyIndex @PolySigned @PolyValue int intValue(@PolyIndex @PolySigned @PolyValue Byte this) {
         return (int)value;
     }
 
@@ -448,7 +448,7 @@ public Byte(String s) throws NumberFormatException {
      */
     @Pure
     @StaticallyExecutable
-    public @PolyIndex @PolyValue @PolySigned long longValue(@PolyIndex @PolyValue @PolySigned Byte this) {
+    public @PolyIndex @PolySigned @PolyValue long longValue(@PolyIndex @PolySigned @PolyValue Byte this) {
         return (long)value;
     }
 

src/java.base/share/classes/java/lang/Class.java

@@ -36,6 +36,7 @@
 import org.checkerframework.checker.signature.qual.ClassGetName;
 import org.checkerframework.checker.signature.qual.ClassGetSimpleName;
 import org.checkerframework.checker.signature.qual.DotSeparatedIdentifiers;
+import org.checkerframework.checker.signedness.qual.Signed;
 import org.checkerframework.common.reflection.qual.ForName;
 import org.checkerframework.common.reflection.qual.GetConstructor;
 import org.checkerframework.common.reflection.qual.GetMethod;
@@ -3947,7 +3948,7 @@ public Void run() {
      */
     @SuppressWarnings("unchecked")
     @IntrinsicCandidate
-    public @PolyNull T cast(@PolyNull Object obj) {
+    public @PolyNull @Signed T cast(@PolyNull Object obj) {
         if (obj != null && !isInstance(obj))
             throw new ClassCastException(cannotCastMsg(obj));
         return (T) obj;

src/java.base/share/classes/java/lang/ClassLoader.java

@@ -437,7 +437,7 @@ private static String nameAndId(ClassLoader ld) {
      *
      * @since  9
      */
-    protected ClassLoader(String name, ClassLoader parent) {
+    protected ClassLoader(@Nullable String name, @Nullable ClassLoader parent) {
         this(checkCreateClassLoader(name), name, parent);
     }
 
@@ -499,7 +499,7 @@ protected ClassLoader() {
      *
      * @since 9
      */
-    public String getName() {
+    public @Nullable String getName() {
         return name;
     }
 

src/java.base/share/classes/java/lang/Enum.java

@@ -27,13 +27,16 @@
 
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.initialization.qual.UnknownInitialization;
+import org.checkerframework.checker.nullness.qual.UnknownKeyFor;
 import org.checkerframework.checker.lock.qual.GuardSatisfied;
 import org.checkerframework.checker.lock.qual.GuardedByUnknown;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.checker.tainting.qual.Tainted;
 import org.checkerframework.common.value.qual.PolyValue;
 import org.checkerframework.dataflow.qual.Pure;
 import org.checkerframework.dataflow.qual.SideEffectFree;
 import org.checkerframework.framework.qual.AnnotatedFor;
+import org.checkerframework.framework.qual.Covariant;
 
 import java.io.IOException;
 import java.io.InvalidObjectException;
@@ -80,7 +83,8 @@
  * @jls 8.9.3 Enum Members
  * @since   1.5
  */
-@AnnotatedFor({"lock", "nullness", "index", "value"})
+@AnnotatedFor({"lock", "nullness", "index", "value", "tainting"})
+@Covariant(0)
 @SuppressWarnings("serial") // No serialVersionUID needed due to
                             // special-casing of enum classes.
 public abstract class Enum<E extends Enum<E>>
@@ -208,7 +212,7 @@ protected final Object clone(@GuardSatisfied Enum<E> this) throws CloneNotSuppor
      * method is the order in which the constants are declared.
      */
     @SuppressWarnings({"rawtypes"})
-    public final int compareTo(E o) {
+    public final int compareTo(@UnknownKeyFor @Tainted E o) {
         Enum<?> other = (Enum<?>)o;
         Enum<E> self = this;
         if (self.getClass() != other.getClass() && // optimization
@@ -230,7 +234,7 @@ public final int compareTo(E o) {
      *     enum type
      */
     @SuppressWarnings("unchecked")
-    public final Class<E> getDeclaringClass() {
+    public final Class<@Tainted E> getDeclaringClass() {
         Class<?> clazz = getClass();
         Class<?> zuper = clazz.getSuperclass();
         return (zuper == Enum.class) ? (Class<E>)clazz : (Class<E>)zuper;

src/java.base/share/classes/java/lang/Integer.java

@@ -1134,7 +1134,7 @@ private IntegerCache() {}
     @SideEffectFree
     @StaticallyExecutable
     @IntrinsicCandidate
-    public static @NewObject @PolyIndex @PolyValue @PolySigned Integer valueOf(@PolyIndex @PolyValue @PolySigned int i) {
+    public static @NewObject @PolyIndex @PolySigned @PolyValue Integer valueOf(@PolyIndex @PolySigned @PolyValue int i) {
         if (i >= IntegerCache.low && i <= IntegerCache.high)
             return IntegerCache.cache[i + (-IntegerCache.low)];
         return new Integer(i);
@@ -1162,7 +1162,7 @@ private IntegerCache() {}
     @SideEffectFree
     @StaticallyExecutable
     @Deprecated(since="9", forRemoval = true)
-    public @PolyIndex @PolyValue @PolySigned Integer(@PolyIndex @PolyValue @PolySigned int value) {
+    public @PolyIndex @PolySigned @PolyValue Integer(@PolyIndex @PolySigned @PolyValue int value) {
         this.value = value;
     }
 
@@ -1219,7 +1219,7 @@ public Integer(String s) throws NumberFormatException {
     @Pure
     @StaticallyExecutable
     @IntrinsicCandidate
-    public @PolyIndex @PolyValue @PolySigned int intValue(@PolyIndex @PolyValue @PolySigned Integer this) {
+    public @PolyIndex @PolySigned @PolyValue int intValue(@PolyIndex @PolySigned @PolyValue Integer this) {
         return value;
     }
 
@@ -1231,7 +1231,7 @@ public Integer(String s) throws NumberFormatException {
      */
     @Pure
     @StaticallyExecutable
-    public @PolyIndex @PolyValue @PolySigned long longValue(@PolyIndex @PolyValue @PolySigned Integer this) {
+    public @PolyIndex @PolySigned @PolyValue long longValue(@PolyIndex @PolySigned @PolyValue Integer this) {
         return (long)value;
     }
 

src/java.base/share/classes/java/lang/Long.java

@@ -1258,7 +1258,7 @@ private LongCache() {}
     @SideEffectFree
     @StaticallyExecutable
     @IntrinsicCandidate
-    public static @NewObject @PolyValue @PolySigned Long valueOf(@PolyValue @PolySigned long l) {
+    public static @NewObject @PolySigned @PolyValue Long valueOf(@PolySigned @PolyValue long l) {
         final int offset = 128;
         if (l >= -128 && l <= 127) { // will cache
             return LongCache.cache[(int)l + offset];
@@ -1380,7 +1380,7 @@ else if (nm.startsWith("0", index) && nm.length() > 1 + index) {
     @SideEffectFree
     @StaticallyExecutable
     @Deprecated(since="9", forRemoval = true)
-    public @PolyIndex @PolyValue @PolySigned Long(@PolyIndex @PolyValue @PolySigned long value) {
+    public @PolyIndex @PolySigned @PolyValue Long(@PolyIndex @PolySigned @PolyValue long value) {
         this.value = value;
     }
 
@@ -1449,7 +1449,7 @@ public Long(String s) throws NumberFormatException {
     @Pure
     @StaticallyExecutable
     @IntrinsicCandidate
-    public @PolyIndex @PolyValue @PolySigned long longValue(@PolyIndex @PolyValue @PolySigned Long this) {
+    public @PolyIndex @PolySigned @PolyValue long longValue(@PolyIndex @PolySigned @PolyValue Long this) {
         return value;
     }