Kotlin: Accept 2.0.0's Kotlin 2 test output

2025-12-16 16:53:25 +01:00 · 2024-05-22 10:42:27 +01:00
parent 918bee07dd
commit 6224670884
10 changed files with 853 additions and 797 deletions
--- a/java/ql/test-kotlin2/TestUtilities/InlineFlowTest.qll
+++ b/java/ql/test-kotlin2/TestUtilities/InlineFlowTest.qll
@@ -10,7 +10,7 @@ private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
 private import semmle.code.java.dataflow.internal.TaintTrackingImplSpecific
 private import internal.InlineExpectationsTestImpl

-private module FlowTestImpl implements InputSig<JavaDataFlow> {
+private module FlowTestImpl implements InputSig<Location, JavaDataFlow> {
  predicate defaultSource(DataFlow::Node source) {
    source.asExpr().(MethodCall).getMethod().getName() = ["source", "taint"]
  }
@@ -30,4 +30,4 @@ private module FlowTestImpl implements InputSig<JavaDataFlow> {
  }
 }

-import InlineFlowTestMake<JavaDataFlow, JavaTaintTracking, Impl, FlowTestImpl>
+import InlineFlowTestMake<Location, JavaDataFlow, JavaTaintTracking, Impl, FlowTestImpl>
--- a/java/ql/test-kotlin2/library-tests/arrays/arrayAccesses.expected
+++ b/java/ql/test-kotlin2/library-tests/arrays/arrayAccesses.expected
@@ -1,21 +1,12 @@
-| arrayGetsSets.kt:12:3:12:7 | ...[...] | arrayGetsSets.kt:12:3:12:7 | ...=... | int[] | arrayGetsSets.kt:12:3:12:4 | a1 | arrayGetsSets.kt:12:6:12:6 | 0 |
-| arrayGetsSets.kt:12:11:12:15 | ...[...] | arrayGetsSets.kt:12:3:12:7 | ...=... | int | arrayGetsSets.kt:12:11:12:12 | a1 | arrayGetsSets.kt:12:14:12:14 | 0 |
-| arrayGetsSets.kt:13:3:13:7 | ...[...] | arrayGetsSets.kt:13:3:13:7 | ...=... | short[] | arrayGetsSets.kt:13:3:13:4 | a2 | arrayGetsSets.kt:13:6:13:6 | 0 |
-| arrayGetsSets.kt:13:11:13:15 | ...[...] | arrayGetsSets.kt:13:3:13:7 | ...=... | short | arrayGetsSets.kt:13:11:13:12 | a2 | arrayGetsSets.kt:13:14:13:14 | 0 |
-| arrayGetsSets.kt:14:3:14:7 | ...[...] | arrayGetsSets.kt:14:3:14:7 | ...=... | byte[] | arrayGetsSets.kt:14:3:14:4 | a3 | arrayGetsSets.kt:14:6:14:6 | 0 |
-| arrayGetsSets.kt:14:11:14:15 | ...[...] | arrayGetsSets.kt:14:3:14:7 | ...=... | byte | arrayGetsSets.kt:14:11:14:12 | a3 | arrayGetsSets.kt:14:14:14:14 | 0 |
-| arrayGetsSets.kt:15:3:15:7 | ...[...] | arrayGetsSets.kt:15:3:15:7 | ...=... | long[] | arrayGetsSets.kt:15:3:15:4 | a4 | arrayGetsSets.kt:15:6:15:6 | 0 |
-| arrayGetsSets.kt:15:11:15:15 | ...[...] | arrayGetsSets.kt:15:3:15:7 | ...=... | long | arrayGetsSets.kt:15:11:15:12 | a4 | arrayGetsSets.kt:15:14:15:14 | 0 |
-| arrayGetsSets.kt:16:3:16:7 | ...[...] | arrayGetsSets.kt:16:3:16:7 | ...=... | float[] | arrayGetsSets.kt:16:3:16:4 | a5 | arrayGetsSets.kt:16:6:16:6 | 0 |
-| arrayGetsSets.kt:16:11:16:15 | ...[...] | arrayGetsSets.kt:16:3:16:7 | ...=... | float | arrayGetsSets.kt:16:11:16:12 | a5 | arrayGetsSets.kt:16:14:16:14 | 0 |
-| arrayGetsSets.kt:17:3:17:7 | ...[...] | arrayGetsSets.kt:17:3:17:7 | ...=... | double[] | arrayGetsSets.kt:17:3:17:4 | a6 | arrayGetsSets.kt:17:6:17:6 | 0 |
-| arrayGetsSets.kt:17:11:17:15 | ...[...] | arrayGetsSets.kt:17:3:17:7 | ...=... | double | arrayGetsSets.kt:17:11:17:12 | a6 | arrayGetsSets.kt:17:14:17:14 | 0 |
-| arrayGetsSets.kt:18:3:18:7 | ...[...] | arrayGetsSets.kt:18:3:18:7 | ...=... | boolean[] | arrayGetsSets.kt:18:3:18:4 | a7 | arrayGetsSets.kt:18:6:18:6 | 0 |
-| arrayGetsSets.kt:18:11:18:15 | ...[...] | arrayGetsSets.kt:18:3:18:7 | ...=... | boolean | arrayGetsSets.kt:18:11:18:12 | a7 | arrayGetsSets.kt:18:14:18:14 | 0 |
-| arrayGetsSets.kt:19:3:19:7 | ...[...] | arrayGetsSets.kt:19:3:19:7 | ...=... | char[] | arrayGetsSets.kt:19:3:19:4 | a8 | arrayGetsSets.kt:19:6:19:6 | 0 |
-| arrayGetsSets.kt:19:11:19:15 | ...[...] | arrayGetsSets.kt:19:3:19:7 | ...=... | char | arrayGetsSets.kt:19:11:19:12 | a8 | arrayGetsSets.kt:19:14:19:14 | 0 |
-| arrayGetsSets.kt:20:3:20:7 | ...[...] | arrayGetsSets.kt:20:3:20:7 | ...=... | Object[] | arrayGetsSets.kt:20:3:20:4 | a9 | arrayGetsSets.kt:20:6:20:6 | 0 |
-| arrayGetsSets.kt:20:11:20:15 | ...[...] | arrayGetsSets.kt:20:3:20:7 | ...=... | Object | arrayGetsSets.kt:20:11:20:12 | a9 | arrayGetsSets.kt:20:14:20:14 | 0 |
+| arrayGetsSets.kt:12:11:12:15 | ...[...] | arrayGetsSets.kt:12:3:12:15 | set(...) | int | arrayGetsSets.kt:12:11:12:12 | a1 | arrayGetsSets.kt:12:14:12:14 | 0 |
+| arrayGetsSets.kt:13:11:13:15 | ...[...] | arrayGetsSets.kt:13:3:13:15 | set(...) | short | arrayGetsSets.kt:13:11:13:12 | a2 | arrayGetsSets.kt:13:14:13:14 | 0 |
+| arrayGetsSets.kt:14:11:14:15 | ...[...] | arrayGetsSets.kt:14:3:14:15 | set(...) | byte | arrayGetsSets.kt:14:11:14:12 | a3 | arrayGetsSets.kt:14:14:14:14 | 0 |
+| arrayGetsSets.kt:15:11:15:15 | ...[...] | arrayGetsSets.kt:15:3:15:15 | set(...) | long | arrayGetsSets.kt:15:11:15:12 | a4 | arrayGetsSets.kt:15:14:15:14 | 0 |
+| arrayGetsSets.kt:16:11:16:15 | ...[...] | arrayGetsSets.kt:16:3:16:15 | set(...) | float | arrayGetsSets.kt:16:11:16:12 | a5 | arrayGetsSets.kt:16:14:16:14 | 0 |
+| arrayGetsSets.kt:17:11:17:15 | ...[...] | arrayGetsSets.kt:17:3:17:15 | set(...) | double | arrayGetsSets.kt:17:11:17:12 | a6 | arrayGetsSets.kt:17:14:17:14 | 0 |
+| arrayGetsSets.kt:18:11:18:15 | ...[...] | arrayGetsSets.kt:18:3:18:15 | set(...) | boolean | arrayGetsSets.kt:18:11:18:12 | a7 | arrayGetsSets.kt:18:14:18:14 | 0 |
+| arrayGetsSets.kt:19:11:19:15 | ...[...] | arrayGetsSets.kt:19:3:19:15 | set(...) | char | arrayGetsSets.kt:19:11:19:12 | a8 | arrayGetsSets.kt:19:14:19:14 | 0 |
+| arrayGetsSets.kt:20:11:20:15 | ...[...] | arrayGetsSets.kt:20:3:20:15 | set(...) | Object | arrayGetsSets.kt:20:11:20:12 | a9 | arrayGetsSets.kt:20:14:20:14 | 0 |
 | arrayGetsSets.kt:32:3:32:12 | ...[...] | arrayGetsSets.kt:32:3:32:12 | ...+=... | int | arrayGetsSets.kt:32:3:32:4 | a1 | arrayGetsSets.kt:32:6:32:6 | 0 |
 | arrayGetsSets.kt:38:3:38:13 | ...[...] | arrayGetsSets.kt:38:3:38:13 | .../=... | long | arrayGetsSets.kt:38:3:38:4 | a4 | arrayGetsSets.kt:38:6:38:6 | 0 |
 | arrayGetsSets.kt:39:3:39:13 | ...[...] | arrayGetsSets.kt:39:3:39:13 | ...-=... | float | arrayGetsSets.kt:39:3:39:4 | a5 | arrayGetsSets.kt:39:6:39:6 | 0 |
--- a/java/ql/test-kotlin2/library-tests/comments/comments.expected
+++ b/java/ql/test-kotlin2/library-tests/comments/comments.expected
@@ -16,6 +16,7 @@ comments
 | comments.kt:79:9:81:11 | /**\n         * A local function comment\n         */ | /**\n         * A local function comment\n         */ |
 | comments.kt:88:10:90:11 | /**\n         * An anonymous object comment\n         */ | /**\n         * An anonymous object comment\n         */ |
 commentOwners
+| comments.kt:1:1:1:25 | /** Kdoc with no owner */ | comments.kt:0:0:0:0 | comments |
 | comments.kt:4:1:11:3 | /**\n * A group of *members*.\n *\n * This class has no useful logic; it's just a documentation example.\n *\n * @property name the name of this group.\n * @constructor Creates an empty group.\n */ | comments.kt:12:1:31:1 | Group |
 | comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:46 | getMembers$private |
 | comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:46 | members |
@@ -26,7 +27,6 @@ commentOwners
 | comments.kt:79:9:81:11 | /**\n         * A local function comment\n         */ | comments.kt:82:9:82:24 | localFn |
 | comments.kt:88:10:90:11 | /**\n         * An anonymous object comment\n         */ | comments.kt:87:15:92:5 | new X(...) { ... } |
 commentNoOwners
-| comments.kt:1:1:1:25 | /** Kdoc with no owner */ |
 | comments.kt:24:9:24:25 | // A line comment |
 | comments.kt:28:5:30:6 | /*\n    A block comment\n    */ |
 | comments.kt:35:5:35:34 | /** Medium is in the middle */ |
--- a/java/ql/test-kotlin2/library-tests/compilation-units/cus.expected
+++ b/java/ql/test-kotlin2/library-tests/compilation-units/cus.expected
@@ -4,6 +4,8 @@
 | ArrayList$ArrayListSpliterator | .../ArrayList$ArrayListSpliterator.class:0:0:0:0 |
 | List | .../List.class:0:0:0:0 |
 | ListIterator | .../ListIterator.class:0:0:0:0 |
+| MemorySessionImpl$ResourceList | .../MemorySessionImpl$ResourceList.class:0:0:0:0 |
+| MemorySessionImpl$ResourceList$ResourceCleanup | .../MemorySessionImpl$ResourceList$ResourceCleanup.class:0:0:0:0 |
 | MutableList | .../MutableList.class:0:0:0:0 |
 | MutableListIterator | .../MutableListIterator.class:0:0:0:0 |
 | test | .../test.kt:0:0:0:0 |
--- a/java/ql/test-kotlin2/library-tests/enum/test.expected
+++ b/java/ql/test-kotlin2/library-tests/enum/test.expected
@@ -13,6 +13,8 @@
 | finalize |
 | forEach |
 | getDeclaringClass |
+| getFirst |
+| getLast |
 | hasMoreElements |
 | hashCode |
 | name |
@@ -23,6 +25,7 @@
 | parallelStream |
 | range |
 | resolveConstantDesc |
+| reversed |
 | spliterator |
 | stream |
 | toArray |
--- a/java/ql/test-kotlin2/library-tests/exprs/PrintAst.expected
+++ b/java/ql/test-kotlin2/library-tests/exprs/PrintAst.expected
--- a/java/ql/test-kotlin2/library-tests/exprs/binop.expected
+++ b/java/ql/test-kotlin2/library-tests/exprs/binop.expected
@@ -123,6 +123,9 @@
 | exprs.kt:261:11:261:17 | ... * ... | exprs.kt:261:11:261:12 | lx | exprs.kt:261:16:261:17 | ly |
 | exprs.kt:262:11:262:17 | ... * ... | exprs.kt:262:11:262:12 | dx | exprs.kt:262:16:262:17 | dy |
 | exprs.kt:263:11:263:17 | ... * ... | exprs.kt:263:11:263:12 | fx | exprs.kt:263:16:263:17 | fy |
+| exprs.kt:272:3:272:14 | ... * ... | exprs.kt:272:3:272:9 | updated | exprs.kt:272:14:272:14 | 1 |
+| exprs.kt:273:3:273:14 | ... / ... | exprs.kt:273:3:273:9 | updated | exprs.kt:273:14:273:14 | 1 |
+| exprs.kt:274:3:274:14 | ... % ... | exprs.kt:274:3:274:9 | updated | exprs.kt:274:14:274:14 | 1 |
 | funcExprs.kt:32:35:32:42 | ... + ... | funcExprs.kt:32:35:32:38 | this | funcExprs.kt:32:42:32:42 | a |
 | localFunctionCalls.kt:5:25:5:29 | ... + ... | localFunctionCalls.kt:5:25:5:25 | i | localFunctionCalls.kt:5:29:5:29 | x |
 | samConversion.kt:2:33:2:38 | ... % ... | samConversion.kt:2:33:2:34 | it | samConversion.kt:2:38:2:38 | 2 |
--- a/java/ql/test-kotlin2/library-tests/exprs/exprs.expected
+++ b/java/ql/test-kotlin2/library-tests/exprs/exprs.expected
--- a/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
+++ b/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -16,6 +16,14 @@ methodWithDuplicate
 | AbstractCollection<E> | removeAll | Collection<?> |
 | AbstractCollection<E> | retainAll | Collection<?> |
 | AbstractCollection<E> | toArray | T[] |
+| AbstractCollection<Runnable> | add | Runnable |
+| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
+| AbstractCollection<Runnable> | contains | Object |
+| AbstractCollection<Runnable> | containsAll | Collection<?> |
+| AbstractCollection<Runnable> | remove | Object |
+| AbstractCollection<Runnable> | removeAll | Collection<?> |
+| AbstractCollection<Runnable> | retainAll | Collection<?> |
+| AbstractCollection<Runnable> | toArray | T[] |
 | AbstractCollection<String> | add | String |
 | AbstractCollection<String> | addAll | Collection<? extends String> |
 | AbstractCollection<String> | contains | Object |
@@ -24,6 +32,14 @@ methodWithDuplicate
 | AbstractCollection<String> | removeAll | Collection<?> |
 | AbstractCollection<String> | retainAll | Collection<?> |
 | AbstractCollection<String> | toArray | T[] |
+| AbstractCollection<T> | add | T |
+| AbstractCollection<T> | addAll | Collection<? extends T> |
+| AbstractCollection<T> | contains | Object |
+| AbstractCollection<T> | containsAll | Collection<?> |
+| AbstractCollection<T> | remove | Object |
+| AbstractCollection<T> | removeAll | Collection<?> |
+| AbstractCollection<T> | retainAll | Collection<?> |
+| AbstractCollection<T> | toArray | T[] |
 | AbstractList | add | E |
 | AbstractList | add | int |
 | AbstractList | addAll | Collection<? extends E> |
@@ -110,7 +126,6 @@ methodWithDuplicate
 | Collection<E> | addAll | Collection<? extends E> |
 | Collection<E> | contains | Object |
 | Collection<E> | containsAll | Collection<?> |
-| Collection<E> | equals | Object |
 | Collection<E> | remove | Object |
 | Collection<E> | removeAll | Collection<?> |
 | Collection<E> | removeIf | Predicate<? super E> |
@@ -137,6 +152,16 @@ methodWithDuplicate
 | Collection<K> | retainAll | Collection<?> |
 | Collection<K> | toArray | IntFunction<T[]> |
 | Collection<K> | toArray | T[] |
+| Collection<Runnable> | add | Runnable |
+| Collection<Runnable> | addAll | Collection<? extends Runnable> |
+| Collection<Runnable> | contains | Object |
+| Collection<Runnable> | containsAll | Collection<?> |
+| Collection<Runnable> | remove | Object |
+| Collection<Runnable> | removeAll | Collection<?> |
+| Collection<Runnable> | removeIf | Predicate<? super Runnable> |
+| Collection<Runnable> | retainAll | Collection<?> |
+| Collection<Runnable> | toArray | IntFunction<T[]> |
+| Collection<Runnable> | toArray | T[] |
 | Collection<String> | add | String |
 | Collection<String> | addAll | Collection<? extends String> |
 | Collection<String> | contains | Object |
@@ -148,6 +173,16 @@ methodWithDuplicate
 | Collection<String> | retainAll | Collection<?> |
 | Collection<String> | toArray | IntFunction<T[]> |
 | Collection<String> | toArray | T[] |
+| Collection<T> | add | T |
+| Collection<T> | addAll | Collection<? extends T> |
+| Collection<T> | contains | Object |
+| Collection<T> | containsAll | Collection<?> |
+| Collection<T> | remove | Object |
+| Collection<T> | removeAll | Collection<?> |
+| Collection<T> | removeIf | Predicate<? super T> |
+| Collection<T> | retainAll | Collection<?> |
+| Collection<T> | toArray | IntFunction<T[]> |
+| Collection<T> | toArray | T[] |
 | Collection<V> | add | V |
 | Collection<V> | addAll | Collection<? extends V> |
 | Collection<V> | contains | Object |
@@ -188,6 +223,8 @@ methodWithDuplicate
 | List<E> | add | int |
 | List<E> | addAll | Collection<? extends E> |
 | List<E> | addAll | int |
+| List<E> | addFirst | E |
+| List<E> | addLast | E |
 | List<E> | contains | Object |
 | List<E> | containsAll | Collection<?> |
 | List<E> | copyOf | Collection<? extends E> |
@@ -386,6 +423,8 @@ methodWithDuplicate
 | MutableList | add | int |
 | MutableList | addAll | Collection<? extends E> |
 | MutableList | addAll | int |
+| MutableList | addFirst | E |
+| MutableList | addLast | E |
 | MutableList | listIterator | int |
 | MutableList | remove | Object |
 | MutableList | remove | int |
--- a/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
+++ b/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
@@ -263,6 +263,8 @@ modifiers
 | reflection.kt:162:25:162:45 | ...::... | reflection.kt:162:25:162:45 | invoke | override |
 | reflection.kt:162:25:162:45 | ...::... | reflection.kt:162:25:162:45 | invoke | public |
 compGenerated
+| file://<external>/AccessFlag$Location.class:0:0:0:0 | getEntries | Default property accessor |
+| file://<external>/AccessFlag.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/AccessMode.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/CharProgression.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/CharProgression.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
@@ -273,18 +275,25 @@ compGenerated
 | file://<external>/ChronoUnit.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/Class2.class:0:0:0:0 | getValue | Default property accessor |
 | file://<external>/Class2.class:0:0:0:0 | getValue | Default property accessor |
+| file://<external>/ClassFileFormatVersion.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/Collector$Characteristics.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/ConstantPool$Tag.class:0:0:0:0 | getEntries | Default property accessor |
+| file://<external>/Continuation$Pinned.class:0:0:0:0 | getEntries | Default property accessor |
+| file://<external>/Continuation$PreemptStatus.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/DateTimeFormatterBuilder$SettingsParser.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/DayOfWeek.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/DirectMethodHandleDesc$Kind.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/ElementType.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/EnumEntries.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
+| file://<external>/EnumEntries.class:0:0:0:0 | getFirst | Forwarder for a Kotlin class inheriting an interface default method |
+| file://<external>/EnumEntries.class:0:0:0:0 | getLast | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/EnumEntries.class:0:0:0:0 | parallelStream | Forwarder for a Kotlin class inheriting an interface default method |
+| file://<external>/EnumEntries.class:0:0:0:0 | reversed | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/EnumEntries.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/EnumEntries.class:0:0:0:0 | stream | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/EnumEntries.class:0:0:0:0 | toArray | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/FormatStyle.class:0:0:0:0 | getEntries | Default property accessor |
+| file://<external>/Future$State.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/IntProgression.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/IntProgression.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/IntRange.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
@@ -313,6 +322,7 @@ compGenerated
 | file://<external>/ModuleDescriptor$Requires$Modifier.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/Month.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/ObjectInputFilter$Status.class:0:0:0:0 | getEntries | Default property accessor |
+| file://<external>/PreviewFeature$Feature.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/Proxy$Type.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/ResolverStyle.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/RetentionPolicy.class:0:0:0:0 | getEntries | Default property accessor |