Skip to content

Commit 945bf80

Browse files
author
Paolo Tranquilli
committed
Merge branch 'main' into redsun82/cargo-upgrade
2 parents 0445d88 + 4f810df commit 945bf80

File tree

10 files changed

+61
-2
lines changed

10 files changed

+61
-2
lines changed

‎docs/codeql/reusables/supported-versions-compilers.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
.. [2] Objective-C, Objective-C++, C++/CLI, and C++/CX are not supported.
3434
.. [3] Support for the clang-cl compiler is preliminary.
3535
.. [4] Support for the Arm Compiler (armcc) is preliminary.
36-
.. [5] Builds that execute on Java 7 to 22 can be analyzed. The analysis understands standard language features in Java 8 to 22; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
36+
.. [5] Builds that execute on Java 7 to 24 can be analyzed. The analysis understands standard language features in Java 8 to 24; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
3737
.. [6] ECJ is supported when the build invokes it via the Maven Compiler plugin or the Takari Lifecycle plugin.
3838
.. [7] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files.
3939
.. [8] The extractor requires Python 3 to run. To analyze Python 2.7 you should install both versions of Python.

‎java/ql/lib/change-notes/2025-02-27-jdk-24.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: feature
3+
---
4+
* The Java extractor and QL libraries now support Java 24.

‎java/ql/test-kotlin1/library-tests/compilation-units/cus.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
| AbstractList$RandomAccessSpliterator | .../AbstractList$RandomAccessSpliterator.class:0:0:0:0 |
33
| ArrayList | .../ArrayList.class:0:0:0:0 |
44
| ArrayList$ArrayListSpliterator | .../ArrayList$ArrayListSpliterator.class:0:0:0:0 |
5+
| CleanerImpl$CleanableList | .../CleanerImpl$CleanableList.class:0:0:0:0 |
6+
| CleanerImpl$CleanableList$Node | .../CleanerImpl$CleanableList$Node.class:0:0:0:0 |
57
| List | .../List.class:0:0:0:0 |
68
| ListIterator | .../ListIterator.class:0:0:0:0 |
79
| MemorySessionImpl$ResourceList | .../MemorySessionImpl$ResourceList.class:0:0:0:0 |

‎java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@ methodWithDuplicate
1616
| AbstractCollection<E> | removeAll | Collection<?> |
1717
| AbstractCollection<E> | retainAll | Collection<?> |
1818
| AbstractCollection<E> | toArray | T[] |
19+
| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
20+
| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
21+
| AbstractCollection<Entry<K,V>> | contains | Object |
22+
| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
23+
| AbstractCollection<Entry<K,V>> | remove | Object |
24+
| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
25+
| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
26+
| AbstractCollection<Entry<K,V>> | toArray | T[] |
27+
| AbstractCollection<K> | add | K |
28+
| AbstractCollection<K> | addAll | Collection<? extends K> |
29+
| AbstractCollection<K> | contains | Object |
30+
| AbstractCollection<K> | containsAll | Collection<?> |
31+
| AbstractCollection<K> | remove | Object |
32+
| AbstractCollection<K> | removeAll | Collection<?> |
33+
| AbstractCollection<K> | retainAll | Collection<?> |
34+
| AbstractCollection<K> | toArray | T[] |
1935
| AbstractCollection<Runnable> | add | Runnable |
2036
| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
2137
| AbstractCollection<Runnable> | contains | Object |
@@ -40,6 +56,14 @@ methodWithDuplicate
4056
| AbstractCollection<T> | removeAll | Collection<?> |
4157
| AbstractCollection<T> | retainAll | Collection<?> |
4258
| AbstractCollection<T> | toArray | T[] |
59+
| AbstractCollection<V> | add | V |
60+
| AbstractCollection<V> | addAll | Collection<? extends V> |
61+
| AbstractCollection<V> | contains | Object |
62+
| AbstractCollection<V> | containsAll | Collection<?> |
63+
| AbstractCollection<V> | remove | Object |
64+
| AbstractCollection<V> | removeAll | Collection<?> |
65+
| AbstractCollection<V> | retainAll | Collection<?> |
66+
| AbstractCollection<V> | toArray | T[] |
4367
| AbstractList | add | E |
4468
| AbstractList | add | int |
4569
| AbstractList | addAll | Collection<? extends E> |

‎java/ql/test-kotlin2/library-tests/compilation-units/cus.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
| AbstractList$RandomAccessSpliterator | .../AbstractList$RandomAccessSpliterator.class:0:0:0:0 |
33
| ArrayList | .../ArrayList.class:0:0:0:0 |
44
| ArrayList$ArrayListSpliterator | .../ArrayList$ArrayListSpliterator.class:0:0:0:0 |
5+
| CleanerImpl$CleanableList | .../CleanerImpl$CleanableList.class:0:0:0:0 |
6+
| CleanerImpl$CleanableList$Node | .../CleanerImpl$CleanableList$Node.class:0:0:0:0 |
57
| List | .../List.class:0:0:0:0 |
68
| ListIterator | .../ListIterator.class:0:0:0:0 |
79
| MemorySessionImpl$ResourceList | .../MemorySessionImpl$ResourceList.class:0:0:0:0 |

