From cf473328842b69f86bb0934bb9ae4cdbb4f510c5 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 19 Oct 2021 10:07:23 -0700 Subject: [PATCH 01/19] Use JDK 17 --- azure-pipelines.yml | 40 +++++++++--------- build.gradle | 8 ++-- checker/bin-devel/Dockerfile-README | 4 +- ...e-ubuntu-jdk16 => Dockerfile-ubuntu-jdk17} | 17 ++++---- ...dk16-plus => Dockerfile-ubuntu-jdk17-plus} | 17 ++++---- checker/bin/wpi-many.sh | 22 +++++----- checker/bin/wpi.sh | 42 +++++++++---------- .../defaultsPersist/ReferenceInfoUtil.java | 4 +- .../checker/test/junit/DisbarUseTest.java | 2 +- .../checker/test/junit/LockTest.java | 2 +- .../test/junit/NullnessRecordsTest.java | 4 +- .../test/junit/StubparserRecordTest.java | 2 +- .../tests/nullness-records/BasicRecord.java | 2 +- .../nullness-records/BasicRecordCanon.java | 2 +- .../nullness-records/BasicRecordNullable.java | 2 +- .../tests/nullness-records/GenericPair.java | 2 +- .../tests/nullness-records/LocalRecords.java | 2 +- .../nullness-records/NestedRecordTest.java | 2 +- .../nullness-records/NormalizingRecord.java | 2 +- docs/CHANGELOG.md | 9 +++- docs/examples/MavenExample/Makefile | 2 +- docs/examples/errorprone/Makefile | 4 +- docs/examples/lombok/Makefile | 2 +- .../wpi-many-custom-checker-example.sh | 2 +- docs/manual/external-tools.tex | 4 +- docs/manual/inference.tex | 6 +-- docs/tutorial/tests/ant.xml | 2 +- .../framework/test/TestUtilities.java | 12 +++--- .../framework/source/SourceChecker.java | 4 +- .../framework/stub/AnnotationFileUtil.java | 2 +- .../framework/type/AnnotatedTypeFactory.java | 4 +- .../framework/util/CheckerMain.java | 2 +- .../framework/util/JavaParserUtil.java | 7 +++- .../javacutil/ElementUtils.java | 2 +- 34 files changed, 126 insertions(+), 116 deletions(-) rename checker/bin-devel/{Dockerfile-ubuntu-jdk16 => Dockerfile-ubuntu-jdk17} (64%) rename checker/bin-devel/{Dockerfile-ubuntu-jdk16-plus => Dockerfile-ubuntu-jdk17-plus} (70%) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 56d546cb930..471dffb22a1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,7 +34,7 @@ jobs: fetchDepth: 25 - bash: ./checker/bin-devel/test-cftests-junit.sh displayName: test-cftests-junit.sh -- job: junit_tests_jdk16 +- job: junit_tests_jdk17 dependsOn: - junit_tests_jdk11 - nonjunit_tests_jdk11 @@ -42,7 +42,7 @@ jobs: - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' - container: mdernst/cf-ubuntu-jdk16:latest + container: mdernst/cf-ubuntu-jdk17:latest timeoutInMinutes: 70 steps: - checkout: self @@ -72,7 +72,7 @@ jobs: fetchDepth: 25 - bash: ./checker/bin-devel/test-cftests-nonjunit.sh displayName: test-cftests-nonjunit.sh -- job: nonjunit_tests_jdk16 +- job: nonjunit_tests_jdk17 dependsOn: - junit_tests_jdk11 - nonjunit_tests_jdk11 @@ -80,7 +80,7 @@ jobs: - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' - container: mdernst/cf-ubuntu-jdk16:latest + container: mdernst/cf-ubuntu-jdk17:latest steps: - checkout: self fetchDepth: 25 @@ -109,7 +109,7 @@ jobs: fetchDepth: 25 - bash: ./checker/bin-devel/test-cftests-inference.sh displayName: test-cftests-inference.sh -- job: inference_tests_jdk16 +- job: inference_tests_jdk17 dependsOn: - junit_tests_jdk11 - inference_tests_jdk11 @@ -117,7 +117,7 @@ jobs: - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' - container: mdernst/cf-ubuntu-jdk16:latest + container: mdernst/cf-ubuntu-jdk17:latest steps: - checkout: self fetchDepth: 25 @@ -146,7 +146,7 @@ jobs: fetchDepth: 1000 - bash: ./checker/bin-devel/test-misc.sh displayName: test-misc.sh -- job: misc_jdk16 +- job: misc_jdk17 dependsOn: - junit_tests_jdk11 - nonjunit_tests_jdk11 @@ -154,7 +154,7 @@ jobs: - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' - container: mdernst/cf-ubuntu-jdk16-plus:latest + container: mdernst/cf-ubuntu-jdk17-plus:latest steps: - checkout: self fetchDepth: 1000 @@ -183,7 +183,7 @@ jobs: fetchDepth: 1000 - bash: ./checker/bin-devel/test-typecheck.sh displayName: test-typecheck.sh -- job: typecheck_jdk16 +- job: typecheck_jdk17 dependsOn: - junit_tests_jdk11 - nonjunit_tests_jdk11 @@ -191,7 +191,7 @@ jobs: - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' - container: mdernst/cf-ubuntu-jdk16-plus:latest + container: mdernst/cf-ubuntu-jdk17-plus:latest steps: - checkout: self fetchDepth: 1000 @@ -224,18 +224,18 @@ jobs: fetchDepth: 25 - bash: ./checker/bin-devel/test-daikon.sh displayName: test-daikon.sh -## Daikon does not yet support JDK 16. TODO: Make Daikon run under JDK 16. -# - job: daikon_jdk16 +## Daikon does not yet support JDK 17. TODO: Make Daikon run under JDK 17. +# - job: daikon_jdk17 # dependsOn: # - junit_tests_jdk11 # - nonjunit_tests_jdk11 # - misc_jdk11 # - typecheck_jdk11 -# # ## Commented to reduce latency and eliminate the "daikon_jdk11 -> daikon_jdk16" critical path. +# # ## Commented to reduce latency and eliminate the "daikon_jdk11 -> daikon_jdk17" critical path. # # # - daikon_jdk11 # pool: # vmImage: 'ubuntu-latest' -# container: mdernst/cf-ubuntu-jdk16:latest +# container: mdernst/cf-ubuntu-jdk17:latest # timeoutInMinutes: 70 # steps: # - checkout: self @@ -266,7 +266,7 @@ jobs: fetchDepth: 25 - bash: ./checker/bin-devel/test-guava.sh displayName: test-guava.sh -- job: guava_jdk16 +- job: guava_jdk17 dependsOn: - junit_tests_jdk11 - nonjunit_tests_jdk11 @@ -275,7 +275,7 @@ jobs: - guava_jdk11 pool: vmImage: 'ubuntu-latest' - container: mdernst/cf-ubuntu-jdk16:latest + container: mdernst/cf-ubuntu-jdk17:latest steps: - checkout: self fetchDepth: 25 @@ -305,7 +305,7 @@ jobs: fetchDepth: 25 - bash: ./checker/bin-devel/test-plume-lib.sh displayName: test-plume-lib.sh -- job: plume_lib_jdk16 +- job: plume_lib_jdk17 dependsOn: - junit_tests_jdk11 - nonjunit_tests_jdk11 @@ -314,7 +314,7 @@ jobs: - plume_lib_jdk11 pool: vmImage: 'ubuntu-latest' - container: mdernst/cf-ubuntu-jdk16:latest + container: mdernst/cf-ubuntu-jdk17:latest steps: - checkout: self fetchDepth: 25 @@ -345,7 +345,7 @@ jobs: # fetchDepth: 25 # - bash: ./checker/bin-devel/test-downstream.sh # displayName: test-downstream.sh -# - job: downstream_jdk16 +# - job: downstream_jdk17 # dependsOn: # - junit_tests_jdk11 # - nonjunit_tests_jdk11 @@ -354,7 +354,7 @@ jobs: # - downstream_jdk11 # pool: # vmImage: 'ubuntu-latest' -# container: mdernst/cf-ubuntu-jdk16:latest +# container: mdernst/cf-ubuntu-jdk17:latest # steps: # - checkout: self # fetchDepth: 25 diff --git a/build.gradle b/build.gradle index 8f2e509949a..05714411f74 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ ext { // On a Java 9+ JVM, use the host javac, default source/target, and required module flags. isJava8 = JavaVersion.current() == JavaVersion.VERSION_1_8 - isJava16 = JavaVersion.current() == JavaVersion.VERSION_16 + isJava17 = JavaVersion.current() == JavaVersion.VERSION_17 errorproneJavacVersion = '9+181-r4173-1' @@ -60,7 +60,7 @@ switch (JavaVersion.current()) { break; case JavaVersion.VERSION_1_8: case JavaVersion.VERSION_11: - case JavaVersion.VERSION_16: + case JavaVersion.VERSION_17: break; // Supported versions default: throw new GradleException("Build the Checker Framework with JDK 8 or JDK 11." + @@ -127,7 +127,7 @@ allprojects { // the sections with labels "javac-jdk11-non-modularized", "maven", and "sbt" in the manual // and in the checker-framework-gradle-plugin, CheckerFrameworkPlugin#applyToProject complierArgsForRunningCF = [ - // These are required in Java 16+ because the --illegal-access option is set to deny + // These are required in Java 17+ because the --illegal-access option is set to deny // by default. None of these packages are accessed via reflection, so the module // only needs to be exported, but not opened. "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", @@ -406,7 +406,7 @@ List getJavaFilesToFormat(projectName) { && !details.path.contains("calledmethods-delomboked") && !details.path.contains("returnsreceiverdelomboked") && !details.path.contains("build") - && (isJava16 || !details.path.contains("-records")) + && (isJava17 || !details.path.contains("-records")) && details.name.endsWith('.java')) { javaFiles.add(details.file) } diff --git a/checker/bin-devel/Dockerfile-README b/checker/bin-devel/Dockerfile-README index d9fb09df475..66405ec93ec 100644 --- a/checker/bin-devel/Dockerfile-README +++ b/checker/bin-devel/Dockerfile-README @@ -49,12 +49,12 @@ export PROJECT=cf create_upload_docker_image export OS=ubuntu -export JDKVER=jdk16 +export JDKVER=jdk17 export PROJECT=cf create_upload_docker_image export OS=ubuntu -export JDKVER=jdk16-plus +export JDKVER=jdk17-plus export PROJECT=cf create_upload_docker_image diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk16 b/checker/bin-devel/Dockerfile-ubuntu-jdk17 similarity index 64% rename from checker/bin-devel/Dockerfile-ubuntu-jdk16 rename to checker/bin-devel/Dockerfile-ubuntu-jdk17 index 658bfd117fa..7728b3fc543 100644 --- a/checker/bin-devel/Dockerfile-ubuntu-jdk16 +++ b/checker/bin-devel/Dockerfile-ubuntu-jdk17 @@ -1,5 +1,5 @@ # Create a Docker image that is ready to run the main Checker Framework tests, -# using JDK 16. +# using JDK 17. # "ubuntu" is the latest LTS release. "ubuntu:rolling" is the latest release. FROM ubuntu @@ -10,8 +10,8 @@ MAINTAINER Michael Ernst # * Put "apt-get update" and "apt-get install" and apt cleanup in the same RUN command. # * Do not run "apt-get upgrade"; instead get upstream to update. -# Instructions for installing Java 16 on Ubuntu: -# https://www.linuxuprising.com/2021/03/how-to-install-oracle-java-16-on-debian.html +# Instructions for installing Java 17 on Ubuntu: +# https://www.linuxuprising.com/2021/09/how-to-install-oracle-java-17-lts-on.html RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -qqy update \ && apt-get -qqy install software-properties-common \ @@ -19,9 +19,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \ RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -qqy update \ -&& echo oracle-java16-installer shared/accepted-oracle-license-v1-2 select true | /usr/bin/debconf-set-selections \ +&& echo oracle-java17-installer shared/accepted-oracle-license-v1-3 select true | /usr/bin/debconf-set-selections \ +&& echo oracle-java17-installer shared/accepted-oracle-licence-v1-3 boolean true | /usr/bin/debconf-set-selections \ && apt-get -qqy install \ - oracle-java16-installer --install-recommends + oracle-java17-installer --install-recommends RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -qqy update \ @@ -41,9 +42,9 @@ RUN export DEBIAN_FRONTEND=noninteractive \ wget RUN export DEBIAN_FRONTEND=noninteractive \ -&& wget https://mirrors.sonic.net/apache/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz \ -&& tar xzvf apache-maven-3.8.1-bin.tar.gz -ENV PATH="/apache-maven-3.8.1/bin:$PATH" +&& wget https://mirrors.sonic.net/apache/maven/maven-3/3.8.3/binaries/apache-maven-3.8.3-bin.tar.gz \ +&& tar xzvf apache-maven-3.8.3-bin.tar.gz +ENV PATH="/apache-maven-3.8.3/bin:$PATH" RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get clean \ diff --git a/checker/bin-devel/Dockerfile-ubuntu-jdk16-plus b/checker/bin-devel/Dockerfile-ubuntu-jdk17-plus similarity index 70% rename from checker/bin-devel/Dockerfile-ubuntu-jdk16-plus rename to checker/bin-devel/Dockerfile-ubuntu-jdk17-plus index 8a08092d4ea..1cd43349b1c 100644 --- a/checker/bin-devel/Dockerfile-ubuntu-jdk16-plus +++ b/checker/bin-devel/Dockerfile-ubuntu-jdk17-plus @@ -1,5 +1,5 @@ # Create a Docker image that is ready to run the full Checker Framework tests, -# including building the manual and Javadoc, using JDK 16. +# including building the manual and Javadoc, using JDK 17. # "ubuntu" is the latest LTS release. "ubuntu:rolling" is the latest release. FROM ubuntu @@ -12,8 +12,8 @@ MAINTAINER Michael Ernst # * Put "apt-get update" and "apt-get install" and apt cleanup in the same RUN command. # * Do not run "apt-get upgrade"; instead get upstream to update. -# Instructions for installing Java 16 on Ubuntu: -# https://www.linuxuprising.com/2021/03/how-to-install-oracle-java-16-on-debian.html +# Instructions for installing Java 17 on Ubuntu: +# https://www.linuxuprising.com/2021/09/how-to-install-oracle-java-17-lts-on.html RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -qqy update \ && apt-get -qqy install software-properties-common \ @@ -21,9 +21,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \ RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -qqy update \ -&& echo oracle-java16-installer shared/accepted-oracle-license-v1-2 select true | /usr/bin/debconf-set-selections \ +&& echo oracle-java17-installer shared/accepted-oracle-license-v1-3 select true | /usr/bin/debconf-set-selections \ +&& echo oracle-java17-installer shared/accepted-oracle-licence-v1-3 boolean true | /usr/bin/debconf-set-selections \ && apt-get -qqy install \ - oracle-java16-installer --install-recommends + oracle-java17-installer --install-recommends RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -qqy update \ @@ -43,9 +44,9 @@ RUN export DEBIAN_FRONTEND=noninteractive \ wget RUN export DEBIAN_FRONTEND=noninteractive \ -&& wget https://mirrors.sonic.net/apache/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz \ -&& tar xzvf apache-maven-3.8.1-bin.tar.gz -ENV PATH="/apache-maven-3.8.1/bin:$PATH" +&& wget https://mirrors.sonic.net/apache/maven/maven-3/3.8.3/binaries/apache-maven-3.8.3-bin.tar.gz \ +&& tar xzvf apache-maven-3.8.3-bin.tar.gz +ENV PATH="/apache-maven-3.8.3/bin:$PATH" RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -qqy update \ diff --git a/checker/bin/wpi-many.sh b/checker/bin/wpi-many.sh index bb6c5edb8a9..528478ab8b8 100755 --- a/checker/bin/wpi-many.sh +++ b/checker/bin/wpi-many.sh @@ -66,11 +66,11 @@ else has_java11="yes" fi -# shellcheck disable=SC2153 # testing for JAVA16_HOME, not a typo of JAVA_HOME -if [ "${JAVA16_HOME}" = "" ]; then - has_java16="no" +# shellcheck disable=SC2153 # testing for JAVA17_HOME, not a typo of JAVA_HOME +if [ "${JAVA17_HOME}" = "" ]; then + has_java17="no" else - has_java16="yes" + has_java17="yes" fi if [ "${has_java_home}" = "yes" ] && [ ! -d "${JAVA_HOME}" ]; then @@ -88,9 +88,9 @@ if [ "${has_java_home}" = "yes" ]; then export JAVA11_HOME="${JAVA_HOME}" has_java11="yes" fi - if [ "${has_java16}" = "no" ] && [ "${java_version}" = 16 ]; then - export JAVA16_HOME="${JAVA_HOME}" - has_java16="yes" + if [ "${has_java17}" = "no" ] && [ "${java_version}" = 17 ]; then + export JAVA17_HOME="${JAVA_HOME}" + has_java17="yes" fi fi @@ -104,13 +104,13 @@ if [ "${has_java11}" = "yes" ] && [ ! -d "${JAVA11_HOME}" ]; then exit 1 fi -if [ "${has_java16}" = "yes" ] && [ ! -d "${JAVA16_HOME}" ]; then - echo "JAVA16_HOME is set to a non-existent directory ${JAVA16_HOME}" +if [ "${has_java17}" = "yes" ] && [ ! -d "${JAVA17_HOME}" ]; then + echo "JAVA17_HOME is set to a non-existent directory ${JAVA17_HOME}" exit 1 fi -if [ "${has_java8}" = "no" ] && [ "${has_java11}" = "no" ] && [ "${has_java16}" = "no" ]; then - echo "No Java 8, 11, or 16 JDKs found. At least one of JAVA_HOME, JAVA8_HOME, JAVA11_HOME, or JAVA16_HOME must be set." +if [ "${has_java8}" = "no" ] && [ "${has_java11}" = "no" ] && [ "${has_java17}" = "no" ]; then + echo "No Java 8, 11, or 17 JDKs found. At least one of JAVA_HOME, JAVA8_HOME, JAVA11_HOME, or JAVA17_HOME must be set." exit 1 fi diff --git a/checker/bin/wpi.sh b/checker/bin/wpi.sh index fa2f69a9b21..f1203f51fcf 100755 --- a/checker/bin/wpi.sh +++ b/checker/bin/wpi.sh @@ -59,11 +59,11 @@ else has_java11="yes" fi -# shellcheck disable=SC2153 # testing for JAVA16_HOME, not a typo of JAVA_HOME -if [ "${JAVA16_HOME}" = "" ]; then - has_java16="no" +# shellcheck disable=SC2153 # testing for JAVA17_HOME, not a typo of JAVA_HOME +if [ "${JAVA17_HOME}" = "" ]; then + has_java17="no" else - has_java16="yes" + has_java17="yes" fi if [ "${has_java_home}" = "yes" ]; then @@ -76,9 +76,9 @@ if [ "${has_java_home}" = "yes" ]; then export JAVA11_HOME="${JAVA_HOME}" has_java11="yes" fi - if [ "${has_java16}" = "no" ] && [ "${java_version}" = 16 ]; then - export JAVA16_HOME="${JAVA_HOME}" - has_java16="yes" + if [ "${has_java17}" = "no" ] && [ "${java_version}" = 17 ]; then + export JAVA17_HOME="${JAVA_HOME}" + has_java17="yes" fi fi @@ -92,13 +92,13 @@ if [ "${has_java11}" = "yes" ] && [ ! -d "${JAVA11_HOME}" ]; then exit 7 fi -if [ "${has_java16}" = "yes" ] && [ ! -d "${JAVA16_HOME}" ]; then - echo "JAVA16_HOME is set to a non-existent directory ${JAVA16_HOME}" +if [ "${has_java17}" = "yes" ] && [ ! -d "${JAVA17_HOME}" ]; then + echo "JAVA17_HOME is set to a non-existent directory ${JAVA17_HOME}" exit 7 fi -if [ "${has_java8}" = "no" ] && [ "${has_java11}" = "no" ] && [ "${has_java16}" = "no" ]; then - echo "No Java 8, 11, or 16 JDKs found. At least one of JAVA_HOME, JAVA8_HOME, JAVA11_HOME, or JAVA16_HOME must be set." +if [ "${has_java8}" = "no" ] && [ "${has_java11}" = "no" ] && [ "${has_java17}" = "no" ]; then + echo "No Java 8, 11, or 17 JDKs found. At least one of JAVA_HOME, JAVA8_HOME, JAVA11_HOME, or JAVA17_HOME must be set." exit 8 fi @@ -175,8 +175,8 @@ function configure_and_exec_dljc { JDK_VERSION_ARG="--jdkVersion 8" elif [ "${JAVA_HOME}" = "${JAVA11_HOME}" ]; then JDK_VERSION_ARG="--jdkVersion 11" - elif [ "${JAVA_HOME}" = "${JAVA16_HOME}" ]; then - JDK_VERSION_ARG="--jdkVersion 16" + elif [ "${JAVA_HOME}" = "${JAVA17_HOME}" ]; then + JDK_VERSION_ARG="--jdkVersion 17" else # Default to the latest LTS release. (Probably better to compute the version.) JDK_VERSION_ARG="--jdkVersion 11" @@ -284,13 +284,13 @@ cd "${DIR}" || exit 5 JAVA_HOME_BACKUP="${JAVA_HOME}" # For the first run, use the Java versions in ascending priority order: 8 if -# it's available, otherwise 11, otherwise 16. +# it's available, otherwise 11, otherwise 17. if [ "${has_java8}" = "yes" ]; then export JAVA_HOME="${JAVA8_HOME}" elif [ "${has_java11}" = "yes" ]; then export JAVA_HOME="${JAVA11_HOME}" -elif [ "${has_java16}" = "yes" ]; then - export JAVA_HOME="${JAVA16_HOME}" +elif [ "${has_java17}" = "yes" ]; then + export JAVA_HOME="${JAVA17_HOME}" fi configure_and_exec_dljc "$@" @@ -305,14 +305,14 @@ if [ "${WPI_RESULTS_AVAILABLE}" != "yes" ] && [ "${has_java11}" = "yes" ]; then fi fi -# If results still aren't available, then re-run with Java 16 if it is available -# and the first run used Java 8 or Java 11 (since Java 16 has the lowest priority, +# If results still aren't available, then re-run with Java 17 if it is available +# and the first run used Java 8 or Java 11 (since Java 17 has the lowest priority, # the first run using Java 8 or Java 11 is equivalent to either of these being # available). -if [ "${WPI_RESULTS_AVAILABLE}" != "yes" ] && [ "${has_java16}" = "yes" ]; then +if [ "${WPI_RESULTS_AVAILABLE}" != "yes" ] && [ "${has_java17}" = "yes" ]; then if [ "${has_java11}" = "yes" ] || [ "${has_java8}" = "yes" ]; then - export JAVA_HOME="${JAVA16_HOME}" - echo "couldn't build using Java 11 or Java 8; trying Java 16" + export JAVA_HOME="${JAVA17_HOME}" + echo "couldn't build using Java 11 or Java 8; trying Java 17" configure_and_exec_dljc "$@" fi fi diff --git a/checker/jtreg/nullness/defaultsPersist/ReferenceInfoUtil.java b/checker/jtreg/nullness/defaultsPersist/ReferenceInfoUtil.java index 35f33770162..bde0ddc1ceb 100644 --- a/checker/jtreg/nullness/defaultsPersist/ReferenceInfoUtil.java +++ b/checker/jtreg/nullness/defaultsPersist/ReferenceInfoUtil.java @@ -56,8 +56,8 @@ private void findAnnotations(ClassFile cf, List annos) { throw new Error(e); } // This method, `findAnnotations`, aims to extract annotations from one method. - // In JDK 16, constructors are included in ClassFile.methods(); in JDK 11, they are not. - // Therefore, this if statement is required in JDK 16, and has no effect in JDK 11. + // In JDK 17, constructors are included in ClassFile.methods(); in JDK 11, they are not. + // Therefore, this if statement is required in JDK 17, and has no effect in JDK 11. if (ignoreConstructors && methodName.equals("")) { continue; } diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java index f804e80ae85..01b730903fa 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java @@ -25,7 +25,7 @@ public DisbarUseTest(List testFiles) { @Parameters public static String[] getTestDirs() { - // Check for JDK 16+ without using a library: + // Check for JDK 17+ without using a library: if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) return new String[] {"disbaruse-records"}; else return new String[] {}; diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java index 6ec8ce1a5fd..f11dcbac54a 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java @@ -18,7 +18,7 @@ public LockTest(List testFiles) { @Parameters public static String[] getTestDirs() { - // Check for JDK 16+ without using a library: + // Check for JDK 17+ without using a library: if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) return new String[] {"lock", "lock-records", "all-systems"}; else return new String[] {"lock", "all-systems"}; diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java index ff76024efdf..a27b2eede43 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java @@ -6,7 +6,7 @@ import org.checkerframework.framework.test.CheckerFrameworkPerDirectoryTest; import org.junit.runners.Parameterized.Parameters; -/** JUnit tests for the Nullness checker with records (JDK16+ only). */ +/** JUnit tests for the Nullness checker with records (JDK17+ only). */ public class NullnessRecordsTest extends CheckerFrameworkPerDirectoryTest { /** @@ -26,7 +26,7 @@ public NullnessRecordsTest(List testFiles) { @Parameters public static String[] getTestDirs() { - // Check for JDK 16+ without using a library: + // Check for JDK 17+ without using a library: if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) return new String[] {"nullness-records"}; else return new String[] {}; diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java index c5e854499bf..70af6c2898b 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java @@ -25,7 +25,7 @@ public StubparserRecordTest(List testFiles) { @Parameterized.Parameters public static String[] getTestDirs() { - // Check for JDK 16+ without using a library: + // Check for JDK 17+ without using a library: if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) return new String[] {"stubparser-records"}; else return new String[] {}; diff --git a/checker/tests/nullness-records/BasicRecord.java b/checker/tests/nullness-records/BasicRecord.java index daafd6ee2f9..a5df9e096d2 100644 --- a/checker/tests/nullness-records/BasicRecord.java +++ b/checker/tests/nullness-records/BasicRecord.java @@ -1,6 +1,6 @@ import org.checkerframework.checker.nullness.qual.Nullable; -// @below-java16-jdk-skip-test +// @below-java17-jdk-skip-test public record BasicRecord(String str) { public static BasicRecord makeNonNull(String s) { diff --git a/checker/tests/nullness-records/BasicRecordCanon.java b/checker/tests/nullness-records/BasicRecordCanon.java index 11fd58b41ce..65965e4c723 100644 --- a/checker/tests/nullness-records/BasicRecordCanon.java +++ b/checker/tests/nullness-records/BasicRecordCanon.java @@ -1,6 +1,6 @@ import org.checkerframework.checker.nullness.qual.Nullable; -// @below-java16-jdk-skip-test +// @below-java17-jdk-skip-test public record BasicRecordCanon(String str) { public static BasicRecordCanon makeNonNull(String s) { diff --git a/checker/tests/nullness-records/BasicRecordNullable.java b/checker/tests/nullness-records/BasicRecordNullable.java index abb2228a827..5a1c07b30ca 100644 --- a/checker/tests/nullness-records/BasicRecordNullable.java +++ b/checker/tests/nullness-records/BasicRecordNullable.java @@ -1,6 +1,6 @@ import org.checkerframework.checker.nullness.qual.Nullable; -// @below-java16-jdk-skip-test +// @below-java17-jdk-skip-test public record BasicRecordNullable(@Nullable String str) { public static BasicRecordNullable makeNonNull(String s) { diff --git a/checker/tests/nullness-records/GenericPair.java b/checker/tests/nullness-records/GenericPair.java index e2955305222..a7561795816 100644 --- a/checker/tests/nullness-records/GenericPair.java +++ b/checker/tests/nullness-records/GenericPair.java @@ -1,6 +1,6 @@ import org.checkerframework.checker.nullness.qual.Nullable; -// @below-java16-jdk-skip-test +// @below-java17-jdk-skip-test public record GenericPair(K key, V value) { public static void foo() { diff --git a/checker/tests/nullness-records/LocalRecords.java b/checker/tests/nullness-records/LocalRecords.java index 94755ce77d9..feea11ca6ff 100644 --- a/checker/tests/nullness-records/LocalRecords.java +++ b/checker/tests/nullness-records/LocalRecords.java @@ -1,6 +1,6 @@ import org.checkerframework.checker.nullness.qual.Nullable; -// @below-java16-jdk-skip-test +// @below-java17-jdk-skip-test public class LocalRecords { public static void foo() { record L(String key, @Nullable Integer value) {} diff --git a/checker/tests/nullness-records/NestedRecordTest.java b/checker/tests/nullness-records/NestedRecordTest.java index 2b75825564d..3a8b460345d 100644 --- a/checker/tests/nullness-records/NestedRecordTest.java +++ b/checker/tests/nullness-records/NestedRecordTest.java @@ -1,7 +1,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -// @below-java16-jdk-skip-test +// @below-java17-jdk-skip-test public class NestedRecordTest { diff --git a/checker/tests/nullness-records/NormalizingRecord.java b/checker/tests/nullness-records/NormalizingRecord.java index df711e0c797..37ea10974e9 100644 --- a/checker/tests/nullness-records/NormalizingRecord.java +++ b/checker/tests/nullness-records/NormalizingRecord.java @@ -1,7 +1,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -// @below-java16-jdk-skip-test +// @below-java17-jdk-skip-test public class NormalizingRecord {} diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8d9b3a63318..b502268cacd 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,16 +3,20 @@ Version 3.1?.? (November 1, 2021) **User-visible changes:** +Improved support for running under JDK 17. + **Implementation details:** **Closed issues:** + Version 3.18.1 (October 4, 2021) ------------------------------- **Closed issues:** #4902 and #4903. + Version 3.18.0 (September 1, 2021) ------------------------------- @@ -23,6 +27,7 @@ Java records are type-checked. Thanks to Neil Brown. **Closed issues:** #4838, #4843, #4852, #4853, #4861, #4876, #4877, #4878, #4878, #4889, #4889. + Version 3.17.0 (August 3, 2021) ------------------------------- @@ -60,12 +65,12 @@ Version 3.16.0 (July 13, 2021) **User-visible changes:** -You can run the Checker Framework on a JDK 16 JVM. You can pass the `--release +You can run the Checker Framework on a JDK 17 JVM. You can pass the `--release 16` command-line argument to the compiler. You may need to add additional command-line options, such as `--add-opens`; see the Checker Framework manual. New syntax, such as records and switch expressions, is not yet supported or type-checked; that will be added in a future release. Thanks to Neil Brown for -the JDK 16 support. +the JDK 17 support. The Lock Checker supports a new type, `@NewObject`, for the result of a constructor invocation. diff --git a/docs/examples/MavenExample/Makefile b/docs/examples/MavenExample/Makefile index 0848faa604c..1c4dbecd798 100644 --- a/docs/examples/MavenExample/Makefile +++ b/docs/examples/MavenExample/Makefile @@ -11,7 +11,7 @@ all: sleep 5s mvn -B clean > /dev/null 2>&1 mvn -B -fn compile > Out.txt 2>&1 -# TODO JDK16: Temporary hack to skip running under JDK > 11. This test gets a hard-coded version of the Checker Framework from Maven Central, and that version doesn't work on JDK 16 (until the next release after this line is committed!). +# TODO JDK17: Temporary hack to skip running under JDK > 11. This test gets a hard-coded version of the Checker Framework from Maven Central, and that version doesn't work on JDK 17 (until the next release after this line is committed!). [ ${JAVA_VER} -gt 11 ] || \ (grep -qF "MavenExample.java:[29,29] error: [assignment] incompatible types in assignment." Out.txt || (echo "FAILURE. Here is file Out.txt:" && cat Out.txt && echo "End of file Out.txt." && false)) diff --git a/docs/examples/errorprone/Makefile b/docs/examples/errorprone/Makefile index 8a1f5c460aa..16642bfa86e 100644 --- a/docs/examples/errorprone/Makefile +++ b/docs/examples/errorprone/Makefile @@ -4,10 +4,10 @@ JAVA_VER := $(shell java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s/ all: clean - ../../../gradlew build > Out.txt 2>&1 -# TODO JDK16: Temporary hack to skip running under JDK > 11. This test gets the Checker Framework from Maven Central, and that version doesn't work on JDK 16 (until the next release after this line is committed!). +# TODO JDK17: Temporary hack to skip running under JDK > 11. This test gets the Checker Framework from Maven Central, and that version doesn't work on JDK 17 (until the next release after this line is committed!). [ ${JAVA_VER} -gt 11 ] || \ grep -qF "Demo.java:5: warning: [CollectionIncompatibleType] Argument 'i - 1' should not be passed to this method; its type int is not compatible with its collection's type argument Short" Out.txt -# TODO JDK16 +# TODO JDK17 [ ${JAVA_VER} -gt 11 ] || \ grep -qF "Demo.java:6: error: [argument] incompatible argument for parameter arg0 of add." Out.txt diff --git a/docs/examples/lombok/Makefile b/docs/examples/lombok/Makefile index 62893580bba..c15dd88f2fd 100644 --- a/docs/examples/lombok/Makefile +++ b/docs/examples/lombok/Makefile @@ -6,7 +6,7 @@ JAVA_VER := $(shell java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s/ # So check for both the error message and make sure it is for the right assignment. all: clean - ../../../gradlew build > Out.txt 2>&1 -# TODO JDK16: Temporary hack to skip running under JDK > 11. +# TODO JDK17: Temporary hack to skip running under JDK > 11. [ ${JAVA_VER} -gt 11 ] || \ (grep -qF "User.java:9: error: [argument] incompatible argument for parameter y of y." Out.txt \ && grep -qF "Foo.java:12: error: [assignment] incompatible types in assignment." Out.txt \ diff --git a/docs/examples/wpi-many/wpi-many-custom-checker-example.sh b/docs/examples/wpi-many/wpi-many-custom-checker-example.sh index 1f9358c4d10..7e612d29d64 100755 --- a/docs/examples/wpi-many/wpi-many-custom-checker-example.sh +++ b/docs/examples/wpi-many/wpi-many-custom-checker-example.sh @@ -15,7 +15,7 @@ export JAVA8_HOME=/usr/lib/jvm/java-1.8.0-openjdk export JAVA11_HOME=/usr/lib/jvm/java-11-openjdk -export JAVA16_HOME=/usr/lib/jvm/java-16-oracle +export JAVA17_HOME=/usr/lib/jvm/java-17-oracle export ANDROID_HOME=${HOME}/compliance-experiments/fse20/android_home diff --git a/docs/manual/external-tools.tex b/docs/manual/external-tools.tex index 07253ac8457..14f97660315 100644 --- a/docs/manual/external-tools.tex +++ b/docs/manual/external-tools.tex @@ -595,7 +595,7 @@ \ (\emph{not} the \ wrapper script of Section~\ref{javac-wrapper}) to run the Checker Framework, if you are using JDK 9 or later. These -instructions should work on JDK 9 or later, but we only test with JDK 11 and JDK 16. +instructions should work on JDK 9 or later, but we only test with JDK 11 and JDK 17. \subsubsectionAndLabel{Non-modularized code}{javac-jdk11-non-modularized} @@ -629,7 +629,7 @@ required because the Checker Framework reflectively accesses private members of this package. \item \<-J--add-exports=...=ALL-UNNAMED> which exports the listed packages. This is -required with JDK 16+ because the Checker Framework accesses non-exported members of these packages. +required with JDK 17+ because the Checker Framework accesses non-exported members of these packages. (These are also required with JDK 11 if \<--illegal-access> is set to \.) \end{enumerate} diff --git a/docs/manual/inference.tex b/docs/manual/inference.tex index 1291cba2267..30fb2ec1b0d 100644 --- a/docs/manual/inference.tex +++ b/docs/manual/inference.tex @@ -209,13 +209,13 @@ \item The project on which inference is run must contain an Ant, Gradle, or Maven buildfile that compiles the project. \item At least one of the \verb|JAVA_HOME|, - \verb|JAVA8_HOME|, \verb|JAVA11_HOME|, or \verb|JAVA16_HOME| + \verb|JAVA8_HOME|, \verb|JAVA11_HOME|, or \verb|JAVA17_HOME| environment variables must be set. \item If set, the \verb|JAVA_HOME| environment variable must point to a - Java 8, 11, or 16 JDK. + Java 8, 11, or 17 JDK. \item If set, the \verb|JAVA8_HOME| environment variable must point to a Java 8 JDK. \item If set, the \verb|JAVA11_HOME| environment variable must point to a Java 11 JDK. -\item If set, the \verb|JAVA16_HOME| environment variable must point to a Java 16 JDK. +\item If set, the \verb|JAVA17_HOME| environment variable must point to a Java 17 JDK. \item \ environment variable must point to a built copy of the Checker Framework. \item If set, the \verb|DLJC| environment variable must point to a copy of the \ script from \ahref{https://github.com/kelloggm/do-like-javac}{do-like-javac}. (If this variable is not diff --git a/docs/tutorial/tests/ant.xml b/docs/tutorial/tests/ant.xml index a594a19521e..2ab12b33ff1 100644 --- a/docs/tutorial/tests/ant.xml +++ b/docs/tutorial/tests/ant.xml @@ -101,7 +101,7 @@ - + diff --git a/framework-test/src/main/java/org/checkerframework/framework/test/TestUtilities.java b/framework-test/src/main/java/org/checkerframework/framework/test/TestUtilities.java index b6296fd0856..a059ca2b00a 100644 --- a/framework-test/src/main/java/org/checkerframework/framework/test/TestUtilities.java +++ b/framework-test/src/main/java/org/checkerframework/framework/test/TestUtilities.java @@ -43,10 +43,10 @@ public class TestUtilities { public static final boolean IS_AT_LEAST_11_JVM = SystemUtil.getJreVersion() >= 11; /** True if the JVM is version 11 or lower. */ public static final boolean IS_AT_MOST_11_JVM = SystemUtil.getJreVersion() <= 11; - /** True if the JVM is version 16 or above. */ - public static final boolean IS_AT_LEAST_16_JVM = SystemUtil.getJreVersion() >= 16; - /** True if the JVM is version 16 or lower. */ - public static final boolean IS_AT_MOST_16_JVM = SystemUtil.getJreVersion() <= 16; + /** True if the JVM is version 17 or above. */ + public static final boolean IS_AT_LEAST_17_JVM = SystemUtil.getJreVersion() >= 17; + /** True if the JVM is version 17 or lower. */ + public static final boolean IS_AT_MOST_17_JVM = SystemUtil.getJreVersion() <= 17; static { JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); @@ -230,8 +230,8 @@ public static boolean isJavaTestFile(File file) { || (!IS_AT_LEAST_9_JVM && nextLine.contains("@below-java9-jdk-skip-test")) || (!IS_AT_LEAST_11_JVM && nextLine.contains("@below-java11-jdk-skip-test")) || (!IS_AT_MOST_11_JVM && nextLine.contains("@above-java11-skip-test")) - || (!IS_AT_LEAST_16_JVM && nextLine.contains("@below-java16-jdk-skip-test")) - || (!IS_AT_MOST_16_JVM && nextLine.contains("@above-java16-skip-test"))) { + || (!IS_AT_LEAST_17_JVM && nextLine.contains("@below-java17-jdk-skip-test")) + || (!IS_AT_MOST_17_JVM && nextLine.contains("@above-java17-skip-test"))) { in.close(); return false; } diff --git a/framework/src/main/java/org/checkerframework/framework/source/SourceChecker.java b/framework/src/main/java/org/checkerframework/framework/source/SourceChecker.java index feb60ba5468..1580029f06f 100644 --- a/framework/src/main/java/org/checkerframework/framework/source/SourceChecker.java +++ b/framework/src/main/java/org/checkerframework/framework/source/SourceChecker.java @@ -534,10 +534,10 @@ public final synchronized void init(ProcessingEnvironment env) { // Keep in sync with check in checker-framework/build.gradle and text in installation // section of manual. int jreVersion = SystemUtil.getJreVersion(); - if (jreVersion != 8 && jreVersion != 11 && jreVersion != 16) { + if (jreVersion != 8 && jreVersion != 11 && jreVersion != 17) { message( Kind.WARNING, - "Use JDK 8, 11, or 16 to run the Checker Framework. You are using version %d.", + "Use JDK 8, 11, or 17 to run the Checker Framework. You are using version %d.", jreVersion); } diff --git a/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileUtil.java b/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileUtil.java index aca48ac583d..e386c193385 100644 --- a/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileUtil.java +++ b/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileUtil.java @@ -489,7 +489,7 @@ public int compare(File o1, File o2) { public static boolean isCanonicalConstructor(ExecutableElement elt, Types types) { if (elt.getKind() == ElementKind.CONSTRUCTOR) { Element enclosing = elt.getEnclosingElement(); - // Can't use RECORD enum constant as it's not available before JDK 16: + // Can't use RECORD enum constant as it's not available before JDK 17: if (enclosing.getKind().name().equals("RECORD")) { List recordComponents = ElementUtils.getRecordComponents((TypeElement) enclosing); diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java index c51569e3348..dc6f5512130 100644 --- a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java +++ b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java @@ -2662,14 +2662,14 @@ public AnnotatedDeclaredType fromNewClass(NewClassTree newClassTree) { newClassTree.getClassBody().getModifiers().getAnnotations(); type.addAnnotations(TreeUtils.annotationsFromTypeAnnotationTrees(annos)); - // In Java 16+, the annotations are on the identifier, so copy them. + // In Java 17+, the annotations are on the identifier, so copy them. AnnotatedDeclaredType identifierType = (AnnotatedDeclaredType) TypeFromTree.fromTypeTree(this, newClassTree.getIdentifier()); type.addAnnotations(identifierType.getAnnotations()); type.setEnclosingType(enclosingType); return type; } else { - // If newClassTree does not create an anonymous class (or if this is Java 16+), + // If newClassTree does not create an anonymous class (or if this is Java 17+), // newClassTree.getIdentifier includes the explicit annotations in this location: // new @HERE Class() AnnotatedDeclaredType type = diff --git a/framework/src/main/java/org/checkerframework/framework/util/CheckerMain.java b/framework/src/main/java/org/checkerframework/framework/util/CheckerMain.java index cefd1b2e98c..caa2ed1281d 100644 --- a/framework/src/main/java/org/checkerframework/framework/util/CheckerMain.java +++ b/framework/src/main/java/org/checkerframework/framework/util/CheckerMain.java @@ -435,7 +435,7 @@ public List getExecArguments() { // "maven", and "sbt" in the manual, and in the checker-framework-gradle-plugin, // CheckerFrameworkPlugin#applyToProject Arrays.asList( - // These are required in Java 16+ because the --illegal-access option is set to deny + // These are required in Java 17+ because the --illegal-access option is set to deny // by default. None of these packages are accessed via reflection, so the module // only needs to be exported, but not opened. "--add-exports", diff --git a/framework/src/main/java/org/checkerframework/framework/util/JavaParserUtil.java b/framework/src/main/java/org/checkerframework/framework/util/JavaParserUtil.java index 49033bb616c..0622ce6e1dc 100644 --- a/framework/src/main/java/org/checkerframework/framework/util/JavaParserUtil.java +++ b/framework/src/main/java/org/checkerframework/framework/util/JavaParserUtil.java @@ -32,9 +32,9 @@ public class JavaParserUtil { /** * The Language Level to use when parsing if a specific level isn't applied. This should be the - * highest version of Java that the Checker Framework can process. Currently, Java 16. + * highest version of Java that the Checker Framework can process. Currently, Java 17. */ - public static LanguageLevel DEFAULT_LANGUAGE_LEVEL = LanguageLevel.JAVA_16; + public static LanguageLevel DEFAULT_LANGUAGE_LEVEL = LanguageLevel.JAVA_17; /// /// Replacements for StaticJavaParser @@ -354,6 +354,9 @@ public static ParserConfiguration.LanguageLevel getCurrentSourceVersion( case "RELEASE_16": currentSourceVersion = ParserConfiguration.LanguageLevel.JAVA_16; break; + case "RELEASE_17": + currentSourceVersion = ParserConfiguration.LanguageLevel.JAVA_17; + break; default: currentSourceVersion = DEFAULT_LANGUAGE_LEVEL; } diff --git a/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java index 9811a6a8745..d5636d89f5e 100644 --- a/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java +++ b/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java @@ -932,7 +932,7 @@ public static ElementKind getKindRecordAsClass(Element elt) { /** * Calls getRecordComponents on the given TypeElement. Uses reflection because this method is not - * available before JDK 16. On earlier JDKs, which don't support records anyway, an exception is + * available before JDK 17. On earlier JDKs, which don't support records anyway, an exception is * thrown. * * @param element the type element to call getRecordComponents on From 700df2da111201b8272040072a78a6cbfaa73110 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 19 Oct 2021 15:51:54 -0700 Subject: [PATCH 02/19] Suppress warnings --- .../java/org/checkerframework/checker/mustcall/qual/Owning.java | 2 ++ checker/tests/mustcall/OwningParams.java | 2 ++ checker/tests/regex/RawTypeTest.java | 1 + docs/CHANGELOG.md | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/Owning.java b/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/Owning.java index f6f0c75471d..950c1c7b2d0 100644 --- a/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/Owning.java +++ b/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/Owning.java @@ -1,3 +1,5 @@ +// @above-java11-skip-test until this is fixed: https://tinyurl.com/cfissue/4934 + package org.checkerframework.checker.mustcall.qual; import java.lang.annotation.ElementType; diff --git a/checker/tests/mustcall/OwningParams.java b/checker/tests/mustcall/OwningParams.java index 7d7f5e05bac..79b92c26c5f 100644 --- a/checker/tests/mustcall/OwningParams.java +++ b/checker/tests/mustcall/OwningParams.java @@ -1,3 +1,5 @@ +// @above-java11-skip-test until this is fixed: https://tinyurl.com/cfissue/4934 + // Tests that parameters (including receiver parameters) marked as @Owning are still checked. import org.checkerframework.checker.mustcall.qual.*; diff --git a/checker/tests/regex/RawTypeTest.java b/checker/tests/regex/RawTypeTest.java index 332d42f77ba..bdecc09d2d7 100644 --- a/checker/tests/regex/RawTypeTest.java +++ b/checker/tests/regex/RawTypeTest.java @@ -53,6 +53,7 @@ public void m3(Class c) { m2(c); } + @SuppressWarnings("removal") // AccessController is deprecated for removal in Java 17 public void m4() { AccessController.doPrivileged( new PrivilegedAction() { diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b502268cacd..1299675b781 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,7 +3,7 @@ Version 3.1?.? (November 1, 2021) **User-visible changes:** -Improved support for running under JDK 17. +Improved support for running under JDK 17; ended support for JDK 16. **Implementation details:** From ef8d962e61a0912e3ea1bfa9be10ecd466865c7c Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 19 Oct 2021 18:48:44 -0700 Subject: [PATCH 03/19] Temporary diagnostics --- azure-pipelines.yml | 10 +++++----- gradlew | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 471dffb22a1..1f591a8a344 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -184,11 +184,11 @@ jobs: - bash: ./checker/bin-devel/test-typecheck.sh displayName: test-typecheck.sh - job: typecheck_jdk17 - dependsOn: - - junit_tests_jdk11 - - nonjunit_tests_jdk11 - - misc_jdk11 - - typecheck_jdk11 + # dependsOn: + # - junit_tests_jdk11 + # - nonjunit_tests_jdk11 + # - misc_jdk11 + # - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' container: mdernst/cf-ubuntu-jdk17-plus:latest diff --git a/gradlew b/gradlew index 4f906e0c811..4d899cdeeef 100755 --- a/gradlew +++ b/gradlew @@ -105,6 +105,8 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi +echo "JAVA_HOME = ${JAVA_HOME}" + # Increase the maximum file descriptors if we can. if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` From 1ab86f95d0f35d4c03dbdc16d327fdb9d7cfcd07 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 19 Oct 2021 19:00:52 -0700 Subject: [PATCH 04/19] Use Gradle 7.3-rc-1 --- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 zcmY&<19zBR)MXm8v2EM7ZQHi-#I|kQZfv7Tn#Q)%81v4zX3d)U4d4 zYYc!v@NU%|U;_sM`2z(4BAilWijmR>4U^KdN)D8%@2KLcqkTDW%^3U(Wg>{qkAF z&RcYr;D1I5aD(N-PnqoEeBN~JyXiT(+@b`4Pv`;KmkBXYN48@0;iXuq6!ytn`vGp$ z6X4DQHMx^WlOek^bde&~cvEO@K$oJ}i`T`N;M|lX0mhmEH zuRpo!rS~#&rg}ajBdma$$}+vEhz?JAFUW|iZEcL%amAg_pzqul-B7Itq6Y_BGmOCC zX*Bw3rFz3R)DXpCVBkI!SoOHtYstv*e-May|+?b80ZRh$MZ$FerlC`)ZKt} zTd0Arf9N2dimjs>mg5&@sfTPsRXKXI;0L~&t+GH zkB<>wxI9D+k5VHHcB7Rku{Z>i3$&hgd9Mt_hS_GaGg0#2EHzyV=j=u5xSyV~F0*qs zW{k9}lFZ?H%@4hII_!bzao!S(J^^ZZVmG_;^qXkpJb7OyR*sPL>))Jx{K4xtO2xTr@St!@CJ=y3q2wY5F`77Tqwz8!&Q{f7Dp zifvzVV1!Dj*dxG%BsQyRP6${X+Tc$+XOG zzvq5xcC#&-iXlp$)L=9t{oD~bT~v^ZxQG;FRz|HcZj|^L#_(VNG)k{=_6|6Bs-tRNCn-XuaZ^*^hpZ@qwi`m|BxcF6IWc?_bhtK_cDZRTw#*bZ2`1@1HcB`mLUmo_>@2R&nj7&CiH zF&laHkG~7#U>c}rn#H)q^|sk+lc!?6wg0xy`VPn!{4P=u@cs%-V{VisOxVqAR{XX+ zw}R;{Ux@6A_QPka=48|tph^^ZFjSHS1BV3xfrbY84^=?&gX=bmz(7C({=*oy|BEp+ zYgj;<`j)GzINJA>{HeSHC)bvp6ucoE`c+6#2KzY9)TClmtEB1^^Mk)(mXWYvup02e%Ghm9qyjz#fO3bNGBX} zFiB>dvc1+If!>I10;qZk`?6pEd*(?bI&G*3YLt;MWw&!?=Mf7%^Op?qnyXWur- zwX|S^P>jF?{m9c&mmK-epCRg#WB+-VDe!2d2~YVoi%7_q(dyC{(}zB${!ElKB2D}P z7QNFM!*O^?FrPMGZ}wQ0TrQAVqZy!weLhu_Zq&`rlD39r*9&2sJHE(JT0EY5<}~x@ z1>P0!L2IFDqAB!($H9s2fI`&J_c+5QT|b#%99HA3@zUWOuYh(~7q7!Pf_U3u!ij5R zjFzeZta^~RvAmd_TY+RU@e}wQaB_PNZI26zmtzT4iGJg9U(Wrgrl>J%Z3MKHOWV(? zj>~Ph$<~8Q_sI+)$DOP^9FE6WhO09EZJ?1W|KidtEjzBX3RCLUwmj9qH1CM=^}MaK z59kGxRRfH(n|0*lkE?`Rpn6d^u5J6wPfi0WF(rucTv(I;`aW)3;nY=J=igkjsn?ED ztH&ji>}TW8)o!Jg@9Z}=i2-;o4#xUksQHu}XT~yRny|kg-$Pqeq!^78xAz2mYP9+4 z9gwAoti2ICvUWxE&RZ~}E)#M8*zy1iwz zHqN%q;u+f6Ti|SzILm0s-)=4)>eb5o-0K zbMW8ecB4p^6OuIX@u`f{>Yn~m9PINEl#+t*jqalwxIx=TeGB9(b6jA}9VOHnE$9sC zH`;epyH!k-3kNk2XWXW!K`L_G!%xOqk0ljPCMjK&VweAxEaZ==cT#;!7)X&C|X{dY^IY(e4D#!tx^vV3NZqK~--JW~wtXJ8X19adXim?PdN(|@o(OdgH3AiHts~?#QkolO?*=U_buYC&tQ3sc(O5HGHN~=6wB@dgIAVT$ z_OJWJ^&*40Pw&%y^t8-Wn4@l9gOl`uU z{Uda_uk9!Iix?KBu9CYwW9Rs=yt_lE11A+k$+)pkY5pXpocxIEJe|pTxwFgB%Kpr&tH;PzgOQ&m|(#Otm?@H^r`v)9yiR8v&Uy>d#TNdRfyN4Jk;`g zp+jr5@L2A7TS4=G-#O<`A9o;{En5!I8lVUG?!PMsv~{E_yP%QqqTxxG%8%KxZ{uwS zOT+EA5`*moN8wwV`Z=wp<3?~f#frmID^K?t7YL`G^(X43gWbo!6(q*u%HxWh$$^2EOq`Hj zp=-fS#Av+s9r-M)wGIggQ)b<@-BR`R8l1G@2+KODmn<_$Tzb7k35?e8;!V0G>`(!~ zY~qZz!6*&|TupOcnvsQYPbcMiJ!J{RyfezB^;fceBk znpA1XS)~KcC%0^_;ihibczSxwBuy;^ksH7lwfq7*GU;TLt*WmUEVQxt{ zKSfJf;lk$0XO8~48Xn2dnh8tMC9WHu`%DZj&a`2!tNB`5%;Md zBs|#T0Ktf?vkWQ)Y+q!At1qgL`C|nbzvgc(+28Q|4N6Geq)Il%+I5c@t02{9^=QJ?=h2BTe`~BEu=_u3xX2&?^zwcQWL+)7dI>JK0g8_`W1n~ zMaEP97X>Ok#=G*nkPmY`VoP8_{~+Rp7DtdSyWxI~?TZHxJ&=6KffcO2Qx1?j7=LZA z?GQt`oD9QpXw+s7`t+eeLO$cpQpl9(6h3_l9a6OUpbwBasCeCw^UB6we!&h9Ik@1zvJ`j4i=tvG9X8o34+N|y(ay~ho$f=l z514~mP>Z>#6+UxM<6@4z*|hFJ?KnkQBs_9{H(-v!_#Vm6Z4(xV5WgWMd3mB9A(>@XE292#k(HdI7P zJkQ2)`bQXTKlr}{VrhSF5rK9TsjtGs0Rs&nUMcH@$ZX_`Hh$Uje*)(Wd&oLW($hZQ z_tPt`{O@f8hZ<}?aQc6~|9iHt>=!%We3=F9yIfiqhXqp=QUVa!@UY@IF5^dr5H8$R zIh{=%S{$BHG+>~a=vQ={!B9B=<-ID=nyjfA0V8->gN{jRL>Qc4Rc<86;~aY+R!~Vs zV7MI~gVzGIY`B*Tt@rZk#Lg}H8sL39OE31wr_Bm%mn}8n773R&N)8B;l+-eOD@N$l zh&~Wz`m1qavVdxwtZLACS(U{rAa0;}KzPq9r76xL?c{&GaG5hX_NK!?)iq`t7q*F# zFoKI{h{*8lb>&sOeHXoAiqm*vV6?C~5U%tXR8^XQ9Y|(XQvcz*>a?%HQ(Vy<2UhNf zVmGeOO#v159KV@1g`m%gJ)XGPLa`a|?9HSzSSX{j;)xg>G(Ncc7+C>AyAWYa(k}5B3mtzg4tsA=C^Wfezb1&LlyrBE1~kNfeiubLls{C)!<%#m@f}v^o+7<VZ6!FZ;JeiAG@5vw7Li{flC8q1%jD_WP2ApBI{fQ}kN zhvhmdZ0bb5(qK@VS5-)G+@GK(tuF6eJuuV5>)Odgmt?i_`tB69DWpC~e8gqh!>jr_ zL1~L0xw@CbMSTmQflpRyjif*Y*O-IVQ_OFhUw-zhPrXXW>6X}+73IoMsu2?uuK3lT>;W#38#qG5tDl66A7Y{mYh=jK8Se!+f=N7%nv zYSHr6a~Nxd`jqov9VgII{%EpC_jFCEc>>SND0;}*Ja8Kv;G)MK7?T~h((c&FEBcQq zvUU1hW2^TX(dDCeU@~a1LF-(+#lz3997A@pipD53&Dr@III2tlw>=!iGabjXzbyUJ z4Hi~M1KCT-5!NR#I%!2Q*A>mqI{dpmUa_mW)%SDs{Iw1LG}0y=wbj@0ba-`q=0!`5 zr(9q1p{#;Rv2CY!L#uTbs(UHVR5+hB@m*zEf4jNu3(Kj$WwW|v?YL*F_0x)GtQC~! zzrnZRmBmwt+i@uXnk05>uR5&1Ddsx1*WwMrIbPD3yU*2By`71pk@gt{|H0D<#B7&8 z2dVmXp*;B)SWY)U1VSNs4ds!yBAj;P=xtatUx^7_gC5tHsF#vvdV;NmKwmNa1GNWZ zi_Jn-B4GnJ%xcYWD5h$*z^haku#_Irh818x^KB)3-;ufjf)D0TE#6>|zFf@~pU;Rs zNw+}c9S+6aPzxkEA6R%s*xhJ37wmgc)-{Zd1&mD5QT}4BQvczWr-Xim>(P^)52`@R z9+Z}44203T5}`AM_G^Snp<_KKc!OrA(5h7{MT^$ZeDsSr(R@^kI?O;}QF)OU zQ9-`t^ys=6DzgLcWt0U{Q(FBs22=r zKD%fLQ^5ZF24c-Z)J{xv?x$&4VhO^mswyb4QTIofCvzq+27*WlYm;h@;Bq%i;{hZA zM97mHI6pP}XFo|^pRTuWQzQs3B-8kY@ajLV!Fb?OYAO3jFv*W-_;AXd;G!CbpZt04iW`Ie^_+cQZGY_Zd@P<*J9EdRsc>c=edf$K|;voXRJ zk*aC@@=MKwR120(%I_HX`3pJ+8GMeO>%30t?~uXT0O-Tu-S{JA;zHoSyXs?Z;fy58 zi>sFtI7hoxNAdOt#3#AWFDW)4EPr4kDYq^`s%JkuO7^efX+u#-qZ56aoRM!tC^P6O zP(cFuBnQGjhX(^LJ(^rVe4-_Vk*3PkBCj!?SsULdmVr0cGJM^=?8b0^DuOFq>0*yA zk1g|C7n%pMS0A8@Aintd$fvRbH?SNdRaFrfoAJ=NoX)G5Gr}3-$^IGF+eI&t{I-GT zp=1fj)2|*ur1Td)+s&w%p#E6tDXX3YYOC{HGHLiCvv?!%%3DO$B$>A}aC;8D0Ef#b z{7NNqC8j+%1n95zq8|hFY`afAB4E)w_&7?oqG0IPJZv)lr{MT}>9p?}Y`=n+^CZ6E zKkjIXPub5!82(B-O2xQojW^P(#Q*;ETpEr^+Wa=qDJ9_k=Wm@fZB6?b(u?LUzX(}+ zE6OyapdG$HC& z&;oa*ALoyIxVvB2cm_N&h&{3ZTuU|aBrJlGOLtZc3KDx)<{ z27@)~GtQF@%6B@w3emrGe?Cv_{iC@a#YO8~OyGRIvp@%RRKC?fclXMP*6GzBFO z5U4QK?~>AR>?KF@I;|(rx(rKxdT9-k-anYS+#S#e1SzKPslK!Z&r8iomPsWG#>`Ld zJ<#+8GFHE!^wsXt(s=CGfVz5K+FHYP5T0E*?0A-z*lNBf)${Y`>Gwc@?j5{Q|6;Bl zkHG1%r$r&O!N^><8AEL+=y(P$7E6hd=>BZ4ZZ9ukJ2*~HR4KGvUR~MUOe$d>E5UK3 z*~O2LK4AnED}4t1Fs$JgvPa*O+WeCji_cn1@Tv7XQ6l@($F1K%{E$!naeX)`bfCG> z8iD<%_M6aeD?a-(Qqu61&fzQqC(E8ksa%CulMnPvR35d{<`VsmaHyzF+B zF6a@1$CT0xGVjofcct4SyxA40uQ`b#9kI)& z?B67-12X-$v#Im4CVUGZHXvPWwuspJ610ITG*A4xMoRVXJl5xbk;OL(;}=+$9?H`b z>u2~yd~gFZ*V}-Q0K6E@p}mtsri&%Zep?ZrPJmv`Qo1>94Lo||Yl)nqwHXEbe)!g( zo`w|LU@H14VvmBjjkl~=(?b{w^G$~q_G(HL`>|aQR%}A64mv0xGHa`S8!*Wb*eB}` zZh)&rkjLK!Rqar)UH)fM<&h&@v*YyOr!Xk2OOMV%$S2mCRdJxKO1RL7xP_Assw)bb z9$sQ30bapFfYTS`i1PihJZYA#0AWNmp>x(;C!?}kZG7Aq?zp!B+gGyJ^FrXQ0E<>2 zCjqZ(wDs-$#pVYP3NGA=en<@_uz!FjFvn1&w1_Igvqs_sL>ExMbcGx4X5f%`Wrri@ z{&vDs)V!rd=pS?G(ricfwPSg(w<8P_6=Qj`qBC7_XNE}1_5>+GBjpURPmvTNE7)~r)Y>ZZecMS7Ro2` z0}nC_GYo3O7j|Wux?6-LFZs%1IV0H`f`l9or-8y0=5VGzjPqO2cd$RRHJIY06Cnh- ztg@Pn1OeY=W`1Mv3`Ti6!@QIT{qcC*&vptnX4Pt1O|dWv8u2s|(CkV`)vBjAC_U5` zCw1f&c4o;LbBSp0=*q z3Y^horBAnR)u=3t?!}e}14%K>^562K!)Vy6r~v({5{t#iRh8WIL|U9H6H97qX09xp zjb0IJ^9Lqxop<-P*VA0By@In*5dq8Pr3bTPu|ArID*4tWM7w+mjit0PgmwLV4&2PW z3MnIzbdR`3tPqtUICEuAH^MR$K_u8~-U2=N1)R=l>zhygus44>6V^6nJFbW-`^)f} zI&h$FK)Mo*x?2`0npTD~jRd}5G~-h8=wL#Y-G+a^C?d>OzsVl7BFAaM==(H zR;ARWa^C3J)`p~_&FRsxt|@e+M&!84`eq)@aO9yBj8iifJv0xVW4F&N-(#E=k`AwJ z3EFXWcpsRlB%l_0Vdu`0G(11F7( zsl~*@XP{jS@?M#ec~%Pr~h z2`M*lIQaolzWN&;hkR2*<=!ORL(>YUMxOzj(60rQfr#wTrkLO!t{h~qg% zv$R}0IqVIg1v|YRu9w7RN&Uh7z$ijV=3U_M(sa`ZF=SIg$uY|=NdC-@%HtkUSEqJv zg|c}mKTCM=Z8YmsFQu7k{VrXtL^!Cts-eb@*v0B3M#3A7JE*)MeW1cfFqz~^S6OXFOIP&iL;Vpy z4dWKsw_1Wn%Y;eW1YOfeP_r1s4*p1C(iDG_hrr~-I%kA>ErxnMWRYu{IcG{sAW;*t z9T|i4bI*g)FXPpKM@~!@a7LDVVGqF}C@mePD$ai|I>73B+9!Ks7W$pw;$W1B%-rb; zJ*-q&ljb=&41dJ^*A0)7>Wa@khGZ;q1fL(2qW=|38j43mTl_;`PEEw07VKY%71l6p z@F|jp88XEnm1p~<5c*cVXvKlj0{THF=n3sU7g>Ki&(ErR;!KSmfH=?49R5(|c_*xw z4$jhCJ1gWT6-g5EV)Ahg?Nw=}`iCyQ6@0DqUb%AZEM^C#?B-@Hmw?LhJ^^VU>&phJ zlB!n5&>I>@sndh~v$2I2Ue23F?0!0}+9H~jg7E`?CS_ERu75^jSwm%!FTAegT`6s7 z^$|%sj2?8wtPQR>@D3sA0-M-g-vL@47YCnxdvd|1mPymvk!j5W1jHnVB&F-0R5e-vs`@u8a5GKdv`LF7uCfKncI4+??Z4iG@AxuX7 z6+@nP^TZ5HX#*z(!y+-KJ3+Ku0M90BTY{SC^{ z&y2#RZPjfX_PE<<>XwGp;g4&wcXsQ0T&XTi(^f+}4qSFH1%^GYi+!rJo~t#ChTeAX zmR0w(iODzQOL+b&{1OqTh*psAb;wT*drr^LKdN?c?HJ*gJl+%kEH&48&S{s28P=%p z7*?(xFW_RYxJxxILS!kdLIJYu@p#mnQ(?moGD1)AxQd66X6b*KN?o&e`u9#N4wu8% z^Gw#G!@|>c740RXziOR=tdbkqf(v~wS_N^CS^1hN-N4{Dww1lvSWcBTX*&9}Cz|s@ z*{O@jZ4RVHq19(HC9xSBZI0M)E;daza+Q*zayrX~N5H4xJ33BD4gn5Ka^Hj{995z4 zzm#Eo?ntC$q1a?)dD$qaC_M{NW!5R!vVZ(XQqS67xR3KP?rA1^+s3M$60WRTVHeTH z6BJO$_jVx0EGPXy}XK_&x597 zt(o6ArN8vZX0?~(lFGHRtHP{gO0y^$iU6Xt2e&v&ugLxfsl;GD)nf~3R^ACqSFLQ< zV7`cXgry((wDMJB55a6D4J;13$z6pupC{-F+wpToW%k1qKjUS^$Mo zN3@}T!ZdpiV7rkNvqP3KbpEn|9aB;@V;gMS1iSb@ zwyD7!5mfj)q+4jE1dq3H`sEKgrVqk|y8{_vmn8bMOi873!rmnu5S=1=-DFx+Oj)Hi zx?~ToiJqOrvSou?RVALltvMADodC7BOg7pOyc4m&6yd(qIuV5?dYUpYzpTe!BuWKi zpTg(JHBYzO&X1e{5o|ZVU-X5e?<}mh=|eMY{ldm>V3NsOGwyxO2h)l#)rH@BI*TN; z`yW26bMSp=k6C4Ja{xB}s`dNp zE+41IwEwo>7*PA|7v-F#jLN>h#a`Er9_86!fwPl{6yWR|fh?c%qc44uP~Ocm2V*(* zICMpS*&aJjxutxKC0Tm8+FBz;3;R^=ajXQUB*nTN*Lb;mruQHUE<&=I7pZ@F-O*VMkJbI#FOrBM8`QEL5Uy=q5e2 z_BwVH%c0^uIWO0*_qD;0jlPoA@sI7BPwOr-mrp7y`|EF)j;$GYdOtEPFRAKyUuUZS z(N4)*6R*ux8s@pMdC*TP?Hx`Zh{{Ser;clg&}CXriXZCr2A!wIoh;j=_eq3_%n7V} za?{KhXg2cXPpKHc90t6=`>s@QF-DNcTJRvLTS)E2FTb+og(wTV7?$kI?QZYgVBn)& zdpJf@tZ{j>B;<MVHiPl_U&KlqBT)$ic+M0uUQWK|N1 zCMl~@o|}!!7yyT%7p#G4?T^Azxt=D(KP{tyx^lD_(q&|zNFgO%!i%7T`>mUuU^FeR zHP&uClWgXm6iXgI8*DEA!O&X#X(zdrNctF{T#pyax16EZ5Lt5Z=RtAja!x+0Z31U8 zjfaky?W)wzd+66$L>o`n;DISQNs09g{GAv%8q2k>2n8q)O^M}=5r#^WR^=se#WSCt zQ`7E1w4qdChz4r@v6hgR?nsaE7pg2B6~+i5 zcTTbBQ2ghUbC-PV(@xvIR(a>Kh?{%YAsMV#4gt1nxBF?$FZ2~nFLKMS!aK=(`WllA zHS<_7ugqKw!#0aUtQwd#A$8|kPN3Af?Tkn)dHF?_?r#X68Wj;|$aw)Wj2Dkw{6)*^ zZfy!TWwh=%g~ECDCy1s8tTgWCi}F1BvTJ9p3H6IFq&zn#3FjZoecA_L_bxGWgeQup zAAs~1IPCnI@H>g|6Lp^Bk)mjrA3_qD4(D(65}l=2RzF-8@h>|Aq!2K-qxt(Q9w7c^ z;gtx`I+=gKOl;h=#fzSgw-V*YT~2_nnSz|!9hIxFb{~dKB!{H zSi??dnmr@%(1w^Be=*Jz5bZeofEKKN&@@uHUMFr-DHS!pb1I&;x9*${bmg6=2I4Zt zHb5LSvojY7ubCNGhp)=95jQ00sMAC{IZdAFsN!lAVQDeiec^HAu=8);2AKqNTT!&E zo+FAR`!A1#T6w@0A+o%&*yzkvxsrqbrfVTG+@z8l4+mRi@j<&)U9n6L>uZoezW>qS zA4YfO;_9dQSyEYpkWnsk0IY}Nr2m(ql@KuQjLgY-@g z4=$uai6^)A5+~^TvLdvhgfd+y?@+tRE^AJabamheJFnpA#O*5_B%s=t8<;?I;qJ}j z&g-9?hbwWEez-!GIhqpB>nFvyi{>Yv>dPU=)qXnr;3v-cd`l}BV?6!v{|cHDOx@IG z;TSiQQ(8=vlH^rCEaZ@Yw}?4#a_Qvx=}BJuxACxm(E7tP4hki^jU@8A zUS|4tTLd)gr@T|F$1eQXPY%fXb7u}(>&9gsd3It^B{W#6F2_g40cgo1^)@-xO&R5X z>qKon+Nvp!4v?-rGQu#M_J2v+3e+?N-WbgPQWf`ZL{Xd9KO^s{uIHTJ6~@d=mc7i z+##ya1p+ZHELmi%3C>g5V#yZt*jMv( zc{m*Y;7v*sjVZ-3mBuaT{$g+^sbs8Rp7BU%Ypi+c%JxtC4O}|9pkF-p-}F{Z7-+45 zDaJQx&CNR)8x~0Yf&M|-1rw%KW3ScjWmKH%J1fBxUp(;F%E+w!U470e_3%+U_q7~P zJm9VSWmZ->K`NfswW(|~fGdMQ!K2z%k-XS?Bh`zrjZDyBMu74Fb4q^A=j6+Vg@{Wc zPRd5Vy*-RS4p1OE-&8f^Fo}^yDj$rb+^>``iDy%t)^pHSV=En5B5~*|32#VkH6S%9 zxgIbsG+|{-$v7mhOww#v-ejaS>u(9KV9_*X!AY#N*LXIxor9hDv%aie@+??X6@Et=xz>6ev9U>6Pn$g4^!}w2Z%Kpqpp+M%mk~?GE-jL&0xLC zy(`*|&gm#mLeoRU8IU?Ujsv=;ab*URmsCl+r?%xcS1BVF*rP}XRR%MO_C!a9J^fOe>U;Y&3aj3 zX`3?i12*^W_|D@VEYR;h&b^s#Kd;JMNbZ#*x8*ZXm(jgw3!jyeHo14Zq!@_Q`V;Dv zKik~!-&%xx`F|l^z2A92aCt4x*I|_oMH9oeqsQgQDgI0j2p!W@BOtCTK8Jp#txi}7 z9kz);EX-2~XmxF5kyAa@n_$YYP^Hd4UPQ>O0-U^-pw1*n{*kdX`Jhz6{!W=V8a$0S z9mYboj#o)!d$gs6vf8I$OVOdZu7L5%)Vo0NhN`SwrQFhP3y4iXe2uV@(G{N{yjNG( zKvcN{k@pXkxyB~9ucR(uPSZ7{~sC=lQtz&V(^A^HppuN!@B4 zS>B=kb14>M-sR>{`teApuHlca6YXs6&sRvRV;9G!XI08CHS~M$=%T~g5Xt~$exVk` zWP^*0h{W%`>K{BktGr@+?ZP}2t0&smjKEVw@3=!rSjw5$gzlx`{dEajg$A58m|Okx zG8@BTPODSk@iqLbS*6>FdVqk}KKHuAHb0UJNnPm!(XO{zg--&@#!niF4T!dGVdNif z3_&r^3+rfQuV^8}2U?bkI5Ng*;&G>(O4&M<86GNxZK{IgKNbRfpg>+32I>(h`T&uv zUN{PRP&onFj$tn1+Yh|0AF330en{b~R+#i9^QIbl9fBv>pN|k&IL2W~j7xbkPyTL^ z*TFONZUS2f33w3)fdzr?)Yg;(s|||=aWZV(nkDaACGSxNCF>XLJSZ=W@?$*` z#sUftY&KqTV+l@2AP5$P-k^N`Bme-xcWPS|5O~arUq~%(z8z87JFB|llS&h>a>Som zC34(_uDViE!H2jI3<@d+F)LYhY)hoW6)i=9u~lM*WH?hI(yA$X#ip}yYld3RAv#1+sBt<)V_9c4(SN9Fn#$}_F}A-}P>N+8io}I3mh!}> z*~*N}ZF4Zergb;`R_g49>ZtTCaEsCHiFb(V{9c@X0`YV2O^@c6~LXg2AE zhA=a~!ALnP6aO9XOC^X15(1T)3!1lNXBEVj5s*G|Wm4YBPV`EOhU&)tTI9-KoLI-U zFI@adu6{w$dvT(zu*#aW*4F=i=!7`P!?hZy(9iL;Z^De3?AW`-gYTPALhrZ*K2|3_ zfz;6xQN9?|;#_U=4t^uS2VkQ8$|?Ub5CgKOj#Ni5j|(zX>x#K(h7LgDP-QHwok~-I zOu9rn%y97qrtKdG=ep)4MKF=TY9^n6CugQ3#G2yx;{))hvlxZGE~rzZ$qEHy-8?pU#G;bwufgSN6?*BeA!7N3RZEh{xS>>-G1!C(e1^ zzd#;39~PE_wFX3Tv;zo>5cc=md{Q}(Rb?37{;YPtAUGZo7j*yHfGH|TOVR#4ACaM2 z;1R0hO(Gl}+0gm9Bo}e@lW)J2OU4nukOTVKshHy7u)tLH^9@QI-jAnDBp(|J8&{fKu=_97$v&F67Z zq+QsJ=gUx3_h_%=+q47msQ*Ub=gMzoSa@S2>`Y9Cj*@Op4plTc!jDhu51nSGI z^sfZ(4=yzlR}kP2rcHRzAY9@T7f`z>fdCU0zibx^gVg&fMkcl)-0bRyWe12bT0}<@ z^h(RgGqS|1y#M;mER;8!CVmX!j=rfNa6>#_^j{^C+SxGhbSJ_a0O|ae!ZxiQCN2qA zKs_Z#Zy|9BOw6x{0*APNm$6tYVG2F$K~JNZ!6>}gJ_NLRYhcIsxY1z~)mt#Yl0pvC zO8#Nod;iow5{B*rUn(0WnN_~~M4|guwfkT(xv;z)olmj=f=aH#Y|#f_*d1H!o( z!EXNxKxth9w1oRr0+1laQceWfgi8z`YS#uzg#s9-QlTT7y2O^^M1PZx z3YS7iegfp6Cs0-ixlG93(JW4wuE7)mfihw}G~Uue{Xb+#F!BkDWs#*cHX^%(We}3% zT%^;m&Juw{hLp^6eyM}J({luCL_$7iRFA6^8B!v|B9P{$42F>|M`4Z_yA{kK()WcM zu#xAZWG%QtiANfX?@+QQOtbU;Avr*_>Yu0C2>=u}zhH9VLp6M>fS&yp*-7}yo8ZWB z{h>ce@HgV?^HgwRThCYnHt{Py0MS=Ja{nIj5%z;0S@?nGQ`z`*EVs&WWNwbzlk`(t zxDSc)$dD+4G6N(p?K>iEKXIk>GlGKTH{08WvrehnHhh%tgpp&8db4*FLN zETA@<$V=I7S^_KxvYv$Em4S{gO>(J#(Wf;Y%(NeECoG3n+o;d~Bjme-4dldKukd`S zRVAnKxOGjWc;L#OL{*BDEA8T=zL8^`J=2N)d&E#?OMUqk&9j_`GX*A9?V-G zdA5QQ#(_Eb^+wDkDiZ6RXL`fck|rVy%)BVv;dvY#`msZ}{x5fmd! zInmWSxvRgXbJ{unxAi*7=Lt&7_e0B#8M5a=Ad0yX#0rvMacnKnXgh>4iiRq<&wit93n!&p zeq~-o37qf)L{KJo3!{l9l9AQb;&>)^-QO4RhG>j`rBlJ09~cbfNMR_~pJD1$UzcGp zOEGTzz01j$=-kLC+O$r8B|VzBotz}sj(rUGOa7PDYwX~9Tum^sW^xjjoncxSz;kqz z$Pz$Ze|sBCTjk7oM&`b5g2mFtuTx>xl{dj*U$L%y-xeQL~|i>KzdUHeep-Yd@}p&L*ig< zgg__3l9T=nbM3bw0Sq&Z2*FA)P~sx0h634BXz0AxV69cED7QGTbK3?P?MENkiy-mV zZ1xV5ry3zIpy>xmThBL0Q!g+Wz@#?6fYvzmEczs(rcujrfCN=^!iWQ6$EM zaCnRThqt~gI-&6v@KZ78unqgv9j6-%TOxpbV`tK{KaoBbhc}$h+rK)5h|bT6wY*t6st-4$e99+Egb#3ip+ERbve08G@Ref&hP)qB&?>B94?eq5i3k;dOuU#!y-@+&5>~!FZik=z4&4|YHy=~!F254 zQAOTZr26}Nc7jzgJ;V~+9ry#?7Z0o*;|Q)k+@a^87lC}}1C)S))f5tk+lMNqw>vh( z`A9E~5m#b9!ZDBltf7QIuMh+VheCoD7nCFhuzThlhA?|8NCt3w?oWW|NDin&&eDU6 zwH`aY=))lpWG?{fda=-auXYp1WIPu&3 zwK|t(Qiqvc@<;1_W#ALDJ}bR;3&v4$9rP)eAg`-~iCte`O^MY+SaP!w%~+{{1tMo` zbp?T%ENs|mHP)Lsxno=nWL&qizR+!Ib=9i%4=B@(Umf$|7!WVxkD%hfRjvxV`Co<; zG*g4QG_>;RE{3V_DOblu$GYm&!+}%>G*yO{-|V9GYG|bH2JIU2iO}ZvY>}Fl%1!OE zZFsirH^$G>BDIy`8;R?lZl|uu@qWj2T5}((RG``6*05AWsVVa2Iu>!F5U>~7_Tlv{ zt=Dpgm~0QVa5mxta+fUt)I0gToeEm9eJX{yYZ~3sLR&nCuyuFWuiDIVJ+-lwViO(E zH+@Rg$&GLueMR$*K8kOl>+aF84Hss5p+dZ8hbW$=bWNIk0paB!qEK$xIm5{*^ad&( zgtA&gb&6FwaaR2G&+L+Pp>t^LrG*-B&Hv;-s(h0QTuYWdnUObu8LRSZoAVd7SJ;%$ zh%V?58mD~3G2X<$H7I)@x?lmbeeSY7X~QiE`dfQ5&K^FB#9e!6!@d9vrSt!);@ZQZ zO#84N5yH$kjm9X4iY#f+U`FKhg=x*FiDoUeu1O5LcC2w&$~5hKB9ZnH+8BpbTGh5T zi_nfmyQY$vQh%ildbR7T;7TKPxSs#vhKR|uup`qi1PufMa(tNCjRbllakshQgn1)a8OO-j8W&aBc_#q1hKDF5-X$h`!CeT z+c#Ial~fDsGAenv7~f@!icm(~)a3OKi((=^zcOb^qH$#DVciGXslUwTd$gt{7)&#a`&Lp ze%AnL0#U?lAl8vUkv$n>bxH*`qOujO0HZkPWZnE0;}0DSEu1O!hg-d9#{&#B1Dm)L zvN%r^hdEt1vR<4zwshg*0_BNrDWjo65be1&_82SW8#iKWs7>TCjUT;-K~*NxpG2P% zovXUo@S|fMGudVSRQrP}J3-Wxq;4xIxJJC|Y#TQBr>pwfy*%=`EUNE*dr-Y?9y9xK zmh1zS@z{^|UL}v**LNYY!?1qIRPTvr!gNXzE{%=-`oKclPrfMKwn` zUwPeIvLcxkIV>(SZ-SeBo-yw~{p!<&_}eELG?wxp zee-V59%@BtB+Z&Xs=O(@P$}v_qy1m=+`!~r^aT> zY+l?+6(L-=P%m4ScfAYR8;f9dyVw)@(;v{|nO#lAPI1xDHXMYt~-BGiP&9y2OQsYdh7-Q1(vL<$u6W0nxVn-qh=nwuRk}{d!uACozccRGx6~xZQ;=#JCE?OuA@;4 zadp$sm}jfgW4?La(pb!3f0B=HUI{5A4b$2rsB|ZGb?3@CTA{|zBf07pYpQ$NM({C6Srv6%_{rVkCndT=1nS}qyEf}Wjtg$e{ng7Wgz$7itYy0sWW_$qld);iUm85GBH)fk3b=2|5mvflm?~inoVo zDH_%e;y`DzoNj|NgZ`U%a9(N*=~8!qqy0Etkxo#`r!!{|(NyT0;5= z8nVZ6AiM+SjMG8J@6c4_f-KXd_}{My?Se1GWP|@wROFpD^5_lu?I%CBzpwi(`x~xh B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1acc777d741..47f7bc8f0f4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4d899cdeeef..19d49674627 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) From 6df2a068157f555615edfa9496b420f33bfd6fd8 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 19 Oct 2021 19:41:07 -0700 Subject: [PATCH 05/19] Update line number --- checker/bin-devel/wpi-plumelib/bcel-util.expected | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/wpi-plumelib/bcel-util.expected b/checker/bin-devel/wpi-plumelib/bcel-util.expected index 9c3d1132cd1..6ae7cb68040 100644 --- a/checker/bin-devel/wpi-plumelib/bcel-util.expected +++ b/checker/bin-devel/wpi-plumelib/bcel-util.expected @@ -3,7 +3,7 @@ warning: No processor claimed any of these annotations: org.checkerframework.che # # This is in method fqBinaryNameToType, but there are no calls to it, so WPI didn't infer a type for its formal parameter. # -src/main/java/org/plumelib/bcelutil/BcelUtil.java:777: error: [argument] incompatible argument for parameter typename of parseFqBinaryName. +src/main/java/org/plumelib/bcelutil/BcelUtil.java:779: error: [argument] incompatible argument for parameter typename of parseFqBinaryName. Signatures.ClassnameAndDimensions.parseFqBinaryName(classname); ^ found : @SignatureUnknown String From 6ea549c18bd3b998b99d96ab2d8e155f5fbfffde Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 19 Oct 2021 20:09:00 -0700 Subject: [PATCH 06/19] Revert "Temporary diagnostics" This reverts commit ef8d962e61a0912e3ea1bfa9be10ecd466865c7c. --- azure-pipelines.yml | 10 +++++----- gradlew | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1f591a8a344..471dffb22a1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -184,11 +184,11 @@ jobs: - bash: ./checker/bin-devel/test-typecheck.sh displayName: test-typecheck.sh - job: typecheck_jdk17 - # dependsOn: - # - junit_tests_jdk11 - # - nonjunit_tests_jdk11 - # - misc_jdk11 - # - typecheck_jdk11 + dependsOn: + - junit_tests_jdk11 + - nonjunit_tests_jdk11 + - misc_jdk11 + - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' container: mdernst/cf-ubuntu-jdk17-plus:latest diff --git a/gradlew b/gradlew index 19d49674627..744e882ed57 100755 --- a/gradlew +++ b/gradlew @@ -105,8 +105,6 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi -echo "JAVA_HOME = ${JAVA_HOME}" - # Increase the maximum file descriptors if we can. if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` From 15af0098ff0b35d32e087ecb2655e555e7179c5a Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Tue, 19 Oct 2021 20:19:01 -0700 Subject: [PATCH 07/19] Revert some changes --- .../checkerframework/checker/test/junit/DisbarUseTest.java | 2 +- .../org/checkerframework/checker/test/junit/LockTest.java | 2 +- .../checker/test/junit/NullnessRecordsTest.java | 4 ++-- .../checker/test/junit/StubparserRecordTest.java | 2 +- docs/CHANGELOG.md | 4 ++-- .../checkerframework/framework/stub/AnnotationFileUtil.java | 2 +- .../java/org/checkerframework/javacutil/ElementUtils.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java index 01b730903fa..f804e80ae85 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java @@ -25,7 +25,7 @@ public DisbarUseTest(List testFiles) { @Parameters public static String[] getTestDirs() { - // Check for JDK 17+ without using a library: + // Check for JDK 16+ without using a library: if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) return new String[] {"disbaruse-records"}; else return new String[] {}; diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java index f11dcbac54a..6ec8ce1a5fd 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java @@ -18,7 +18,7 @@ public LockTest(List testFiles) { @Parameters public static String[] getTestDirs() { - // Check for JDK 17+ without using a library: + // Check for JDK 16+ without using a library: if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) return new String[] {"lock", "lock-records", "all-systems"}; else return new String[] {"lock", "all-systems"}; diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java index a27b2eede43..ff76024efdf 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java @@ -6,7 +6,7 @@ import org.checkerframework.framework.test.CheckerFrameworkPerDirectoryTest; import org.junit.runners.Parameterized.Parameters; -/** JUnit tests for the Nullness checker with records (JDK17+ only). */ +/** JUnit tests for the Nullness checker with records (JDK16+ only). */ public class NullnessRecordsTest extends CheckerFrameworkPerDirectoryTest { /** @@ -26,7 +26,7 @@ public NullnessRecordsTest(List testFiles) { @Parameters public static String[] getTestDirs() { - // Check for JDK 17+ without using a library: + // Check for JDK 16+ without using a library: if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) return new String[] {"nullness-records"}; else return new String[] {}; diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java index 70af6c2898b..c5e854499bf 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java @@ -25,7 +25,7 @@ public StubparserRecordTest(List testFiles) { @Parameterized.Parameters public static String[] getTestDirs() { - // Check for JDK 17+ without using a library: + // Check for JDK 16+ without using a library: if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) return new String[] {"stubparser-records"}; else return new String[] {}; diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 6ed37106158..b951c33f390 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -72,12 +72,12 @@ Version 3.16.0 (July 13, 2021) **User-visible changes:** -You can run the Checker Framework on a JDK 17 JVM. You can pass the `--release +You can run the Checker Framework on a JDK 16 JVM. You can pass the `--release 16` command-line argument to the compiler. You may need to add additional command-line options, such as `--add-opens`; see the Checker Framework manual. New syntax, such as records and switch expressions, is not yet supported or type-checked; that will be added in a future release. Thanks to Neil Brown for -the JDK 17 support. +the JDK 16 support. The Lock Checker supports a new type, `@NewObject`, for the result of a constructor invocation. diff --git a/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileUtil.java b/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileUtil.java index e386c193385..aca48ac583d 100644 --- a/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileUtil.java +++ b/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileUtil.java @@ -489,7 +489,7 @@ public int compare(File o1, File o2) { public static boolean isCanonicalConstructor(ExecutableElement elt, Types types) { if (elt.getKind() == ElementKind.CONSTRUCTOR) { Element enclosing = elt.getEnclosingElement(); - // Can't use RECORD enum constant as it's not available before JDK 17: + // Can't use RECORD enum constant as it's not available before JDK 16: if (enclosing.getKind().name().equals("RECORD")) { List recordComponents = ElementUtils.getRecordComponents((TypeElement) enclosing); diff --git a/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java index d5636d89f5e..9811a6a8745 100644 --- a/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java +++ b/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java @@ -932,7 +932,7 @@ public static ElementKind getKindRecordAsClass(Element elt) { /** * Calls getRecordComponents on the given TypeElement. Uses reflection because this method is not - * available before JDK 17. On earlier JDKs, which don't support records anyway, an exception is + * available before JDK 16. On earlier JDKs, which don't support records anyway, an exception is * thrown. * * @param element the type element to call getRecordComponents on From 15075858644d2f69bcdcb1f41254047c91aab51a Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 06:44:48 -0700 Subject: [PATCH 08/19] More JDK 17 changes --- build.gradle | 4 ++-- .../checker/test/junit/NullnessRecordsTest.java | 3 ++- .../checker/test/junit/StubparserRecordTest.java | 3 ++- docs/manual/introduction.tex | 7 ++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 05714411f74..2f965e3a697 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ switch (JavaVersion.current()) { case JavaVersion.VERSION_1_9: case JavaVersion.VERSION_1_10: case JavaVersion.VERSION_12: - logger.warn("The Checker Framework has only been tested with JDK 8 and 11." + + logger.warn("The Checker Framework has only been tested with JDK 8, 11, and 17." + " Found version " + JavaVersion.current().majorVersion); break; case JavaVersion.VERSION_1_8: @@ -63,7 +63,7 @@ switch (JavaVersion.current()) { case JavaVersion.VERSION_17: break; // Supported versions default: - throw new GradleException("Build the Checker Framework with JDK 8 or JDK 11." + + throw new GradleException("Build the Checker Framework with JDK 8, 11, or 17." + " Found version " + JavaVersion.current().majorVersion); } diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java index ff76024efdf..fafb8ddccc7 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/NullnessRecordsTest.java @@ -27,7 +27,8 @@ public NullnessRecordsTest(List testFiles) { @Parameters public static String[] getTestDirs() { // Check for JDK 16+ without using a library: - if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) + // There is no decimal point in the JDK 17 version number. + if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])")) return new String[] {"nullness-records"}; else return new String[] {}; } diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java index c5e854499bf..f1de05f25e0 100644 --- a/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java +++ b/checker/src/test/java/org/checkerframework/checker/test/junit/StubparserRecordTest.java @@ -26,7 +26,8 @@ public StubparserRecordTest(List testFiles) { @Parameterized.Parameters public static String[] getTestDirs() { // Check for JDK 16+ without using a library: - if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) + // There is no decimal point in the JDK 17 version number. + if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])")) return new String[] {"stubparser-records"}; else return new String[] {}; } diff --git a/docs/manual/introduction.tex b/docs/manual/introduction.tex index dc2c997f1e8..d8fe2afaa22 100644 --- a/docs/manual/introduction.tex +++ b/docs/manual/introduction.tex @@ -196,10 +196,11 @@ \textbf{Requirement:} % Keep in sync with build.gradle and SourceChecker.init. -You must have \textbf{JDK 8} or \textbf{JDK 11} installed. +You must have \textbf{JDK 8}, \textbf{JDK 11}, or \textbf{JDK 17} installed. % Possible replacement for the above. -% You must have a supported LTS JDK installed: \textbf{JDK 8} or \textbf{JDK 11}. -The Checker Framework processes code written for either of those versions. +% You must have a supported LTS JDK installed: \textbf{JDK 8}, \textbf{JDK +% 11}, or \textbf{JDK 17}. +The Checker Framework processes code written for any of those versions. The installation process has two required steps and one optional step. From ab69394bc8609e3898afd787ed41edffb36f6402 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 07:05:57 -0700 Subject: [PATCH 09/19] Temporarily disable dependencies --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 471dffb22a1..8ff52d6c215 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -110,11 +110,11 @@ jobs: - bash: ./checker/bin-devel/test-cftests-inference.sh displayName: test-cftests-inference.sh - job: inference_tests_jdk17 - dependsOn: - - junit_tests_jdk11 - - inference_tests_jdk11 - - misc_jdk11 - - typecheck_jdk11 + # dependsOn: + # - junit_tests_jdk11 + # - inference_tests_jdk11 + # - misc_jdk11 + # - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' container: mdernst/cf-ubuntu-jdk17:latest From 2a7e0a6ca97b1394d31d692c1d709931a05a9002 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 09:27:14 -0700 Subject: [PATCH 10/19] Temporarily disable wip-many-tests-bcel-util --- checker/bin/wpi-many.sh | 3 +++ checker/tests/wpi-many/testin.txt | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/checker/bin/wpi-many.sh b/checker/bin/wpi-many.sh index 528478ab8b8..e8a48be8220 100755 --- a/checker/bin/wpi-many.sh +++ b/checker/bin/wpi-many.sh @@ -155,6 +155,9 @@ cd "${OUTDIR}" || exit 5 while IFS='' read -r line || [ "$line" ] do + # Skip lines that start with "#". + [[ $line = \#* ]] && continue + REPOHASH=${line} REPO=$(echo "${REPOHASH}" | awk '{print $1}') diff --git a/checker/tests/wpi-many/testin.txt b/checker/tests/wpi-many/testin.txt index 39268500bf3..dbcaace3de4 100644 --- a/checker/tests/wpi-many/testin.txt +++ b/checker/tests/wpi-many/testin.txt @@ -1,4 +1,5 @@ -https://github.com/kelloggm/wpi-many-tests-bcel-util 5f1b25b75cca16dce9894ba034913f30932250c6 +# Reinstate after https://github.com/kelloggm/wpi-many-tests-bcel-util/pull/2 is merged. +# https://github.com/kelloggm/wpi-many-tests-bcel-util 5f1b25b75cca16dce9894ba034913f30932250c6 https://github.com/kelloggm/wpi-many-tests-bibtex-clean c98e656ff374e77e8246a4557cd42b78f734a625 https://github.com/kelloggm/wpi-many-tests-html-pretty-print 3700a25225d29be033f86c3d87d41855537c1b02 https://github.com/kelloggm/-wpi-many-tests-bibtex-clean 4aae8e31ad36a1e64e15f31ed2bd0894f7ac6fe4 From bbddef66c1ad1f693e2e78548faee5a23b0a90cd Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 10:17:29 -0700 Subject: [PATCH 11/19] Filter out commented lines --- checker/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checker/build.gradle b/checker/build.gradle index 5d5a7a0d025..d48f8f3e63d 100644 --- a/checker/build.gradle +++ b/checker/build.gradle @@ -711,7 +711,9 @@ task wpiManyTest(group: "Verification") { def typecheckFiles = fileTree(typecheckFilesDir).matching { include "**/*-typecheck.out" } - def expectedTypecheckFileCount = file("${project.projectDir}/tests/wpi-many/testin.txt").text.readLines().size() + def testinLines = file("${project.projectDir}/tests/wpi-many/testin.txt").text.readLines() + testinLines.removeIf { it.startsWith("#") } + def expectedTypecheckFileCount = testinLines.size() def actualTypecheckFileCount = typecheckFiles.size() if (actualTypecheckFileCount != expectedTypecheckFileCount) { println("Failure: Too few *-typecheck.out files in ${typecheckFilesDir}: " + From 7a7863716e0499394b6a49d83221071b906e75a5 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 11:57:42 -0700 Subject: [PATCH 12/19] Reinstate test --- checker/tests/wpi-many/testin.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checker/tests/wpi-many/testin.txt b/checker/tests/wpi-many/testin.txt index dbcaace3de4..39268500bf3 100644 --- a/checker/tests/wpi-many/testin.txt +++ b/checker/tests/wpi-many/testin.txt @@ -1,5 +1,4 @@ -# Reinstate after https://github.com/kelloggm/wpi-many-tests-bcel-util/pull/2 is merged. -# https://github.com/kelloggm/wpi-many-tests-bcel-util 5f1b25b75cca16dce9894ba034913f30932250c6 +https://github.com/kelloggm/wpi-many-tests-bcel-util 5f1b25b75cca16dce9894ba034913f30932250c6 https://github.com/kelloggm/wpi-many-tests-bibtex-clean c98e656ff374e77e8246a4557cd42b78f734a625 https://github.com/kelloggm/wpi-many-tests-html-pretty-print 3700a25225d29be033f86c3d87d41855537c1b02 https://github.com/kelloggm/-wpi-many-tests-bibtex-clean 4aae8e31ad36a1e64e15f31ed2bd0894f7ac6fe4 From e11d78df0eb49f3ef0bfd73a593dd051255a60f1 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 12:53:49 -0700 Subject: [PATCH 13/19] Add diagnostics --- checker/bin/wpi.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/checker/bin/wpi.sh b/checker/bin/wpi.sh index f1203f51fcf..bad4532282f 100755 --- a/checker/bin/wpi.sh +++ b/checker/bin/wpi.sh @@ -197,6 +197,11 @@ function configure_and_exec_dljc { # Remove old DLJC output. rm -rf dljc-out + echo "PATH = ${PATH}" + javac -version + echo "PWD = $(pwd)" + echo "GRADLE_EXEC = ${GRADLE_EXEC}" + # Ensure the project is clean before invoking DLJC. # If it fails, re-run without piping output to /dev/null. eval "${CLEAN_CMD}" < /dev/null > /dev/null 2>&1 || eval "${CLEAN_CMD}" < /dev/null From 71c46487f07d8459f863710d14356f85ce873056 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 12:58:47 -0700 Subject: [PATCH 14/19] More diagnostics --- checker/bin/wpi.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/checker/bin/wpi.sh b/checker/bin/wpi.sh index bad4532282f..0ce073679ac 100755 --- a/checker/bin/wpi.sh +++ b/checker/bin/wpi.sh @@ -198,6 +198,10 @@ function configure_and_exec_dljc { rm -rf dljc-out echo "PATH = ${PATH}" + echo "JAVA_HOME = ${JAVA_HOME}" + echo "JAVA8_HOME = ${JAVA8_HOME}" + echo "JAVA11_HOME = ${JAVA11_HOME}" + echo "JAVA17_HOME = ${JAVA17_HOME}" javac -version echo "PWD = $(pwd)" echo "GRADLE_EXEC = ${GRADLE_EXEC}" From f833f61be97c0ee877d3a4102dc49619e4ce8ba0 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 13:18:25 -0700 Subject: [PATCH 15/19] Use commit IDs that support JDK 17 --- checker/bin/wpi.sh | 3 ++- checker/tests/wpi-many/testin.txt | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/checker/bin/wpi.sh b/checker/bin/wpi.sh index 0ce073679ac..660468d2607 100755 --- a/checker/bin/wpi.sh +++ b/checker/bin/wpi.sh @@ -202,9 +202,10 @@ function configure_and_exec_dljc { echo "JAVA8_HOME = ${JAVA8_HOME}" echo "JAVA11_HOME = ${JAVA11_HOME}" echo "JAVA17_HOME = ${JAVA17_HOME}" - javac -version + echo "javac -version = $(javac -version)" echo "PWD = $(pwd)" echo "GRADLE_EXEC = ${GRADLE_EXEC}" + echo "${GRADLE_EXEC} --version = $(${GRADLE_EXEC} --version)" # Ensure the project is clean before invoking DLJC. # If it fails, re-run without piping output to /dev/null. diff --git a/checker/tests/wpi-many/testin.txt b/checker/tests/wpi-many/testin.txt index 39268500bf3..3efbc6f6728 100644 --- a/checker/tests/wpi-many/testin.txt +++ b/checker/tests/wpi-many/testin.txt @@ -1,5 +1,5 @@ -https://github.com/kelloggm/wpi-many-tests-bcel-util 5f1b25b75cca16dce9894ba034913f30932250c6 -https://github.com/kelloggm/wpi-many-tests-bibtex-clean c98e656ff374e77e8246a4557cd42b78f734a625 -https://github.com/kelloggm/wpi-many-tests-html-pretty-print 3700a25225d29be033f86c3d87d41855537c1b02 -https://github.com/kelloggm/-wpi-many-tests-bibtex-clean 4aae8e31ad36a1e64e15f31ed2bd0894f7ac6fe4 -https://github.com/kelloggm/wpi-many-tests-ensures-called-methods f334f8ca04b64c8cccdbb4aa3ecac9d99f74b06b +https://github.com/kelloggm/wpi-many-tests-bcel-util 9a7706607425e6fbbd2c3915364eef020c39a2f9 +https://github.com/kelloggm/wpi-many-tests-bibtex-clean 703c0190ab7d7436a5be6e160667f194da44fdee +https://github.com/kelloggm/wpi-many-tests-html-pretty-print 37e5f4fa0506690c968ec6f3e316c1d0a111bded +https://github.com/kelloggm/-wpi-many-tests-bibtex-clean bd6c1cff1ba3fb8a6ecbbb73561ec2a43d018a79 +https://github.com/kelloggm/wpi-many-tests-ensures-called-methods e1e6d4c8c5ab4190b181fcbc95b5249c3a21afae From c655ead5357caf78f9ab79512f0040368ed374c2 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 14:01:18 -0700 Subject: [PATCH 16/19] Undo some changes --- build.gradle | 2 +- checker/bin/wpi.sh | 10 ---------- checker/build.gradle | 4 +--- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 3a8c01292c6..dd47a538b4d 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,7 @@ allprojects { // the sections with labels "javac-jdk11-non-modularized", "maven", and "sbt" in the manual // and in the checker-framework-gradle-plugin, CheckerFrameworkPlugin#applyToProject compilerArgsForRunningCF = [ - // These are required in Java 17+ because the --illegal-access option is set to deny + // These are required in Java 16+ because the --illegal-access option is set to deny // by default. None of these packages are accessed via reflection, so the module // only needs to be exported, but not opened. "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", diff --git a/checker/bin/wpi.sh b/checker/bin/wpi.sh index 660468d2607..f1203f51fcf 100755 --- a/checker/bin/wpi.sh +++ b/checker/bin/wpi.sh @@ -197,16 +197,6 @@ function configure_and_exec_dljc { # Remove old DLJC output. rm -rf dljc-out - echo "PATH = ${PATH}" - echo "JAVA_HOME = ${JAVA_HOME}" - echo "JAVA8_HOME = ${JAVA8_HOME}" - echo "JAVA11_HOME = ${JAVA11_HOME}" - echo "JAVA17_HOME = ${JAVA17_HOME}" - echo "javac -version = $(javac -version)" - echo "PWD = $(pwd)" - echo "GRADLE_EXEC = ${GRADLE_EXEC}" - echo "${GRADLE_EXEC} --version = $(${GRADLE_EXEC} --version)" - # Ensure the project is clean before invoking DLJC. # If it fails, re-run without piping output to /dev/null. eval "${CLEAN_CMD}" < /dev/null > /dev/null 2>&1 || eval "${CLEAN_CMD}" < /dev/null diff --git a/checker/build.gradle b/checker/build.gradle index d48f8f3e63d..5d5a7a0d025 100644 --- a/checker/build.gradle +++ b/checker/build.gradle @@ -711,9 +711,7 @@ task wpiManyTest(group: "Verification") { def typecheckFiles = fileTree(typecheckFilesDir).matching { include "**/*-typecheck.out" } - def testinLines = file("${project.projectDir}/tests/wpi-many/testin.txt").text.readLines() - testinLines.removeIf { it.startsWith("#") } - def expectedTypecheckFileCount = testinLines.size() + def expectedTypecheckFileCount = file("${project.projectDir}/tests/wpi-many/testin.txt").text.readLines().size() def actualTypecheckFileCount = typecheckFiles.size() if (actualTypecheckFileCount != expectedTypecheckFileCount) { println("Failure: Too few *-typecheck.out files in ${typecheckFilesDir}: " + From ebf026b22444a351cc49cc604d1f28ebef1bc108 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 14:05:01 -0700 Subject: [PATCH 17/19] Undo another change --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8ff52d6c215..471dffb22a1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -110,11 +110,11 @@ jobs: - bash: ./checker/bin-devel/test-cftests-inference.sh displayName: test-cftests-inference.sh - job: inference_tests_jdk17 - # dependsOn: - # - junit_tests_jdk11 - # - inference_tests_jdk11 - # - misc_jdk11 - # - typecheck_jdk11 + dependsOn: + - junit_tests_jdk11 + - inference_tests_jdk11 + - misc_jdk11 + - typecheck_jdk11 pool: vmImage: 'ubuntu-latest' container: mdernst/cf-ubuntu-jdk17:latest From 9c8d9f80d24255081165f7a84c096d4e94f9cb54 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 14:12:33 -0700 Subject: [PATCH 18/19] Undo another change --- checker/bin/wpi-many.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/checker/bin/wpi-many.sh b/checker/bin/wpi-many.sh index e8a48be8220..528478ab8b8 100755 --- a/checker/bin/wpi-many.sh +++ b/checker/bin/wpi-many.sh @@ -155,9 +155,6 @@ cd "${OUTDIR}" || exit 5 while IFS='' read -r line || [ "$line" ] do - # Skip lines that start with "#". - [[ $line = \#* ]] && continue - REPOHASH=${line} REPO=$(echo "${REPOHASH}" | awk '{print $1}') From cb8e0a3d718785e9e13991f71fca10c6ac89a844 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Wed, 20 Oct 2021 17:09:18 -0700 Subject: [PATCH 19/19] Tweak changelog --- docs/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b951c33f390..6a08b3eded9 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,7 +3,8 @@ Version 3.1?.? (November 1, 2021) **User-visible changes:** -Improved support for running under JDK 17; ended support for JDK 16. +The Checker Framework runs under JDK 17 -- that is, it runs on a version 17 JVM. +(Switch expressions are not yet supported.) **Implementation details:**