Update to EISOP 3.42-eisop4 from 3.42-eisop3

.gitignore

@@ -40,6 +40,7 @@ docs/tmpapi/
 checker/build-temp
 checker/bin/.do-like-javac
 checker/bin/.scc/
+checker/bin-devel/.git-scripts
 checker/bin-devel/.html-tools
 checker/bin-devel/.plume-scripts
 checker/bin-devel/dockerdir

azure-pipelines.yml

@@ -89,6 +89,8 @@ jobs:
    - plume_lib_jdk21
    # - plume_lib_jdk_latest
    # Not plume_lib_jdk_next
+   - windows_junit_jdk17
+   - jspecify_conformance_jdk21
   pool:
     vmImage: 'ubuntu-latest'
   steps:
@@ -803,6 +805,18 @@ jobs:
     continueOnError: true
     displayName: test-plume-lib.sh
 
+- job: jspecify_conformance_jdk21
+  dependsOn:
+   - junit_jdk21
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: wmdietl/cf-ubuntu-jdk21:latest
+  steps:
+  - checkout: self
+    fetchDepth: 25
+  - bash: ./checker/bin-devel/test-jspecify-conformance.sh
+    displayName: test-jspecify-conformance.sh
+
 ## The downstream jobs are not currently needed because test-downstream.sh is empty.
 # - job: downstream_jdk8
 #   dependsOn:
@@ -901,3 +915,17 @@ jobs:
       fetchDepth: 25
     - bash: ./checker/bin-devel/test-cf-inference.sh
       displayName: test-cf-inference.sh
+- job: windows_junit_jdk17
+  dependsOn:
+    - junit_jdk21
+  pool:
+    vmImage: 'windows-latest'
+  timeoutInMinutes: 90
+  steps:
+    - checkout: self
+      fetchDepth: 25
+    - bash: ./checker/bin-devel/test-cftests-junit.sh
+      displayName: Run all JUnit tests
+      env:
+        JAVA_HOME: $(JAVA_HOME_17_X64)
+        PATH: $(JAVA_HOME_17_X64)/bin:$(PATH)

build.gradle

@@ -22,7 +22,7 @@ plugins {
     // https://docs.gradle.org/current/userguide/eclipse_plugin.html
     id 'eclipse'
     // To show task list as a tree, run: ./gradlew <taskname> taskTree
-    id 'com.dorongold.task-tree' version '2.1.1'
+    id 'com.dorongold.task-tree' version '4.0.0'
 }
 
 apply plugin: 'de.undercouch.download'
