Updating fork

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributing to the Checker Framework
 
 Thank you for contributing to the Checker Framework!  This project is a
-community effort of [more than 90
+community effort of [more than 110
 developers](https://checkerframework.org/manual/#credits), plus countless
 more people who have contributed bug reports and feature suggestions.  We
 couldn't do it without your help.
@@ -19,18 +19,30 @@ bug, and we want to fix it.  Please report it.
 
 ## Submitting changes
 
-Please see the [pull requests](https://rawgit.com/typetools/checker-framework/master/docs/developer/developer-manual.html#pull-requests) section of the Developer Manual.
+Please see the [pull
+requests](https://rawgit.com/typetools/checker-framework/master/docs/developer/developer-manual.html#pull-requests)
+section of the Developer Manual.
+
+Submit changes to the annotated JDK at https://github.com/typetools/jdk/pulls .
+Annotations for other libraries can be contributed as stub files in this
+repository, in a fork of the library in https://github.com/typetools/, or
+in the library's own repository.
 
 Do you want to contribute to the project, but you are not sure what issue
 to fix or what feature to add?  Use the tool in your daily work, and when
-you encounter a limitation that bothers you, fix that one.
+you encounter a limitation that bothers you, fix that one.  The ["help
+wanted"](https://github.com/typetools/checker-framework/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
+label marks issues that require less deep knowledge and may be appropriate
+for a newcomer to the codebase.
 
 
 ## License
 
-By contributing, you agree that your contributions will be licensed under the existing [license](LICENSE.txt), usually GPL2 or MIT License.
+By contributing, you agree that your contributions will be licensed under the
+existing [license](LICENSE.txt), usually GPL2 or MIT License.
 
 
 ## Code of conduct
 
-In interactions with other people, please abide by the [Contributor Covenant](https://www.contributor-covenant.org/version/2/0/code_of_conduct).
+When interacting with other people, please abide by the [Contributor
+Covenant](https://www.contributor-covenant.org/version/2/0/code_of_conduct).

azure-pipelines.yml

@@ -13,6 +13,7 @@ jobs:
 - job: junit_tests_jdk8
   dependsOn:
    - junit_tests_jdk11
+   - nonjunit_tests_jdk11
    - misc_jdk11
   pool:
     vmImage: 'ubuntu-latest'
@@ -33,6 +34,7 @@ jobs:
     displayName: test-cftests-junit.sh
 - job: nonjunit_tests_jdk8
   dependsOn:
+   - junit_tests_jdk11
    - nonjunit_tests_jdk11
    - misc_jdk11
   pool:

build.gradle

@@ -829,6 +829,7 @@ subprojects {
 
             if (project.name.is('dataflow')) {
                 dependsOn('liveVariableTest')
+                dependsOn('issue3447Test')
             }
         }
 

changelog.txt

@@ -1,13 +1,13 @@
 Version 3.6.0, August 3, 2020
 
-Added a new option `-Aversion` to print the version of the Checker Framework.
-
 The Interning Checker supports method annotations @EqualsMethod and
 @CompareToMethod.  Place them on methods like equals(), compareTo(), and
 compare() to permit certain uses of == on non-interned values.
 
 Added an overloaded version of NullnessUtil.castNonNull that takes an error message.
 
+Added a new option `-Aversion` to print the version of the Checker Framework.
+
 Implementation details:
 
 commonAssignmentCheck() now takes an additional argument.  Type system

checker-qual/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
     dependencies {
         // Create OSGI bundles
-        classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.1"
+        classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2"
     }
 }
 

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

@@ -19,7 +19,7 @@ git log | head -n 5
 make compile
 if [ "$TRAVIS" = "true" ] ; then
   # Travis kills a job if it runs 10 minutes without output
-  time make JAVACHECK_EXTRA_ARGS=-Afilenames -C java check-part1
+  time make JAVACHECK_EXTRA_ARGS=-Afilenames -C java typecheck-part1
 else
-  time make -C java check-part1
+  time make -C java typecheck-part1
 fi

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

@@ -19,7 +19,7 @@ git log | head -n 5
 make compile
 if [ "$TRAVIS" = "true" ] ; then
   # Travis kills a job if it runs 10 minutes without output
-  time make JAVACHECK_EXTRA_ARGS=-Afilenames -C java check-part2
+  time make JAVACHECK_EXTRA_ARGS=-Afilenames -C java typecheck-part2
 else
-  time make -C java check-part2
+  time make -C java typecheck-part2
 fi

checker/jtreg/sortwarnings/ErrorOrders.out

@@ -26,46 +26,46 @@ ErrorOrders.java:24:47: compiler.err.proc.messager: [expression.unparsable.type.
 ErrorOrders.java:24:55: compiler.err.proc.messager: [assignment.type.incompatible] incompatible types in assignment.
 found   : @LTLengthOf(value="p2") int
 required: @LTLengthOf(value="[error for expression: This isn't an expression; error: Invalid 'This isn't an expression' because is an invalid expression]") int
-ErrorOrders.java:29:15: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:15: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p1 of test4.
 found   : @LowerBoundUnknown int
 required: @GTENegativeOne int
-ErrorOrders.java:29:15: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:15: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p1 of test4.
 found   : @UpperBoundUnknown int
 required: @UpperBoundBottom int
-ErrorOrders.java:29:24: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:24: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p2 of test4.
 found   : @LowerBoundUnknown int
 required: @GTENegativeOne int
-ErrorOrders.java:29:24: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:24: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p2 of test4.
 found   : @UpperBoundUnknown int
 required: @UpperBoundBottom int
-ErrorOrders.java:29:25: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:25: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p1 of test4.
 found   : @LowerBoundUnknown int
 required: @GTENegativeOne int
-ErrorOrders.java:29:25: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:25: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p1 of test4.
 found   : @UpperBoundUnknown int
 required: @UpperBoundBottom int
-ErrorOrders.java:29:29: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:29: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p2 of test4.
 found   : @LowerBoundUnknown int
 required: @GTENegativeOne int
-ErrorOrders.java:29:29: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:29: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p2 of test4.
 found   : @UpperBoundUnknown int
 required: @UpperBoundBottom int
-ErrorOrders.java:29:33: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:33: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p3 of test4.
 found   : @UnknownVal int @UnknownVal []
 required: @UnknownVal int []
-ErrorOrders.java:29:37: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:37: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p4 of test4.
 found   : @SameLenUnknown int @SameLen("p4") []
 required: @SameLenUnknown int @SameLenBottom []
-ErrorOrders.java:29:41: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:41: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p5 of test4.
 found   : @UnknownVal int
 required: int
-ErrorOrders.java:29:46: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:46: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p3 of test4.
 found   : @UnknownVal int @UnknownVal []
 required: @UnknownVal int []
-ErrorOrders.java:29:50: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:50: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p4 of test4.
 found   : @SameLenUnknown int @SameLen("p4") []
 required: @SameLenUnknown int @SameLenBottom []
-ErrorOrders.java:29:54: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:29:54: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p5 of test4.
 found   : @UnknownVal int
 required: int
 ErrorOrders.java:33:47: compiler.err.proc.messager: [expression.unparsable.type.invalid] Expression invalid in dependent type annotation: [error for expression: This isn't an expression; error: Invalid 'This isn't an expression' because is an invalid expression]
@@ -95,46 +95,46 @@ ErrorOrders.java:56:47: compiler.err.proc.messager: [expression.unparsable.type.
 ErrorOrders.java:56:55: compiler.err.proc.messager: [assignment.type.incompatible] incompatible types in assignment.
 found   : @LTLengthOf(value="p2") int
 required: @LTLengthOf(value="[error for expression: This isn't an expression; error: Invalid 'This isn't an expression' because is an invalid expression]") int
-ErrorOrders.java:61:15: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:15: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p1 of test4.
 found   : @LowerBoundUnknown int
 required: @GTENegativeOne int
-ErrorOrders.java:61:15: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:15: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p1 of test4.
 found   : @UpperBoundUnknown int
 required: @UpperBoundBottom int
-ErrorOrders.java:61:24: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:24: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p2 of test4.
 found   : @LowerBoundUnknown int
 required: @GTENegativeOne int
-ErrorOrders.java:61:24: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:24: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p2 of test4.
 found   : @UpperBoundUnknown int
 required: @UpperBoundBottom int
-ErrorOrders.java:61:25: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:25: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p1 of test4.
 found   : @LowerBoundUnknown int
 required: @GTENegativeOne int
-ErrorOrders.java:61:25: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:25: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p1 of test4.
 found   : @UpperBoundUnknown int
 required: @UpperBoundBottom int
-ErrorOrders.java:61:29: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:29: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p2 of test4.
 found   : @LowerBoundUnknown int
 required: @GTENegativeOne int
-ErrorOrders.java:61:29: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:29: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p2 of test4.
 found   : @UpperBoundUnknown int
 required: @UpperBoundBottom int
-ErrorOrders.java:61:33: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:33: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p3 of test4.
 found   : @UnknownVal int @UnknownVal []
 required: @UnknownVal int []
-ErrorOrders.java:61:37: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:37: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p4 of test4.
 found   : @SameLenUnknown int @SameLen("p4") []
 required: @SameLenUnknown int @SameLenBottom []
-ErrorOrders.java:61:41: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:41: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p5 of test4.
 found   : @UnknownVal int
 required: int
-ErrorOrders.java:61:46: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:46: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p3 of test4.
 found   : @UnknownVal int @UnknownVal []
 required: @UnknownVal int []
-ErrorOrders.java:61:50: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:50: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p4 of test4.
 found   : @SameLenUnknown int @SameLen("p4") []
 required: @SameLenUnknown int @SameLenBottom []
-ErrorOrders.java:61:54: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+ErrorOrders.java:61:54: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter p5 of test4.
 found   : @UnknownVal int
 required: int
 49 errors

checker/jtreg/stubs/issue2147/WithStub.out

@@ -1,4 +1,4 @@
-EnumStubTest.java:16:31: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+EnumStubTest.java:16:31: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter sEnum of requireEnum.
 found   : @Tainted SampleEnum
 required: @Untainted SampleEnum
 1 error

checker/jtreg/stubs/issue2147/WithoutStub.out

@@ -1,7 +1,7 @@
-EnumStubTest.java:15:31: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+EnumStubTest.java:15:31: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter sEnum of requireEnum.
 found   : @Tainted SampleEnum
 required: @Untainted SampleEnum
-EnumStubTest.java:16:31: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+EnumStubTest.java:16:31: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter sEnum of requireEnum.
 found   : @Tainted SampleEnum
 required: @Untainted SampleEnum
 2 errors

checker/jtreg/tainting/NewClass.out

@@ -1,4 +1,4 @@
-NewClass.java:18:49: compiler.err.proc.messager: [argument.type.incompatible] incompatible types in argument.
+NewClass.java:18:49: compiler.err.proc.messager: [argument.type.incompatible] incompatible argument for parameter o of get.
 found   : @Tainted Object
 required: @Untainted Object
 1 error

checker/src/main/java/org/checkerframework/checker/formatter/FormatUtil.java

@@ -223,8 +223,9 @@ private static char conversionCharFromFormat(@Regex(6) Matcher m) {
     /**
      * Return the conversion character that is in the given format specifier.
      *
-     * @param formatSpecifier a format specifier; see
-     *     https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/Formatter.html#syntax}
+     * @param formatSpecifier a <a
+     *     href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/Formatter.html#syntax">format
+     *     specifier</a>
      * @return the conversion character that is in the given format specifier
      * @deprecated This method is public only for testing. Use {@link
      *     #conversionCharFromFormat(Matcher)}.

checker/src/main/java/org/checkerframework/checker/formatter/FormatterVisitor.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Name;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import org.checkerframework.checker.compilermsgs.qual.CompilerMessageKey;
@@ -88,9 +89,14 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void p) {
                                     default:
                                         if (!fc.isValidParameter(formatCat, paramType)) {
                                             // II.3
+                                            ExecutableElement method =
+                                                    TreeUtils.elementFromUse(node);
+                                            Name methodName = method.getSimpleName();
                                             tu.failure(
                                                     param,
                                                     "argument.type.incompatible",
+                                                    "", // parameter name is not useful
+                                                    methodName,
                                                     paramType,
                                                     formatCat);
                                         }

checker/src/main/java/org/checkerframework/checker/guieffect/GuiEffectVisitor.java

@@ -18,7 +18,9 @@
 import java.util.Set;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Name;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import org.checkerframework.checker.guieffect.qual.AlwaysSafe;
 import org.checkerframework.checker.guieffect.qual.PolyUI;
@@ -487,6 +489,9 @@ private void scanUp(TreePath path) {
                 List<? extends ExpressionTree> args = invocationTree.getArguments();
                 ParameterizedExecutableType mType = atypeFactory.methodFromUse(invocationTree);
                 AnnotatedExecutableType invokedMethod = mType.executableType;
+                ExecutableElement method = invokedMethod.getElement();
+                Name methodName = method.getSimpleName();
+                List<? extends VariableElement> methodParams = method.getParameters();
                 List<AnnotatedTypeMirror> argsTypes =
                         AnnotatedTypes.expandVarArgs(
                                 atypeFactory, invokedMethod, invocationTree.getArguments());
@@ -497,7 +502,9 @@ private void scanUp(TreePath path) {
                                 argsTypes.get(i),
                                 atypeFactory.getAnnotatedType(args.get(i)),
                                 args.get(i),
-                                "argument.type.incompatible");
+                                "argument.type.incompatible",
+                                methodParams.get(i),
+                                methodName);
                     }
                 }
                 break;

checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterTreeUtil.java

@@ -266,6 +266,15 @@ public I18nFormatCall(
             initialCheck(theargs, method, node, methodAnno);
         }
 
+        /**
+         * Returns the AST node for the call.
+         *
+         * @return the AST node for the call
+         */
+        public MethodInvocationTree getTree() {
+            return tree;
+        }
+
         @Override
         public String toString() {
             return this.tree.toString();