Merge, with more manual changes than usual, mostly around capture con…

…version.

Manual changes include:
- BaseTypeValidator
- BaseTypeVisitor
- AnnotatedTypeFactory (lots)
- DefaultAnnotatedTypeFormatter (trivial)

.gitignore

@@ -62,10 +62,10 @@ manual.dvi
 manual.haux
 manual.html
 manual.htoc
+manual.image.log
 manual.image.out
 manual.image.tex
 manual.image.tex.new
-manual.image.log
 manual.log
 manual.out
 manual.pdf
@@ -79,20 +79,20 @@ manual003.gif
 manual003.png
 manual004.gif
 manual004.png
-docs/manual/contributors.txt
-docs/manual/figures/*.eps
-docs/manual/figures/*.pdf
-docs/manual/figures/*.png
-docs/manual/figures/signature-types-with-canonicalname.dia
-docs/manual/*.png
-docs/manual/*.svg
 docs/examples/**/*.class
 docs/examples/MavenExample/Out.txt
 docs/examples/errorprone/.gradle/
 docs/examples/errorprone/Out.txt
-docs/examples/lombok/Out.txt
 docs/examples/lombok/.gradle/
+docs/examples/lombok/Out.txt
 docs/examples/lombok/lombok.config
+docs/manual/*.png
+docs/manual/*.svg
+docs/manual/contributors.txt
+docs/manual/figures/*.eps
+docs/manual/figures/*.pdf
+docs/manual/figures/*.png
+docs/manual/figures/signature-types-with-canonicalname.dia
 docs/manual/manual.html-e
 docs/tmpapi/
 
@@ -125,21 +125,23 @@ checker/tests/nullness-extra/*.class
 checker/tests/nullness-extra/compat/Out.txt
 checker/tests/nullness-extra/compat/javax/annotation/Nullable.class
 checker/tests/nullness-extra/compat/lib/Lib.class
-checker/tests/nullness-extra/multiple-errors/*.class
-checker/tests/nullness-extra/multiple-errors/Out.txt
-checker/tests/nullness-extra/package-anno/Out.txt
-checker/tests/nullness-extra/package-anno/test/*.class
-checker/tests/nullness-extra/shorthand/NullnessRegexWithErrors.class
-checker/tests/nullness-extra/shorthand/Out.txt
+checker/tests/nullness-extra/issue3597/testpkg/Issue3597A.class
+checker/tests/nullness-extra/issue3597/testpkg/Issue3597B.class
 checker/tests/nullness-extra/issue502/Issue502.class
 checker/tests/nullness-extra/issue502/Out.txt
 checker/tests/nullness-extra/issue594/Out.txt
 checker/tests/nullness-extra/issue607/Issue607.class
 checker/tests/nullness-extra/issue607/Issue607Interface.class
 checker/tests/nullness-extra/issue607/Issue607SuperClass.class
-checker/tests/nullness/generics/*.class
-checker/tests/nullness-temp/*.java
+checker/tests/nullness-extra/multiple-errors/*.class
+checker/tests/nullness-extra/multiple-errors/Out.txt
+checker/tests/nullness-extra/package-anno/Out.txt
+checker/tests/nullness-extra/package-anno/test/*.class
+checker/tests/nullness-extra/shorthand/NullnessRegexWithErrors.class
+checker/tests/nullness-extra/shorthand/Out.txt
 checker/tests/nullness-temp/*.class
+checker/tests/nullness-temp/*.java
+checker/tests/nullness/generics/*.class
 
 dataflow/tests/issue3447/Out.txt
 dataflow/tests/issue3447/*.class
@@ -152,8 +154,8 @@ checker/jtreg/multipleexecutions/Main.class
 checker-qual-android/src
 
 # Some tests produce output into the tests/ directory instead of the build/ directory.
-checker/tests/ainfer-testchecker/annotated/
-checker/tests/ainfer-testchecker/inference-output/
 checker/tests/ainfer-nullness/annotated/
 checker/tests/ainfer-nullness/inference-output/
+checker/tests/ainfer-testchecker/annotated/
+checker/tests/ainfer-testchecker/inference-output/
 framework/tests/returnsreceiverdelomboked/

azure-pipelines.yml

@@ -34,6 +34,21 @@ jobs:
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-cftests-junit.sh
     displayName: test-cftests-junit.sh
+- job: junit_tests_jdk17
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - typecheck_jdk11
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk17:latest
+  timeoutInMinutes: 70
+  steps:
+  - checkout: self
+    fetchDepth: 25
+  - bash: ./checker/bin-devel/test-cftests-junit.sh
+    displayName: test-cftests-junit.sh
 - job: nonjunit_tests_jdk8
   dependsOn:
    - junit_tests_jdk11
@@ -57,6 +72,20 @@ jobs:
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-cftests-nonjunit.sh
     displayName: test-cftests-nonjunit.sh
+- job: nonjunit_tests_jdk17
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - typecheck_jdk11
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk17:latest
+  steps:
+  - checkout: self
+    fetchDepth: 25
+  - bash: ./checker/bin-devel/test-cftests-nonjunit.sh
+    displayName: test-cftests-nonjunit.sh
 - job: inference_tests_jdk8
   dependsOn:
    - junit_tests_jdk11
@@ -80,13 +109,26 @@ jobs:
     fetchDepth: 25
   - 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
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk17:latest
+  steps:
+  - checkout: self
+    fetchDepth: 25
+  - bash: ./checker/bin-devel/test-cftests-inference.sh
+    displayName: test-cftests-inference.sh
 - job: misc_jdk8
-  ## The dependsOn is commented out because misc_jdk8 sometimes fails when misc_jdk11 does not.
-  # 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-jdk8-plus:latest
@@ -104,6 +146,20 @@ jobs:
     fetchDepth: 1000
   - bash: ./checker/bin-devel/test-misc.sh
     displayName: test-misc.sh
+- job: misc_jdk17
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - typecheck_jdk11
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk17-plus:latest
+  steps:
+  - checkout: self
+    fetchDepth: 1000
+  - bash: ./checker/bin-devel/test-misc.sh
+    displayName: test-misc.sh
 - job: typecheck_jdk8
   dependsOn:
    - junit_tests_jdk11
@@ -127,6 +183,20 @@ jobs:
     fetchDepth: 1000
   - 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
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk17-plus:latest
+  steps:
+  - checkout: self
+    fetchDepth: 1000
+  - bash: ./checker/bin-devel/test-typecheck.sh
+    displayName: test-typecheck.sh
 - job: daikon_jdk8
   dependsOn:
    - junit_tests_jdk11
@@ -154,6 +224,24 @@ jobs:
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-daikon.sh
     displayName: test-daikon.sh
+## 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_jdk17" critical path.
+#   #  # - daikon_jdk11
+#   pool:
+#     vmImage: 'ubuntu-latest'
+#   container: mdernst/cf-ubuntu-jdk17:latest
+#   timeoutInMinutes: 70
+#   steps:
+#   - checkout: self
+#     fetchDepth: 25
+#   - bash: ./checker/bin-devel/test-daikon.sh
+#     displayName: test-daikon.sh
 - job: guava_jdk8
   dependsOn:
    - junit_tests_jdk11
@@ -178,6 +266,21 @@ jobs:
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-guava.sh
     displayName: test-guava.sh
+- job: guava_jdk17
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - typecheck_jdk11
+   - guava_jdk11
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk17:latest
+  steps:
+  - checkout: self
+    fetchDepth: 25
+  - bash: ./checker/bin-devel/test-guava.sh
+    displayName: test-guava.sh
 - job: plume_lib_jdk8
   dependsOn:
    - junit_tests_jdk11
@@ -202,6 +305,22 @@ jobs:
     fetchDepth: 25
   - bash: ./checker/bin-devel/test-plume-lib.sh
     displayName: test-plume-lib.sh
+- job: plume_lib_jdk17
+  dependsOn:
+   - junit_tests_jdk11
+   - nonjunit_tests_jdk11
+   - misc_jdk11
+   - typecheck_jdk11
+   - plume_lib_jdk11
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: mdernst/cf-ubuntu-jdk17:latest
+  steps:
+  - checkout: self
+    fetchDepth: 25
+  - bash: ./checker/bin-devel/test-plume-lib.sh
+    displayName: test-plume-lib.sh
+## The downstream jobs are not currently needed because test-downstream.sh is empty.
 # - job: downstream_jdk8
 #   dependsOn:
 #    - junit_tests_jdk11
@@ -226,3 +345,18 @@ jobs:
 #     fetchDepth: 25
 #   - bash: ./checker/bin-devel/test-downstream.sh
 #     displayName: test-downstream.sh
+# - job: downstream_jdk17
+#   dependsOn:
+#    - junit_tests_jdk11
+#    - nonjunit_tests_jdk11
+#    - misc_jdk11
+#    - typecheck_jdk11
+#    - downstream_jdk11
+#   pool:
+#     vmImage: 'ubuntu-latest'
+#   container: mdernst/cf-ubuntu-jdk17:latest
+#   steps:
+#   - checkout: self
+#     fetchDepth: 25
+#   - bash: ./checker/bin-devel/test-downstream.sh
+#     displayName: test-downstream.sh