@@ -68,6 +68,7 @@ ext {
     // afu = "${annotationTools}/annotation-file-utilities"
 
     jtregHome = "${parentDir}/jtreg"
+    gitScriptsHome = "${project(':checker').projectDir}/bin-devel/.git-scripts"
     plumeScriptsHome = "${project(':checker').projectDir}/bin-devel/.plume-scripts"
     htmlToolsHome = "${project(':checker').projectDir}/bin-devel/.html-tools"
     doLikeJavacHome = "${project(':checker').projectDir}/bin/.do-like-javac"
@@ -79,11 +80,11 @@ ext {
     localRepo = '.git'
 
     versions = [
-        autoValue       : '1.10.4',
-        errorprone      : '2.25.0',
+        autoValue       : '1.11.0',
+        errorprone      : '2.28.0',
         hashmapUtil     : '0.0.1',
         junit           : '4.13.2',
-        lombok          : '1.18.30',
+        lombok          : '1.18.34',
         // plume-util includes a version of reflection-util. When updating ensure the versions are consistent.
         plumeUtil       : '1.9.0',
         reflectionUtil  : '1.1.3',
@@ -158,7 +159,7 @@ allprojects {
     //   * any new checkers have been added, or
     //   * backward-incompatible changes have been made to APIs or elsewhere.
     // To make a snapshot release: ./gradlew publish
-    version '3.42.0-eisop3'
+    version '3.42.0-eisop4'
 
     tasks.withType(JavaCompile).configureEach {
         options.fork = true
@@ -248,6 +249,7 @@ allprojects {
             // If you add any formatters to this block that require dependencies, then you must also
             // add them to spotlessPredeclare block.
             def doNotFormat = [
+                'checker/bin-devel/.git-scripts/**',
                 'checker/bin-devel/.plume-scripts/**',
                 'checker/tests/ainfer-*/annotated/*',
                 'dataflow/manual/examples/',
@@ -504,6 +506,8 @@ allprojects {
                     '-Xep:CanIgnoreReturnValueSuggester:OFF',
                     // Should be turned off when using the Checker Framework.
                     '-Xep:ExtendsObject:OFF',
+                    // For Visitors it is convenient to just pass a Void parameter.
+                    '-Xep:VoidUsed:OFF',
                     // -Werror halts the build if Error Prone issues a warning, which ensures that
                     // the errors get fixed.  On the downside, Error Prone (or maybe the compiler?)
                     // stops as soon as it issues one warning, rather than outputting them all.
@@ -659,7 +663,7 @@ configurations {
 }
 
 dependencies {
-    requireJavadoc 'org.plumelib:require-javadoc:1.0.6'
+    requireJavadoc 'org.plumelib:require-javadoc:1.0.9'
 }
 
 task requireJavadoc(type: JavaExec, group: 'Documentation') {
@@ -804,6 +808,7 @@ def createCloneTask(taskName, url, directory, extraArgs = []) {
 }
 
 
+createCloneTask('getGitScripts', 'https://github.com/eisop-plume-lib/git-scripts.git', gitScriptsHome)
 createCloneTask('getPlumeScripts', 'https://github.com/eisop-plume-lib/plume-scripts.git', plumeScriptsHome)
 createCloneTask('getHtmlTools', 'https://github.com/plume-lib/html-tools.git', htmlToolsHome)
 createCloneTask('getDoLikeJavac', 'https://github.com/opprop/do-like-javac.git', doLikeJavacHome)
@@ -1062,7 +1067,8 @@ subprojects {
         }
 
         // Create a task for each JUnit test class whose name is the same as the JUnit class name.
-        sourceSets.test.allJava.filter { it.path.contains('test/junit') }.forEach { file ->
+        // Regex [\\\\/] matches Unix and Windows directory separators.
+        sourceSets.test.allJava.filter {it.path.matches('.*test[\\\\/]junit.*')}.forEach { file ->
             String junitClassName = file.name.replaceAll('.java', '')
             tasks.create(name: "${junitClassName}", type: Test) {
                 description "Run ${junitClassName} tests."

checker-qual-android/build.gradle

@@ -19,7 +19,11 @@ task copySources(type: Copy) {
 
     into file(layout.buildDirectory.dir("generated/sources/main/java"))
 
-    fileMode(0444)
+    filePermissions {
+        user.read = true
+        group.read = true
+        other.read = true
+    }
 }
 
 sourceSets {

checker-qual/src/main/java/org/checkerframework/framework/qual/TypeUseLocation.java

@@ -18,121 +18,130 @@
  */
 public enum TypeUseLocation {
 
-    /** Apply default annotations to all unannotated raw types of fields. */
+    /** Apply default annotations to unannotated top-level types of fields. */
     FIELD,
 
     /**
-     * Apply default annotations to all unannotated raw types of local variables, casts, and
+     * Apply default annotations to unannotated top-level types of local variables, casts, and
      * instanceof.
      */
     LOCAL_VARIABLE,
 
-    /** Apply default annotations to all unannotated raw types of resource variables. */
+    /** Apply default annotations to unannotated top-level types of resource variables. */
     RESOURCE_VARIABLE,
 
-    /** Apply default annotations to all unannotated raw types of exception parameters. */
+    /** Apply default annotations to unannotated top-level types of exception parameters. */
     EXCEPTION_PARAMETER,
 
-    /** Apply default annotations to all unannotated raw types of receiver types. */
+    /** Apply default annotations to unannotated top-level types of receiver types. */
     RECEIVER,
 
     /**
-     * Apply default annotations to all unannotated raw types of formal parameter types, excluding
+     * Apply default annotations to unannotated top-level types of formal parameter types, excluding
      * the receiver.
      */
     PARAMETER,
 
-    /** Apply default annotations to all unannotated raw types of return types. */
+    /** Apply default annotations to unannotated top-level types of return types. */
     RETURN,
 
-    /** Apply default annotations to all unannotated raw types of constructor result types. */
+    /** Apply default annotations to unannotated top-level types of constructor result types. */
     CONSTRUCTOR_RESULT,
 
     /**
-     * Apply default annotations to unannotated lower bounds for type parameters and wildcards, both
-     * explicit ones in {@code super} clauses, and implicit lower bounds when no explicit {@code
-     * extends} or {@code super} clause is present.
+     * Apply default annotations to unannotated top-level lower bounds of type parameters and
+     * wildcards, both explicit ones in {@code super} clauses, and implicit lower bounds when no
+     * explicit {@code extends} or {@code super} clause is present.
      */
     LOWER_BOUND,
 
     /**
-     * Apply default annotations to unannotated, but explicit lower bounds of wildcards: {@code <?
-     * super C>}. Type parameters have no syntax for explicit lower bound types.
+     * Apply default annotations to unannotated top-level explicit lower bounds of wildcards: {@code
+     * <? super C>}. Type parameters have no syntax for explicit lower bound types.
      */
     EXPLICIT_LOWER_BOUND,
 
     /**
-     * Apply default annotations to unannotated, but implicit lower bounds for type parameters and
+     * Apply default annotations to unannotated implicit lower bounds of type parameters and
      * wildcards: {@code <T>} and {@code <?>}, possibly with explicit upper bounds.
      */
     // Note: no distinction between implicit lower bound when upper bound is explicit or not, in
     // contrast to what we do for upper bounds. We can add that if a type system needs it.
     IMPLICIT_LOWER_BOUND,
 
     /**
-     * Apply default annotations to unannotated upper bounds for type parameters and wildcards: both
-     * explicit ones in {@code extends} clauses, and implicit upper bounds when no explicit {@code
-     * extends} or {@code super} clause is present.
+     * Apply default annotations to unannotated top-level upper bounds of type parameters and
+     * wildcards: both explicit ones in {@code extends} clauses, and implicit upper bounds when no
+     * explicit {@code extends} or {@code super} clause is present.
      *
      * <p>Especially useful for parametrized classes that provide a lot of static methods with the
      * same generic parameters as the class.
      */
     UPPER_BOUND,
 
     /**
-     * Apply default annotations to unannotated, but explicit type parameter and wildcard upper
+     * Apply default annotations to unannotated top-level explicit type parameter and wildcard upper
      * bounds: {@code <T extends C>} and {@code <? extends C>}.
      */
     EXPLICIT_UPPER_BOUND,
 
     /**
-     * Apply default annotations to unannotated, but explicit type parameter upper bounds: {@code <T
-     * extends C>}.
+     * Apply default annotations to unannotated top-level explicit type parameter upper bounds:
+     * {@code <T extends C>}.
      */
     EXPLICIT_TYPE_PARAMETER_UPPER_BOUND,
 
     /**
-     * Apply default annotations to unannotated, but explicit wildcard upper bounds: {@code <?
+     * Apply default annotations to unannotated top-level explicit wildcard upper bounds: {@code <?
      * extends C>}.
      */
     EXPLICIT_WILDCARD_UPPER_BOUND,
 
     /**
-     * Apply default annotations to unannotated upper bounds for type parameters and wildcards
+     * Apply default annotations to unannotated upper bounds of type parameters and wildcards
      * without explicit upper bounds: {@code <T>}, {@code <?>}, and {@code <? super C>}.
      */
     IMPLICIT_UPPER_BOUND,
 
     /**
-     * Apply default annotations to unannotated upper bounds for type parameters without explicit
+     * Apply default annotations to unannotated upper bounds of type parameters without explicit
      * upper bounds: {@code <T>}.
      */
     IMPLICIT_TYPE_PARAMETER_UPPER_BOUND,
 
     /**
-     * Apply default annotations to unannotated upper bounds for wildcards without a super bound:
+     * Apply default annotations to unannotated upper bounds of wildcards without a super bound:
      * {@code <?>}.
      */
     IMPLICIT_WILDCARD_UPPER_BOUND_NO_SUPER,
 
     /**
-     * Apply default annotations to unannotated upper bounds for wildcards with a super bound:
-     * {@code <? super C>}.
+     * Apply default annotations to unannotated upper bounds of wildcards with a super bound: {@code
+     * <? super C>}.
      */
     IMPLICIT_WILDCARD_UPPER_BOUND_SUPER,
 
     /**
-     * Apply default annotations to unannotated upper bounds for wildcards with or without a super
+     * Apply default annotations to unannotated upper bounds of wildcards with or without a super
      * bound: {@code <?>} or {@code <? super C>}.
      */
     IMPLICIT_WILDCARD_UPPER_BOUND,
 
     /**
-     * Apply default annotations to unannotated type variable uses: {@code T}.
+     * Apply default annotations to unannotated type variable uses that are not top-level local
+     * variables: {@code T field} or {@code List<T> local}.
+     *
+     * <p>Such uses of type variables are not flow-sensitively refined and are therefore usually
+     * parametric.
      *
      * <p>To get parametric polymorphism: add a qualifier that is meta-annotated with {@link
      * ParametricTypeVariableUseQualifier} to your type system and use it as default for {@code
      * TYPE_VARIABLE_USE}, which is treated like no annotation on the type variable use.
+     *
+     * <p>We could name this constant {@code TYPE_VARIABLE_USE_NOT_TOP_LEVEL_LOCAL_VARIABLE} and
+     * introduce a separate constant {@code TYPE_VARIABLE_USE_TOP_LEVEL_LOCAL_VARIABLE}. At the
+     * moment we use the {@code LOCAL_VARIABLE} default for unannotated top-level type variable uses
+     * of local variables: {@code T local}.
      */
     TYPE_VARIABLE_USE,
 

checker/bin-devel/Dockerfile-ubuntu-jdk17

@@ -51,8 +51,6 @@ ENV PATH="/apache-maven-3.9.5/bin:$PATH"
 
 RUN pip3 install --no-cache-dir lithium-reducer PyGithub pyyaml
 
-RUN pip3 install --no-cache-dir lithium-reducer PyGithub pyyaml
-
 RUN export DEBIAN_FRONTEND=noninteractive \
 && apt-get autoremove \
 && apt-get clean \

checker/bin-devel/checkout-historical.sh

@@ -89,7 +89,7 @@ git checkout -B __merge_eval__
 echo "plume-scripts"
 PLUME_SCRIPTS="checker/bin-devel/.plume-scripts"
 if [ ! -d "$PLUME_SCRIPTS" ] ; then
-  git clone -q https://github.com/plume-lib/plume-scripts.git "${PLUME_SCRIPTS}"
+  git clone -q https://github.com/eisop-plume-lib/plume-scripts.git "${PLUME_SCRIPTS}"
 fi
 COMMIT="$(cd "${PLUME_SCRIPTS}" && git rev-list -n 1 --first-parent --before="${commit_date}" master)"
 if [ -n "${COMMIT}" ] ; then
@@ -102,7 +102,7 @@ echo "html-tools"
 HTML_TOOLS="checker/bin-devel/.plume-scripts"
 COMMIT="$(cd "${HTML_TOOLS}" && git rev-list -n 1 --first-parent --before="${commit_date}" master)"
 if [ ! -d "$HTML_TOOLS" ] ; then
-  git clone -q https://github.com/plume-lib/html-tools.git "${HTML_TOOLS}"
+  git clone -q https://github.com/eisop-plume-lib/html-tools.git "${HTML_TOOLS}"
 fi
 if [ -n "${COMMIT}" ] ; then
   # COMMIT is non-empty

checker/bin-devel/clone-related.sh

@@ -31,25 +31,25 @@ else
 fi
 echo "JAVA_HOME=${JAVA_HOME}"
 
-# Using `(cd "$CHECKERFRAMEWORK" && ./gradlew getPlumeScripts -q)` leads to infinite regress.
-PLUME_SCRIPTS="$CHECKERFRAMEWORK/checker/bin-devel/.plume-scripts"
-if [ -d "$PLUME_SCRIPTS" ] ; then
-  (cd "$PLUME_SCRIPTS" && (git pull -q || true))
+# Using `(cd "$CHECKERFRAMEWORK" && ./gradlew getGitScripts -q)` leads to infinite regress.
+GIT_SCRIPTS="$CHECKERFRAMEWORK/checker/bin-devel/.git-scripts"
+if [ -d "$GIT_SCRIPTS" ] ; then
+  (cd "$GIT_SCRIPTS" && (git pull -q || true))
 else
   (cd "$CHECKERFRAMEWORK/checker/bin-devel" && \
-      (git clone --filter=blob:none -q https://github.com/eisop-plume-lib/plume-scripts.git .plume-scripts || \
-       (sleep 1m && git clone --filter=blob:none -q https://github.com/eisop-plume-lib/plume-scripts.git .plume-scripts)))
+      (git clone --filter=blob:none -q https://github.com/eisop-plume-lib/git-scripts.git .git-scripts || \
+       (sleep 60 && git clone --filter=blob:none -q https://github.com/eisop-plume-lib/git-scripts.git .git-scripts)))
 fi
 
 # Clone the annotated JDK into ../jdk .
-"$PLUME_SCRIPTS/git-clone-related" ${DEBUG_FLAG} opprop jdk
+"$GIT_SCRIPTS/git-clone-related" ${DEBUG_FLAG} opprop jdk
 
 # AFU="${AFU:-../annotation-tools/annotation-file-utilities}"
 # # Don't use `AT=${AFU}/..` which causes a git failure.
 # AT=$(dirname "${AFU}")
 
 # ## Build annotation-tools (Annotation File Utilities)
-# "$PLUME_SCRIPTS/git-clone-related" ${DEBUG_FLAG} eisop annotation-tools "${AT}"
+# "$GIT_SCRIPTS/git-clone-related" ${DEBUG_FLAG} eisop annotation-tools "${AT}"
 # if [ ! -d ../annotation-tools ] ; then
 #   ln -s "${AT}" ../annotation-tools
 # fi

checker/bin-devel/test-cf-inference.sh

@@ -15,7 +15,7 @@ source "$SCRIPTDIR"/build.sh
 ## script rather than in ./test/downstream.sh, because it needs a different
 ## Docker image.
 
-"$SCRIPTDIR/.plume-scripts/git-clone-related" opprop checker-framework-inference
+"$SCRIPTDIR/.git-scripts/git-clone-related" opprop checker-framework-inference
 
 export PATH=$AFU/scripts:$PATH
 cd ../checker-framework-inference

checker/bin-devel/test-daikon-part1.sh

@@ -17,7 +17,7 @@ echo "running \"./gradlew assembleForJavac\" for checker-framework"
 
 
 # daikon-typecheck: 15 minutes
-"$SCRIPTDIR/.plume-scripts/git-clone-related" eisop-codespecs daikon
+"$SCRIPTDIR/.git-scripts/git-clone-related" eisop-codespecs daikon
 cd ../daikon
 git log | head -n 5
 make compile

checker/bin-devel/test-daikon-part2.sh

@@ -16,7 +16,7 @@ echo "running \"./gradlew assembleForJavac\" for checker-framework"
 ./gradlew assembleForJavac --console=plain -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000
 
 # daikon-typecheck: 15 minutes
-"$SCRIPTDIR/.plume-scripts/git-clone-related" eisop-codespecs daikon
+"$SCRIPTDIR/.git-scripts/git-clone-related" eisop-codespecs daikon
 cd ../daikon
 git log | head -n 5
 make compile