Merge ../checker-framework-branch-master into inference-phase-two

build.gradle

@@ -618,8 +618,7 @@ void clone(url, directory, ignoreError, extraArgs = []){
     args = [
       'clone',
       '-q',
-      '--depth',
-      '1',
+      '--filter=blob:none',
       url,
       file(directory).toPath().last()
     ]

checker-qual/src/main/java/org/checkerframework/checker/optional/qual/EnsuresPresentIf.java

@@ -61,11 +61,11 @@
   boolean result();
 
   /**
-   * Returns the Java expressions of type Optional<T> that are present after the method
+   * Returns the Java expressions of type {@code Optional<T>} that are present after the method
    * returns the given result.
    *
-   * @return the Java expressions of type Optional&lt;T&gt; that are present after the method
-   *     returns the given result.
+   * @return the Java expressions of type {@code Optional<T>} that are present after the method
+   *     returns the given result
    * @checker_framework.manual #java-expressions-as-arguments Syntax of Java expressions
    */
   String[] expression();

checker/bin-devel/clone-related.sh

@@ -37,8 +37,8 @@ if [ -d "$PLUME_SCRIPTS" ] ; then
   (cd "$PLUME_SCRIPTS" && (git pull -q || true))
 else
   (cd "$CHECKERFRAMEWORK/checker/bin-devel" && \
-      (git clone --depth 1 -q https://github.com/plume-lib/plume-scripts.git .plume-scripts || \
-       (sleep 1m && git clone --depth 1 -q https://github.com/plume-lib/plume-scripts.git .plume-scripts)))
+      (git clone --filter=blob:none -q https://github.com/plume-lib/plume-scripts.git .plume-scripts || \
+       (sleep 1m && git clone --filter=blob:none -q https://github.com/plume-lib/plume-scripts.git .plume-scripts)))
 fi
 
 # Clone the annotated JDK into ../jdk .

checker/bin-devel/wpi-plumelib/test-wpi-plumelib.sh

@@ -64,7 +64,7 @@ test_wpi_plume_lib() {
 
     rm -rf "$project"
     # Try twice in case of network lossage
-    git clone -q --depth 1 "https://github.com/plume-lib/$project.git" || (sleep 60 && git clone -q --depth 1 "https://github.com/plume-lib/$project.git")
+    git clone -q --filter=blob:none "https://github.com/plume-lib/$project.git" || (sleep 60 && git clone -q --filter=blob:none "https://github.com/plume-lib/$project.git")
 
     cd "$project" || (echo "can't run: cd $project" && exit 1)
 

checker/tests/nullness/java21/Issue6290.java

@@ -0,0 +1,11 @@
+import java.util.Optional;
+
+// @below-java17-jdk-skip-test
+public class Issue6290 {
+
+  public Optional<String> test(String param) {
+    var first = Optional.ofNullable(param);
+    var second = first.isPresent() ? first : Optional.ofNullable(param);
+    return second;
+  }
+}

dataflow/src/main/java/org/checkerframework/dataflow/expression/ArrayCreation.java

@@ -26,8 +26,8 @@ public class ArrayCreation extends JavaExpression {
    * Creates an ArrayCreation object.
    *
    * @param type array type
-   * @param dimensions list of dimension expressions; a {code null} element means that there is no
-   *     dimension expression for the given array level.
+   * @param dimensions list of dimension expressions; a {@code null} element means that there is no
+   *     dimension expression for the given array level
    * @param initializers list of initializer expressions
    */
   public ArrayCreation(

docs/manual/Makefile

@@ -98,7 +98,7 @@ check-labels:
 
 export BIBINPUTS = $BIBINPUTS:.:plume-bib
 plume-bib:
-	(git clone --depth 1 -q https://github.com/mernst/plume-bib.git || git clone --depth 1 -q https://github.com/mernst/plume-bib.git)
+	(git clone --filter=blob:none -q https://github.com/mernst/plume-bib.git || git clone --filter=blob:none -q https://github.com/mernst/plume-bib.git)
 .PHONY: plume-bib-update
 plume-bib-update: plume-bib
 # Even if this command fails, it does not terminate the make job.

framework/build.gradle

@@ -77,8 +77,7 @@ task cloneTypetoolsJdk() {
         args = [
           'clone',
           '-q',
-          '--depth',
-          '1',
+          '--filter=blob:none',
           'https://github.com/typetools/jdk.git',
           'jdk'
         ]