From cc8b890413972356546ad9699fda07e20fff4acf Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sun, 18 Aug 2024 22:07:23 -0400 Subject: [PATCH 01/30] Move misc check to Github Actions --- .github/workflows/ci.yml | 4 +-- azure-pipelines.yml | 75 ---------------------------------------- 2 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09b8e6a8a9e..4984bd9c292 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: strategy: matrix: # No need to run 'cftests-junit-jdk21' on JDK 21. - script: ['typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'jspecify-conformance', 'jspecify-reference-checker'] + script: ['typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'jspecify-conformance', 'jspecify-reference-checker', 'misc'] java_version: [21] env: JAVA_VERSION: ${{ matrix.java_version }} @@ -77,7 +77,7 @@ jobs: fail-fast: false matrix: # jspecify-conformance and jspecify-reference-checker only tested on JDK 21. - script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2'] + script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'misc'] # JDK 21 used by sanity before java: [{version: '8', experimental: false}, {version: '11', experimental: false}, diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 068eb5090d3..00000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,75 +0,0 @@ -# Workaround for https://status.dev.azure.com/_event/179641421 -trigger: - branches: - include: - - '*' -pr: - branches: - include: - - '*' - -jobs: - -# Unlimited fetchDepth for misc_jobs, because of need to make contributors.tex -- job: misc_jdk8 - # dependsOn: - # - misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk8-plus:latest - steps: - - checkout: self - - bash: ./checker/bin-devel/test-misc.sh - displayName: test-misc.sh -- job: misc_jdk11 - # dependsOn: - # - misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk11-plus:latest - steps: - - checkout: self - - bash: ./checker/bin-devel/test-misc.sh - displayName: test-misc.sh -- job: misc_jdk17 - # dependsOn: - # - misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk17-plus:latest - steps: - - checkout: self - - bash: ./checker/bin-devel/test-misc.sh - displayName: test-misc.sh -- job: misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk21-plus:latest - steps: - - checkout: self - - bash: ./checker/bin-devel/test-misc.sh - displayName: test-misc.sh -# Disable until JDK 22 is stable -# - job: misc_jdk_latest -# dependsOn: -# # - canary_jobs -# - misc_jdk21 -# pool: -# vmImage: 'ubuntu-latest' -# container: wmdietl/cf-ubuntu-jdk-latest-plus:latest -# steps: -# - checkout: self -# - bash: ./checker/bin-devel/test-misc.sh -# displayName: test-misc.sh -- job: misc_jdk_next - # dependsOn: - # - misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk-next-plus:latest - steps: - - checkout: self - # Run test, but do not cause overall failure - - bash: ./checker/bin-devel/test-misc.sh - continueOnError: true - displayName: test-misc.sh From c9c96afd2a940dd2b753502fda4b07c575d46f6d Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sun, 18 Aug 2024 23:27:43 -0400 Subject: [PATCH 02/30] Install required dependency --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4984bd9c292..f1839674d4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,12 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.0.0 - + # Setup for misc tests + - name: Install shellcheck and checkbashisms + run: sudo apt install shellcheck devscripts + # Setup for misc tests + - name: Check style + run: make check-style - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh From 15364204e64f93ff5489fd1f837760b08b0654b5 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Sun, 18 Aug 2024 23:31:15 -0400 Subject: [PATCH 03/30] Remove useless code --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1839674d4f..22e45222ef7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,9 +34,6 @@ jobs: # Setup for misc tests - name: Install shellcheck and checkbashisms run: sudo apt install shellcheck devscripts - # Setup for misc tests - - name: Check style - run: make check-style - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh From 06a32a40e1e7bce7f38b5052c33d41ec0afd2cb0 Mon Sep 17 00:00:00 2001 From: Aosen Xiong <82676488+Ao-senXiong@users.noreply.github.com> Date: Wed, 21 Aug 2024 00:13:19 -0400 Subject: [PATCH 04/30] Update .github/workflows/ci.yml Co-authored-by: Werner Dietl --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcaca62063f..68be9b18ce9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,7 @@ jobs: # Setup for misc tests - name: Install shellcheck and checkbashisms run: sudo apt install shellcheck devscripts + if: matrix.script == 'misc' - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh From 47caf76d5ecab54dcc8ee49df3ded32b34132b58 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 21 Aug 2024 00:23:32 -0400 Subject: [PATCH 05/30] Reverse order for conditional expressions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a05703e45fe..2e3e9b02f9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,8 @@ jobs: uses: gradle/actions/setup-gradle@v4.0.0 # Setup for misc tests - name: Install shellcheck and checkbashisms - run: sudo apt install shellcheck devscripts if: matrix.script == 'misc' + run: apt install shellcheck devscripts - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh From 1b6bab2c17564cfe5af336a8a37c97f089cc9160 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 21 Aug 2024 00:29:46 -0400 Subject: [PATCH 06/30] Move install to correct place --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e3e9b02f9a..3a36912ac2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,10 +37,6 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.0.0 - # Setup for misc tests - - name: Install shellcheck and checkbashisms - if: matrix.script == 'misc' - run: apt install shellcheck devscripts - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -72,7 +68,10 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.0.0 - + # Setup for misc tests + - name: Install shellcheck and checkbashisms + if: matrix.script == 'misc' + run: apt install shellcheck devscripts - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh From dafd2e03d0c8baaf2ed1966c7f81954d57225548 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 21 Aug 2024 00:31:38 -0400 Subject: [PATCH 07/30] Use sudo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a36912ac2b..a9e9facd902 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: # Setup for misc tests - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' - run: apt install shellcheck devscripts + run: sudo apt install shellcheck devscripts - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh From 4f0cfcc5a44fdcf2ad2af770c3b9e63d07cc2365 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 21 Aug 2024 00:33:08 -0400 Subject: [PATCH 08/30] Also add installation for otherjdks --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9e9facd902..fc9c585ea56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,7 +116,10 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.0.0 - + # Setup for misc tests + - name: Install shellcheck and checkbashisms + if: matrix.script == 'misc' + run: sudo apt install shellcheck devscripts - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh # TODO: it would be nicer to not run the job at all, but GH Actions does From 48c75b32eaf6eea2176290a7a6a979624f86c855 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 21 Aug 2024 00:40:50 -0400 Subject: [PATCH 09/30] Also install black --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc9c585ea56..880c6263b03 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,9 @@ jobs: # Setup for misc tests - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' - run: sudo apt install shellcheck devscripts + run: | + sudo apt install shellcheck devscripts python3-pip + pip install black - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -119,7 +121,9 @@ jobs: # Setup for misc tests - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' - run: sudo apt install shellcheck devscripts + run: | + sudo apt install shellcheck devscripts python3-pip + pip install black - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh # TODO: it would be nicer to not run the job at all, but GH Actions does From bfcbfe9e4fe67ee6327f76ee0f9d0cf0760a275c Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Wed, 21 Aug 2024 01:21:09 -0400 Subject: [PATCH 10/30] Also install flake8 and html5validator --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 880c6263b03..4773ce58e56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: if: matrix.script == 'misc' run: | sudo apt install shellcheck devscripts python3-pip - pip install black + pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -123,7 +123,7 @@ jobs: if: matrix.script == 'misc' run: | sudo apt install shellcheck devscripts python3-pip - pip install black + pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh # TODO: it would be nicer to not run the job at all, but GH Actions does From fa808cd2f845dbdfc81eee982ba3376230b3f480 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Wed, 21 Aug 2024 13:12:22 -0400 Subject: [PATCH 11/30] Attempt to set the fetch depth --- .github/workflows/ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4773ce58e56..1900140357b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,6 +58,12 @@ jobs: JAVA_VERSION: ${{ matrix.java_version }} steps: - uses: actions/checkout@v4 + if: matrix.script != 'misc' + fetch-depth: 1 + - uses: actions/checkout@v4 + if: matrix.script == 'misc' + # CI diff needs more history - 0 fetches all history. + fetch-depth: 0 - name: Set up JDK ${{ matrix.java_version }} uses: actions/setup-java@v4 with: @@ -100,6 +106,12 @@ jobs: continue-on-error: ${{ matrix.java.experimental }} steps: - uses: actions/checkout@v4 + if: matrix.script != 'misc' + fetch-depth: 1 + - uses: actions/checkout@v4 + if: matrix.script == 'misc' + # CI diff needs more history - 0 fetches all history. + fetch-depth: 0 - name: Set up JDK ${{ matrix.java.version }} uses: actions/setup-java@v4 with: From f3cf69669d8199897066fea72b4e5bab7465cc08 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Wed, 21 Aug 2024 13:15:05 -0400 Subject: [PATCH 12/30] Attempt syntax tweak --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1900140357b..cad48f62b8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,11 +59,11 @@ jobs: steps: - uses: actions/checkout@v4 if: matrix.script != 'misc' - fetch-depth: 1 + fetch-depth: '1' - uses: actions/checkout@v4 if: matrix.script == 'misc' # CI diff needs more history - 0 fetches all history. - fetch-depth: 0 + fetch-depth: '0' - name: Set up JDK ${{ matrix.java_version }} uses: actions/setup-java@v4 with: @@ -107,11 +107,11 @@ jobs: steps: - uses: actions/checkout@v4 if: matrix.script != 'misc' - fetch-depth: 1 + fetch-depth: '1' - uses: actions/checkout@v4 if: matrix.script == 'misc' # CI diff needs more history - 0 fetches all history. - fetch-depth: 0 + fetch-depth: '0' - name: Set up JDK ${{ matrix.java.version }} uses: actions/setup-java@v4 with: From b2977b5aa89228f405cc1388e08307cda868b1f0 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Wed, 21 Aug 2024 13:16:57 -0400 Subject: [PATCH 13/30] Use `with` --- .github/workflows/ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cad48f62b8e..c67b8f60d6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,11 +59,13 @@ jobs: steps: - uses: actions/checkout@v4 if: matrix.script != 'misc' - fetch-depth: '1' + with: + fetch-depth: 1 - uses: actions/checkout@v4 if: matrix.script == 'misc' - # CI diff needs more history - 0 fetches all history. - fetch-depth: '0' + with: + # CI diff needs more history - 0 fetches all history. + fetch-depth: 0 - name: Set up JDK ${{ matrix.java_version }} uses: actions/setup-java@v4 with: @@ -107,11 +109,13 @@ jobs: steps: - uses: actions/checkout@v4 if: matrix.script != 'misc' - fetch-depth: '1' + with: + fetch-depth: 1 - uses: actions/checkout@v4 if: matrix.script == 'misc' - # CI diff needs more history - 0 fetches all history. - fetch-depth: '0' + with: + # CI diff needs more history - 0 fetches all history. + fetch-depth: 0 - name: Set up JDK ${{ matrix.java.version }} uses: actions/setup-java@v4 with: From 57a29cde51dc2473603a8c52f241e0a7003fc4c8 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Mon, 30 Dec 2024 21:47:14 -0500 Subject: [PATCH 14/30] Test with CI Debug --- checker/bin-devel/clone-related.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checker/bin-devel/clone-related.sh b/checker/bin-devel/clone-related.sh index c1501d30d4c..92ea161b903 100755 --- a/checker/bin-devel/clone-related.sh +++ b/checker/bin-devel/clone-related.sh @@ -7,7 +7,7 @@ set -e DEBUG=0 # To enable debugging, uncomment the following line. -# DEBUG=1 +DEBUG=1 if [ $DEBUG -eq 0 ] ; then DEBUG_FLAG= From d126f485f2dae078dd145e2aa2fb7154b5757657 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 12:41:46 -0500 Subject: [PATCH 15/30] Empty commit for CI From 73660b245eb923328c4063f508af8467e2d684a7 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 12:49:19 -0800 Subject: [PATCH 16/30] Also debug for CI-lint --- checker/bin-devel/test-misc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checker/bin-devel/test-misc.sh b/checker/bin-devel/test-misc.sh index 3e21746d48e..91b5b0d482c 100755 --- a/checker/bin-devel/test-misc.sh +++ b/checker/bin-devel/test-misc.sh @@ -44,9 +44,9 @@ if [ -f SKIP-REQUIRE-JAVADOC ]; then echo "Skipping requireJavadoc because file SKIP-REQUIRE-JAVADOC exists." else (./gradlew requireJavadoc --console=plain --warning-mode=all > /tmp/warnings-rjp.txt 2>&1) || true - "$PLUME_SCRIPTS"/ci-lint-diff /tmp/warnings-rjp.txt || status=1 + "$PLUME_SCRIPTS"/ci-lint-diff --debug /tmp/warnings-rjp.txt || status=1 (./gradlew javadocDoclintAll --console=plain --warning-mode=all > /tmp/warnings-jda.txt 2>&1) || true - "$PLUME_SCRIPTS"/ci-lint-diff /tmp/warnings-jda.txt || status=1 + "$PLUME_SCRIPTS"/ci-lint-diff --debug /tmp/warnings-jda.txt || status=1 fi if [ $status -ne 0 ]; then exit $status; fi From 34c9eb98d02a20d3a9a0de5a04bc0c28b60de453 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 14:28:24 -0800 Subject: [PATCH 17/30] Revert debug --- checker/bin-devel/clone-related.sh | 2 +- checker/bin-devel/test-misc.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checker/bin-devel/clone-related.sh b/checker/bin-devel/clone-related.sh index 92ea161b903..c1501d30d4c 100755 --- a/checker/bin-devel/clone-related.sh +++ b/checker/bin-devel/clone-related.sh @@ -7,7 +7,7 @@ set -e DEBUG=0 # To enable debugging, uncomment the following line. -DEBUG=1 +# DEBUG=1 if [ $DEBUG -eq 0 ] ; then DEBUG_FLAG= diff --git a/checker/bin-devel/test-misc.sh b/checker/bin-devel/test-misc.sh index 91b5b0d482c..3e21746d48e 100755 --- a/checker/bin-devel/test-misc.sh +++ b/checker/bin-devel/test-misc.sh @@ -44,9 +44,9 @@ if [ -f SKIP-REQUIRE-JAVADOC ]; then echo "Skipping requireJavadoc because file SKIP-REQUIRE-JAVADOC exists." else (./gradlew requireJavadoc --console=plain --warning-mode=all > /tmp/warnings-rjp.txt 2>&1) || true - "$PLUME_SCRIPTS"/ci-lint-diff --debug /tmp/warnings-rjp.txt || status=1 + "$PLUME_SCRIPTS"/ci-lint-diff /tmp/warnings-rjp.txt || status=1 (./gradlew javadocDoclintAll --console=plain --warning-mode=all > /tmp/warnings-jda.txt 2>&1) || true - "$PLUME_SCRIPTS"/ci-lint-diff --debug /tmp/warnings-jda.txt || status=1 + "$PLUME_SCRIPTS"/ci-lint-diff /tmp/warnings-jda.txt || status=1 fi if [ $status -ne 0 ]; then exit $status; fi From fcc00486a5e4d63ef5a6164d195c4c3a7267f969 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 14:28:42 -0800 Subject: [PATCH 18/30] Fixes Javadoc --- .../dataflow/cfg/builder/UnconditionalJump.java | 2 +- .../checkerframework/framework/type/AnnotatedTypeMirror.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/UnconditionalJump.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/UnconditionalJump.java index 0d92c27ac88..df1749339db 100644 --- a/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/UnconditionalJump.java +++ b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/UnconditionalJump.java @@ -52,7 +52,7 @@ public FlowRule getFlowRule() { * Produce a string representation. * * @return a string representation - * @see org.checkerframework.dataflow.cfg.builder.CFGBuilder.PhaseOneResult#nodeToString + * @see org.checkerframework.dataflow.cfg.builder.PhaseOneResult#nodeToString */ @Override public String toString() { diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java index afef59f6f87..235a940982b 100644 --- a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java +++ b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java @@ -1,5 +1,6 @@ package org.checkerframework.framework.type; +import com.sun.source.tree.NewClassTree; import com.sun.tools.javac.code.Symbol.MethodSymbol; import org.checkerframework.checker.formatter.qual.FormatMethod; @@ -1226,7 +1227,8 @@ private AnnotatedExecutableType(ExecutableType type, AnnotatedTypeFactory factor * The varargs type is the last element of {@link paramTypes} if the method or constructor * accepts a variable number of arguments and the {@link paramTypes} has not been expanded * yet. This type needs to be stored in the field to avoid being affected by calling {@link - * AnnotatedTypes#adaptParameters(AnnotatedTypeFactory, AnnotatedExecutableType, List)}. + * AnnotatedTypes#adaptParameters(AnnotatedTypeFactory, AnnotatedExecutableType, List, + * NewClassTree)}. */ private @MonotonicNonNull AnnotatedArrayType varargType = null; From 30fa18fd67196e665621e41773ce31a5daeca68c Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 14:45:27 -0800 Subject: [PATCH 19/30] Dependencies for manual --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb85d5e1fb6..06678f6e11c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install shellcheck devscripts python3-pip + sudo apt install shellcheck devscripts python3-pip texlive-latex-base imagemagick pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -149,7 +149,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install shellcheck devscripts python3-pip + sudo apt install shellcheck devscripts python3-pip texlive-latex-base imagemagick pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 From 69d612520445d4ca954983b30949eb53a02c7ee3 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 14:57:28 -0800 Subject: [PATCH 20/30] Extra dependency for latex --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06678f6e11c..77562bacc93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install shellcheck devscripts python3-pip texlive-latex-base imagemagick + sudo apt install shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -149,7 +149,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install shellcheck devscripts python3-pip texlive-latex-base imagemagick + sudo apt install shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 From 7a554a4c73c0b29bb1c5aed4a6757efffaa6360d Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 15:31:49 -0800 Subject: [PATCH 21/30] Use correct suggested version for imagemagick --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77562bacc93..7a2bf298322 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick + sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick=6.8.0-2 pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -149,7 +149,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick + sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick=6.8.0-2 pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 From 86cada46ddc8237a33b538292066c871cecd6dfa Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 15:35:50 -0800 Subject: [PATCH 22/30] Check which versions are available first --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a2bf298322..3b097e28330 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,8 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick=6.8.0-2 + apt-cache policy imagemagick + sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -149,7 +150,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick=6.8.0-2 + sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 From e90d1ba8fdcecbbb05d3e7953b09ab3aa37c75d7 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 15:50:50 -0800 Subject: [PATCH 23/30] Use librsvg2-bin instead --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b097e28330..93f4e7d751b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,8 +92,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - apt-cache policy imagemagick - sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick + sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra librsvg2-bin pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -150,7 +149,7 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra imagemagick + sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra librsvg2-bin pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 From c278175f4228025beb6f3ae2eecf07f2fd2ed0ab Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 16:06:56 -0800 Subject: [PATCH 24/30] Install most of the dependencies from Docker image --- .github/workflows/ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93f4e7d751b..08419546ac3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,12 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra librsvg2-bin + sudo apt install -y shellcheck devscripts python3-pip \ + texlive-latex-base texlive-latex-extra latexmk librsvg2-bin \ + autoconf dia hevea latexmk libasound2-dev rsync pdf2svg \ + libcups2-dev libfontconfig1-dev libx11-dev libxext-dev \ + libxrender-dev libxrandr-dev libxtst-dev libxt-dev \ + texlive-font-utils texlive-fonts-recommended texlive-latex-recommended pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -149,7 +154,12 @@ jobs: - name: Install shellcheck and checkbashisms if: matrix.script == 'misc' run: | - sudo apt install -y shellcheck devscripts python3-pip texlive-latex-base texlive-latex-extra librsvg2-bin + sudo apt install -y shellcheck devscripts python3-pip \ + texlive-latex-base texlive-latex-extra latexmk librsvg2-bin \ + autoconf dia hevea latexmk libasound2-dev rsync pdf2svg \ + libcups2-dev libfontconfig1-dev libx11-dev libxext-dev \ + libxrender-dev libxrandr-dev libxtst-dev libxt-dev \ + texlive-font-utils texlive-fonts-recommended texlive-latex-recommended pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 From 809ebdc6fb4e69daeb3f979b6b1113b81bf263e6 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 16:18:03 -0800 Subject: [PATCH 25/30] Wording --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08419546ac3..82a04893a69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,7 +89,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.2.2 # Setup for misc tests - - name: Install shellcheck and checkbashisms + - name: Install misc dependencies if: matrix.script == 'misc' run: | sudo apt install -y shellcheck devscripts python3-pip \ @@ -151,7 +151,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.2.2 # Setup for misc tests - - name: Install shellcheck and checkbashisms + - name: Install misc dependencies if: matrix.script == 'misc' run: | sudo apt install -y shellcheck devscripts python3-pip \ From 105b9868f4ca5941488b5f88869cf2569a387ea6 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 20:10:58 -0500 Subject: [PATCH 26/30] Use fully qualified name --- .../checkerframework/framework/type/AnnotatedTypeMirror.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java index 235a940982b..bdf5b26ea35 100644 --- a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java +++ b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java @@ -10,7 +10,6 @@ import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.dataflow.qual.SideEffectFree; import org.checkerframework.framework.type.visitor.AnnotatedTypeVisitor; -import org.checkerframework.framework.util.AnnotatedTypes; import org.checkerframework.javacutil.AnnotationBuilder; import org.checkerframework.javacutil.AnnotationMirrorSet; import org.checkerframework.javacutil.AnnotationUtils; @@ -1227,8 +1226,8 @@ private AnnotatedExecutableType(ExecutableType type, AnnotatedTypeFactory factor * The varargs type is the last element of {@link paramTypes} if the method or constructor * accepts a variable number of arguments and the {@link paramTypes} has not been expanded * yet. This type needs to be stored in the field to avoid being affected by calling {@link - * AnnotatedTypes#adaptParameters(AnnotatedTypeFactory, AnnotatedExecutableType, List, - * NewClassTree)}. + * org.checkerframework.framework.util.AnnotatedTypes#adaptParameters(AnnotatedTypeFactory, + * AnnotatedExecutableType, List, NewClassTree)}. */ private @MonotonicNonNull AnnotatedArrayType varargType = null; From a4b217ec663cd4040ef626f8432498b507955cbf Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 23:21:40 -0500 Subject: [PATCH 27/30] Revert fully qualified name --- .../checkerframework/framework/type/AnnotatedTypeMirror.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java index bdf5b26ea35..235a940982b 100644 --- a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java +++ b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java @@ -10,6 +10,7 @@ import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.dataflow.qual.SideEffectFree; import org.checkerframework.framework.type.visitor.AnnotatedTypeVisitor; +import org.checkerframework.framework.util.AnnotatedTypes; import org.checkerframework.javacutil.AnnotationBuilder; import org.checkerframework.javacutil.AnnotationMirrorSet; import org.checkerframework.javacutil.AnnotationUtils; @@ -1226,8 +1227,8 @@ private AnnotatedExecutableType(ExecutableType type, AnnotatedTypeFactory factor * The varargs type is the last element of {@link paramTypes} if the method or constructor * accepts a variable number of arguments and the {@link paramTypes} has not been expanded * yet. This type needs to be stored in the field to avoid being affected by calling {@link - * org.checkerframework.framework.util.AnnotatedTypes#adaptParameters(AnnotatedTypeFactory, - * AnnotatedExecutableType, List, NewClassTree)}. + * AnnotatedTypes#adaptParameters(AnnotatedTypeFactory, AnnotatedExecutableType, List, + * NewClassTree)}. */ private @MonotonicNonNull AnnotatedArrayType varargType = null; From 083783645bddc08764edd7c7f56b2e73766f16d0 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 23:22:03 -0500 Subject: [PATCH 28/30] Only check misc at JDK21 --- .github/workflows/ci.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82a04893a69..270f0fdae33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: fail-fast: true matrix: # jspecify-conformance and jspecify-reference-checker only tested on JDK 21. - script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'misc'] + script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2'] # JDK 21 used by sanity before java: [{version: '8', experimental: false}, {version: '11', experimental: false}, @@ -124,14 +124,6 @@ jobs: continue-on-error: ${{ matrix.java.experimental }} steps: - uses: actions/checkout@v4 - if: matrix.script != 'misc' - with: - fetch-depth: 1 - - uses: actions/checkout@v4 - if: matrix.script == 'misc' - with: - # CI diff needs more history - 0 fetches all history. - fetch-depth: 0 - name: Set up JDK ${{ matrix.java.version }} uses: actions/setup-java@v4 with: @@ -150,17 +142,6 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.2.2 - # Setup for misc tests - - name: Install misc dependencies - if: matrix.script == 'misc' - run: | - sudo apt install -y shellcheck devscripts python3-pip \ - texlive-latex-base texlive-latex-extra latexmk librsvg2-bin \ - autoconf dia hevea latexmk libasound2-dev rsync pdf2svg \ - libcups2-dev libfontconfig1-dev libx11-dev libxext-dev \ - libxrender-dev libxrandr-dev libxtst-dev libxt-dev \ - texlive-font-utils texlive-fonts-recommended texlive-latex-recommended - pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 if: matrix.script == 'cftests-nonjunit' From 0ddc17b53829e8e1fdf71a88ac358a0dc783498a Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Tue, 31 Dec 2024 23:26:29 -0500 Subject: [PATCH 29/30] Add empty lines to reduce changes --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 270f0fdae33..38f91ea206e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,6 +142,7 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.2.2 + - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 if: matrix.script == 'cftests-nonjunit' @@ -152,6 +153,7 @@ jobs: disk-cache: ${{ github.workflow }} # Share repository cache between workflows. repository-cache: true + - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh # TODO: it would be nicer to not run the job at all, but GH Actions does From d1ad2e1172afbda2beeb41af3582d3ba7580e4bc Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Thu, 2 Jan 2025 15:43:41 -0800 Subject: [PATCH 30/30] Enable misc for otherjdks and revert Javadoc change --- .github/workflows/ci.yml | 22 +++++++++++++++++-- .../cfg/builder/UnconditionalJump.java | 2 +- .../framework/type/AnnotatedTypeMirror.java | 4 +--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38f91ea206e..aed145d2e13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: fail-fast: true matrix: # jspecify-conformance and jspecify-reference-checker only tested on JDK 21. - script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2'] + script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'misc'] # JDK 21 used by sanity before java: [{version: '8', experimental: false}, {version: '11', experimental: false}, @@ -124,6 +124,14 @@ jobs: continue-on-error: ${{ matrix.java.experimental }} steps: - uses: actions/checkout@v4 + if: matrix.script != 'misc' + with: + fetch-depth: 1 + - uses: actions/checkout@v4 + if: matrix.script == 'misc' + with: + # CI diff needs more history - 0 fetches all history. + fetch-depth: 0 - name: Set up JDK ${{ matrix.java.version }} uses: actions/setup-java@v4 with: @@ -142,7 +150,17 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.2.2 - + # Setup for misc tests + - name: Install misc dependencies + if: matrix.script == 'misc' + run: | + sudo apt install -y shellcheck devscripts python3-pip \ + texlive-latex-base texlive-latex-extra latexmk librsvg2-bin \ + autoconf dia hevea latexmk libasound2-dev rsync pdf2svg \ + libcups2-dev libfontconfig1-dev libx11-dev libxext-dev \ + libxrender-dev libxrandr-dev libxtst-dev libxt-dev \ + texlive-font-utils texlive-fonts-recommended texlive-latex-recommended + pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 if: matrix.script == 'cftests-nonjunit' diff --git a/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/UnconditionalJump.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/UnconditionalJump.java index df1749339db..0d92c27ac88 100644 --- a/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/UnconditionalJump.java +++ b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/UnconditionalJump.java @@ -52,7 +52,7 @@ public FlowRule getFlowRule() { * Produce a string representation. * * @return a string representation - * @see org.checkerframework.dataflow.cfg.builder.PhaseOneResult#nodeToString + * @see org.checkerframework.dataflow.cfg.builder.CFGBuilder.PhaseOneResult#nodeToString */ @Override public String toString() { diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java index 235a940982b..afef59f6f87 100644 --- a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java +++ b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java @@ -1,6 +1,5 @@ package org.checkerframework.framework.type; -import com.sun.source.tree.NewClassTree; import com.sun.tools.javac.code.Symbol.MethodSymbol; import org.checkerframework.checker.formatter.qual.FormatMethod; @@ -1227,8 +1226,7 @@ private AnnotatedExecutableType(ExecutableType type, AnnotatedTypeFactory factor * The varargs type is the last element of {@link paramTypes} if the method or constructor * accepts a variable number of arguments and the {@link paramTypes} has not been expanded * yet. This type needs to be stored in the field to avoid being affected by calling {@link - * AnnotatedTypes#adaptParameters(AnnotatedTypeFactory, AnnotatedExecutableType, List, - * NewClassTree)}. + * AnnotatedTypes#adaptParameters(AnnotatedTypeFactory, AnnotatedExecutableType, List)}. */ private @MonotonicNonNull AnnotatedArrayType varargType = null;