‎java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@ methodWithDuplicate
1616
| AbstractCollection<E> | removeAll | Collection<?> |
1717
| AbstractCollection<E> | retainAll | Collection<?> |
1818
| AbstractCollection<E> | toArray | T[] |
19+
| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
20+
| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
21+
| AbstractCollection<Entry<K,V>> | contains | Object |
22+
| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
23+
| AbstractCollection<Entry<K,V>> | remove | Object |
24+
| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
25+
| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
26+
| AbstractCollection<Entry<K,V>> | toArray | T[] |
27+
| AbstractCollection<K> | add | K |
28+
| AbstractCollection<K> | addAll | Collection<? extends K> |
29+
| AbstractCollection<K> | contains | Object |
30+
| AbstractCollection<K> | containsAll | Collection<?> |
31+
| AbstractCollection<K> | remove | Object |
32+
| AbstractCollection<K> | removeAll | Collection<?> |
33+
| AbstractCollection<K> | retainAll | Collection<?> |
34+
| AbstractCollection<K> | toArray | T[] |
1935
| AbstractCollection<Runnable> | add | Runnable |
2036
| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
2137
| AbstractCollection<Runnable> | contains | Object |
@@ -40,6 +56,14 @@ methodWithDuplicate
4056
| AbstractCollection<T> | removeAll | Collection<?> |
4157
| AbstractCollection<T> | retainAll | Collection<?> |
4258
| AbstractCollection<T> | toArray | T[] |
59+
| AbstractCollection<V> | add | V |
60+
| AbstractCollection<V> | addAll | Collection<? extends V> |
61+
| AbstractCollection<V> | contains | Object |
62+
| AbstractCollection<V> | containsAll | Collection<?> |
63+
| AbstractCollection<V> | remove | Object |
64+
| AbstractCollection<V> | removeAll | Collection<?> |
65+
| AbstractCollection<V> | retainAll | Collection<?> |
66+
| AbstractCollection<V> | toArray | T[] |
4367
| AbstractList | add | E |
4468
| AbstractList | add | int |
4569
| AbstractList | addAll | Collection<? extends E> |

‎java/ql/test-kotlin2/library-tests/reflection/reflection.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ compGenerated
333333
| file://<external>/TextStyle.class:0:0:0:0 | getEntries | Default property accessor |
334334
| file://<external>/Thread$State.class:0:0:0:0 | getEntries | Default property accessor |
335335
| file://<external>/TimeUnit.class:0:0:0:0 | getEntries | Default property accessor |
336+
| file://<external>/TypeKind.class:0:0:0:0 | getEntries | Default property accessor |
336337
| file://<external>/VarHandle$AccessMode.class:0:0:0:0 | getEntries | Default property accessor |
337338
| file://<external>/VarHandle$AccessType.class:0:0:0:0 | getEntries | Default property accessor |
338339
| file://<external>/Wrapper.class:0:0:0:0 | getEntries | Default property accessor |

‎java/ql/test/library-tests/errortype-with-params/PrintAst.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Test.java:
22
# 0| [CompilationUnit] Test
33
# 1| 1: [Class] Test
44
#-----| -1: (Base Types)
5-
# 1| 0: [TypeAccess] <any>
5+
# 1| 0: [TypeAccess] Unavailable<String>
66
# 1| 0: [TypeAccess] String

‎java/ql/test/library-tests/errortype/Diags.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
| Test.java:6:23:6:39 | Unexpected symbol for constructor: new NoSuchClass() |
44
| Test.java:6:23:6:39 | Unknown or erroneous type for expression of kind ClassInstanceCreation |
55
| Test.java:6:27:6:37 | Unknown or erroneous type for expression of kind TypeAccess |
6+
| Test.java:7:12:7:14 | Unknown or erroneous type for expression of kind VarAccess |
67
| file://:0:0:0:0 | 2 errors during annotation processing |

‎java/ql/test/library-tests/errortype/Test.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ public NoSuchClass test() {
1414
// Diagnostic Matches: 2 errors during annotation processing
1515
// Diagnostic Matches: Unknown or erroneous type for expression of kind TypeAccess
1616
// Diagnostic Matches: Unknown or erroneous type for expression of kind ClassInstanceCreation
17+
// Diagnostic Matches: Unknown or erroneous type for expression of kind VarAccess

0 commit comments

Comments
 (0)