Merge branch 'main' into couchdb

java/ql/lib/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 7.8.3
+
+No user-facing changes.
+
 ## 7.8.2
 
 No user-facing changes.

java/ql/lib/change-notes/released/7.8.3.md

@@ -0,0 +1,3 @@
+## 7.8.3
+
+No user-facing changes.

java/ql/lib/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.8.2
+lastReleaseVersion: 7.8.3

java/ql/lib/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 7.8.3-dev
+version: 7.8.4-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java

java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll

@@ -202,6 +202,13 @@ private module Input implements TypeFlowInput<Location> {
       t1e = t2e and
       unbound(t2) and
       not unbound(t1)
+      or
+      t1e = t2e and
+      exists(int pos |
+        partiallyUnbound(t2, pos) and
+        not partiallyUnbound(t1, pos) and
+        not unbound(t1)
+      )
     )
   }
 
@@ -370,6 +377,11 @@ private module Input implements TypeFlowInput<Location> {
     )
   }
 
+  /** Holds if `t` is a parameterised type with unrestricted type argument at position `pos`. */
+  private predicate partiallyUnbound(ParameterizedType t, int pos) {
+    unconstrained(t.getTypeArgument(pos))
+  }
+
   Type getErasure(Type t) { result = t.getErasure() }
 
   Type getAnAncestor(Type sub) { result = sub.getAnAncestor() }

java/ql/src/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.10.4
+
+No user-facing changes.
+
 ## 1.10.3
 
 ### Minor Analysis Improvements

java/ql/src/change-notes/released/1.10.4.md

@@ -0,0 +1,3 @@
+## 1.10.4
+
+No user-facing changes.

java/ql/src/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.10.3
+lastReleaseVersion: 1.10.4

java/ql/src/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.10.4-dev
+version: 1.10.5-dev
 groups:
   - java
   - queries

java/ql/test/library-tests/typeflow/A.java

@@ -118,4 +118,12 @@ public class A extends ArrayList<Long> {
       default -> { }
     }
   }
+
+  private static <T> T lookupFoo(Map<String, T> m) {
+    return m.get("foo");
+  }
+
+  public void m11(Map<String, String> m) {
+    lookupFoo(m);
+  }
 }

java/ql/test/library-tests/typeflow/typeflow.expected

@@ -18,5 +18,6 @@
 | A.java:112:23:112:24 | cs | String | false |
 | A.java:116:13:116:14 | o2 | String | false |
 | A.java:117:49:117:50 | cs | String | false |
+| A.java:123:12:123:12 | m | Map<String,String> | false |
 | UnionTypes.java:45:7:45:7 | x | Inter | false |
 | UnionTypes.java:48:23:48:23 | x | Inter | false |