Don't extract or call fake-override methods

2026-04-27 09:45:15 +02:00 · 2021-12-07 18:49:42 +00:00
parent 0c7075c749
commit 70708d69bf
20 changed files with 95 additions and 268 deletions
--- a/java/ql/test/kotlin/library-tests/arrays/test.expected
+++ b/java/ql/test/kotlin/library-tests/arrays/test.expected
@@ -6,9 +6,6 @@ cloneMethods
 sourceSignatures
 | arrayCreations.kt:3:1:29:1 | <obinit> | <obinit>() |
 | arrayCreations.kt:3:1:29:1 | TestArrayCreation | TestArrayCreation() |
-| arrayCreations.kt:3:1:29:1 | equals | equals(java.lang.Object) |
-| arrayCreations.kt:3:1:29:1 | hashCode | hashCode() |
-| arrayCreations.kt:3:1:29:1 | toString | toString() |
 | arrayCreations.kt:4:3:28:3 | test1 | test1() |
 | arrayCreations.kt:22:29:22:33 |  |  |
 | arrayCreations.kt:22:29:22:33 | invoke | invoke(int) |
@@ -22,9 +19,6 @@ sourceSignatures
 | arrayCreations.kt:27:24:27:38 | invoke | invoke(int) |
 | primitiveArrays.kt:3:1:7:1 | <obinit> | <obinit>() |
 | primitiveArrays.kt:3:1:7:1 | Test | Test() |
-| primitiveArrays.kt:3:1:7:1 | equals | equals(java.lang.Object) |
-| primitiveArrays.kt:3:1:7:1 | hashCode | hashCode() |
-| primitiveArrays.kt:3:1:7:1 | toString | toString() |
 | primitiveArrays.kt:5:3:5:123 | test | test(java.lang.Integer[],java.lang.Integer[],int[],java.lang.Integer[][],java.lang.Integer[][],int[][]) |
 #select
 | primitiveArrays.kt:5:12:5:24 | a | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
--- a/java/ql/test/kotlin/library-tests/comments/comments.expected
+++ b/java/ql/test/kotlin/library-tests/comments/comments.expected
@@ -10,10 +10,6 @@ comments
 commentOwners
 | 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: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: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 | equals |
-| 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 | hashCode |
-| 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 | other |
-| 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 | toString |
 | comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:46 | members |
 | comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:46 | members |
 | comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:13:17:46 | getMembers |
--- a/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
+++ b/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
@@ -7,10 +7,6 @@
 | Test.kt:3:1:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | <obinit> | Method |
 | Test.kt:3:1:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt |
 | Test.kt:3:8:80:1 | Test | Constructor | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:3:8:80:1 | equals | Method | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:3:8:80:1 | hashCode | Method | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:3:8:80:1 | other | Parameter | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:3:8:80:1 | toString | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:4:2:79:2 | test | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:4:13:79:2 | { ... } | BlockStmt | Test.kt:5:3:5:16 | var ...; | LocalVariableDeclStmt |
 | Test.kt:5:3:5:16 | int x | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
--- a/java/ql/test/kotlin/library-tests/extensions/methods.expected
+++ b/java/ql/test/kotlin/library-tests/extensions/methods.expected
@@ -1,16 +1,10 @@
 | extensions.kt:2:1:4:1 | <obinit> | file://<external>/Unit.class:0:0:0:0 | Unit |
-| extensions.kt:2:1:4:1 | equals | file://:0:0:0:0 | boolean |
-| extensions.kt:2:1:4:1 | hashCode | file://:0:0:0:0 | int |
-| extensions.kt:2:1:4:1 | toString | file://<external>/String.class:0:0:0:0 | String |
 | extensions.kt:3:5:3:28 | someClassMethod | file://:0:0:0:0 | void |
 | extensions.kt:5:1:7:1 | <obinit> | file://<external>/Unit.class:0:0:0:0 | Unit |
-| extensions.kt:5:1:7:1 | equals | file://:0:0:0:0 | boolean |
-| extensions.kt:5:1:7:1 | hashCode | file://:0:0:0:0 | int |
-| extensions.kt:5:1:7:1 | toString | file://<external>/String.class:0:0:0:0 | String |
 | extensions.kt:6:5:6:31 | anotherClassMethod | file://:0:0:0:0 | void |
 | extensions.kt:9:1:9:26 | someFun | file://:0:0:0:0 | void |
 | extensions.kt:10:1:10:32 | anotherFun | file://:0:0:0:0 | void |
 | extensions.kt:12:1:12:26 | bothFun | file://:0:0:0:0 | void |
 | extensions.kt:13:1:13:29 | bothFun | file://:0:0:0:0 | void |
 | extensions.kt:15:1:15:50 | bothFunDiffTypes | file://:0:0:0:0 | int |
-| extensions.kt:16:1:16:60 | bothFunDiffTypes | file://<external>/String.class:0:0:0:0 | String |
+| extensions.kt:16:1:16:60 | bothFunDiffTypes | file://<external>/String.class:0:0:0:0 | String |
--- a/java/ql/test/kotlin/library-tests/extensions_recursion/element.expected
+++ b/java/ql/test/kotlin/library-tests/extensions_recursion/element.expected
@@ -12,11 +12,7 @@
 | test.kt:6:1:10:1 | <obinit>(...) |
 | test.kt:6:1:10:1 | Foo |
 | test.kt:6:1:10:1 | Foo |
-| test.kt:6:1:10:1 | equals |
-| test.kt:6:1:10:1 | hashCode |
-| test.kt:6:1:10:1 | other |
 | test.kt:6:1:10:1 | super(...) |
-| test.kt:6:1:10:1 | toString |
 | test.kt:6:1:10:1 | { ... } |
 | test.kt:6:1:10:1 | { ... } |
 | test.kt:6:11:6:11 | T |
--- a/java/ql/test/kotlin/library-tests/files/test.expected
+++ b/java/ql/test/kotlin/library-tests/files/test.expected
@@ -1,7 +1,5 @@
-| otherfile.kt:3:1:3:29 | other | Object | Object.class | 0 |
 | test.kt:7:3:7:11 | b | String | String.class | 0 |
 | test.kt:8:3:8:24 | c | List<String> | List.class | 0 |
 | test.kt:9:3:9:28 | d | List<? extends String> | List.class | 0 |
 | test.kt:10:3:10:24 | e | DefinedHere<String> | test.kt | 14 |
 | test.kt:11:3:11:29 | f | DefinedOtherFile<String> | otherfile.kt | 3 |
-| test.kt:14:1:14:24 | other | Object | Object.class | 0 |
--- a/java/ql/test/kotlin/library-tests/generic-instance-methods/test.expected
+++ b/java/ql/test/kotlin/library-tests/generic-instance-methods/test.expected
@@ -54,36 +54,24 @@ refTypes
 | Test.java:14:14:14:17 | Test | Test.java:16:22:16:25 | user | user() | No parameters | void | Test.java:14:14:14:17 | Test | Test.java:16:22:16:25 | user |
 | test.kt:0:0:0:0 | TestKt | test.kt:12:1:25:1 | user | user() | No parameters | void | test.kt:0:0:0:0 | TestKt | test.kt:12:1:25:1 | user |
 | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | <obinit> | <obinit>() | No parameters | Unit | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | <obinit> |
-| test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | equals | equals(java.lang.Object) | Object | boolean | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | equals |
-| test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | hashCode | hashCode() | No parameters | int | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | hashCode |
-| test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | toString | toString() | No parameters | String | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | toString |
 | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | getStored | getStored() | No parameters | T | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | getStored |
 | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | setStored | setStored(java.lang.Object) | T | void | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | setStored |
 | test.kt:1:1:10:1 | Generic | test.kt:5:3:5:46 | identity2 | identity2(java.lang.Object) | T | T | test.kt:1:1:10:1 | Generic | test.kt:5:3:5:46 | identity2 |
 | test.kt:1:1:10:1 | Generic | test.kt:6:3:6:35 | identity | identity(java.lang.Object) | T | T | test.kt:1:1:10:1 | Generic | test.kt:6:3:6:35 | identity |
 | test.kt:1:1:10:1 | Generic | test.kt:7:3:7:26 | getter | getter() | No parameters | T | test.kt:1:1:10:1 | Generic | test.kt:7:3:7:26 | getter |
 | test.kt:1:1:10:1 | Generic | test.kt:8:3:8:41 | setter | setter(java.lang.Object) | T | void | test.kt:1:1:10:1 | Generic | test.kt:8:3:8:41 | setter |
-| test.kt:1:1:10:1 | Generic<? extends String> | test.kt:1:1:10:1 | equals | equals(java.lang.Object) | Object | boolean | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | equals |
-| test.kt:1:1:10:1 | Generic<? extends String> | test.kt:1:1:10:1 | hashCode | hashCode() | No parameters | int | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | hashCode |
-| test.kt:1:1:10:1 | Generic<? extends String> | test.kt:1:1:10:1 | toString | toString() | No parameters | String | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | toString |
 | test.kt:1:1:10:1 | Generic<? extends String> | test.kt:3:3:3:19 | getStored | getStored() | No parameters | String | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | getStored |
 | test.kt:1:1:10:1 | Generic<? extends String> | test.kt:3:3:3:19 | setStored | setStored(java.lang.Void) | Void | void | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | setStored |
 | test.kt:1:1:10:1 | Generic<? extends String> | test.kt:5:3:5:46 | identity2 | identity2(java.lang.Void) | Void | String | test.kt:1:1:10:1 | Generic | test.kt:5:3:5:46 | identity2 |
 | test.kt:1:1:10:1 | Generic<? extends String> | test.kt:6:3:6:35 | identity | identity(java.lang.Void) | Void | String | test.kt:1:1:10:1 | Generic | test.kt:6:3:6:35 | identity |
 | test.kt:1:1:10:1 | Generic<? extends String> | test.kt:7:3:7:26 | getter | getter() | No parameters | String | test.kt:1:1:10:1 | Generic | test.kt:7:3:7:26 | getter |
 | test.kt:1:1:10:1 | Generic<? extends String> | test.kt:8:3:8:41 | setter | setter(java.lang.Void) | Void | void | test.kt:1:1:10:1 | Generic | test.kt:8:3:8:41 | setter |
-| test.kt:1:1:10:1 | Generic<? super String> | test.kt:1:1:10:1 | equals | equals(java.lang.Object) | Object | boolean | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | equals |
-| test.kt:1:1:10:1 | Generic<? super String> | test.kt:1:1:10:1 | hashCode | hashCode() | No parameters | int | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | hashCode |
-| test.kt:1:1:10:1 | Generic<? super String> | test.kt:1:1:10:1 | toString | toString() | No parameters | String | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | toString |
 | test.kt:1:1:10:1 | Generic<? super String> | test.kt:3:3:3:19 | getStored | getStored() | No parameters | Object | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | getStored |
 | test.kt:1:1:10:1 | Generic<? super String> | test.kt:3:3:3:19 | setStored | setStored(java.lang.String) | String | void | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | setStored |
 | test.kt:1:1:10:1 | Generic<? super String> | test.kt:5:3:5:46 | identity2 | identity2(java.lang.String) | String | Object | test.kt:1:1:10:1 | Generic | test.kt:5:3:5:46 | identity2 |
 | test.kt:1:1:10:1 | Generic<? super String> | test.kt:6:3:6:35 | identity | identity(java.lang.String) | String | Object | test.kt:1:1:10:1 | Generic | test.kt:6:3:6:35 | identity |
 | test.kt:1:1:10:1 | Generic<? super String> | test.kt:7:3:7:26 | getter | getter() | No parameters | Object | test.kt:1:1:10:1 | Generic | test.kt:7:3:7:26 | getter |
 | test.kt:1:1:10:1 | Generic<? super String> | test.kt:8:3:8:41 | setter | setter(java.lang.String) | String | void | test.kt:1:1:10:1 | Generic | test.kt:8:3:8:41 | setter |
-| test.kt:1:1:10:1 | Generic<String> | test.kt:1:1:10:1 | equals | equals(java.lang.Object) | Object | boolean | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | equals |
-| test.kt:1:1:10:1 | Generic<String> | test.kt:1:1:10:1 | hashCode | hashCode() | No parameters | int | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | hashCode |
-| test.kt:1:1:10:1 | Generic<String> | test.kt:1:1:10:1 | toString | toString() | No parameters | String | test.kt:1:1:10:1 | Generic | test.kt:1:1:10:1 | toString |
 | test.kt:1:1:10:1 | Generic<String> | test.kt:3:3:3:19 | getStored | getStored() | No parameters | String | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | getStored |
 | test.kt:1:1:10:1 | Generic<String> | test.kt:3:3:3:19 | setStored | setStored(java.lang.String) | String | void | test.kt:1:1:10:1 | Generic | test.kt:3:3:3:19 | setStored |
 | test.kt:1:1:10:1 | Generic<String> | test.kt:5:3:5:46 | identity2 | identity2(java.lang.String) | String | String | test.kt:1:1:10:1 | Generic | test.kt:5:3:5:46 | identity2 |
--- a/java/ql/test/kotlin/library-tests/generic-selective-extraction/test.expected
+++ b/java/ql/test/kotlin/library-tests/generic-selective-extraction/test.expected
@@ -13,9 +13,6 @@
 | Test.java:13:7:13:10 | User | Test.java:15:22:15:25 | test |
 | Test.kt:0:0:0:0 | TestKt | Test.kt:1:1:8:1 | <obinit> |
 | Test.kt:0:0:0:0 | TestKt | Test.kt:1:1:8:1 | TestKt |
-| Test.kt:0:0:0:0 | TestKt | Test.kt:1:1:8:1 | equals |
-| Test.kt:0:0:0:0 | TestKt | Test.kt:1:1:8:1 | hashCode |
-| Test.kt:0:0:0:0 | TestKt | Test.kt:1:1:8:1 | toString |
 | Test.kt:0:0:0:0 | TestKt | Test.kt:3:3:3:22 | field |
 | Test.kt:0:0:0:0 | TestKt | Test.kt:3:3:3:22 | getField |
 | Test.kt:0:0:0:0 | TestKt | Test.kt:3:3:3:22 | setField |
@@ -25,9 +22,6 @@
 | Test.kt:0:0:0:0 | TestKt | Test.kt:6:3:6:22 | method |
 | Test.kt:1:1:8:1 | TestKt | Test.kt:1:1:8:1 | <obinit> |
 | Test.kt:1:1:8:1 | TestKt | Test.kt:1:1:8:1 | TestKt |
-| Test.kt:1:1:8:1 | TestKt | Test.kt:1:1:8:1 | equals |
-| Test.kt:1:1:8:1 | TestKt | Test.kt:1:1:8:1 | hashCode |
-| Test.kt:1:1:8:1 | TestKt | Test.kt:1:1:8:1 | toString |
 | Test.kt:1:1:8:1 | TestKt | Test.kt:3:3:3:22 | field |
 | Test.kt:1:1:8:1 | TestKt | Test.kt:3:3:3:22 | getField |
 | Test.kt:1:1:8:1 | TestKt | Test.kt:3:3:3:22 | setField |
@@ -36,36 +30,24 @@
 | Test.kt:1:1:8:1 | TestKt | Test.kt:5:3:5:25 | setRawField |
 | Test.kt:1:1:8:1 | TestKt | Test.kt:6:3:6:22 | method |
 | Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> |
-| Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:1:1:8:1 | equals |
-| Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:1:1:8:1 | hashCode |
-| Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:1:1:8:1 | toString |
 | Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:3:3:3:22 | getField |
 | Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:3:3:3:22 | setField |
 | Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:5:3:5:25 | getRawField |
 | Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:5:3:5:25 | setRawField |
 | Test.kt:1:1:8:1 | TestKt<ConstructorUsedKt> | Test.kt:6:3:6:22 | method |
 | Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:1:1:8:1 | TestKt<FieldUsedKt> |
-| Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:1:1:8:1 | equals |
-| Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:1:1:8:1 | hashCode |
-| Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:1:1:8:1 | toString |
 | Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:3:3:3:22 | getField |
 | Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:3:3:3:22 | setField |
 | Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:5:3:5:25 | getRawField |
 | Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:5:3:5:25 | setRawField |
 | Test.kt:1:1:8:1 | TestKt<FieldUsedKt> | Test.kt:6:3:6:22 | method |
 | Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:1:1:8:1 | TestKt<MethodUsedKt> |
-| Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:1:1:8:1 | equals |
-| Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:1:1:8:1 | hashCode |
-| Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:1:1:8:1 | toString |
 | Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:3:3:3:22 | getField |
 | Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:3:3:3:22 | setField |
 | Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:5:3:5:25 | getRawField |
 | Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:5:3:5:25 | setRawField |
 | Test.kt:1:1:8:1 | TestKt<MethodUsedKt> | Test.kt:6:3:6:22 | method |
 | Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> | Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> |
-| Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> | Test.kt:1:1:8:1 | equals |
-| Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> | Test.kt:1:1:8:1 | hashCode |
-| Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> | Test.kt:1:1:8:1 | toString |
 | Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> | Test.kt:3:3:3:22 | getField |
 | Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> | Test.kt:3:3:3:22 | setField |
 | Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> | Test.kt:5:3:5:25 | getRawField |
@@ -73,32 +55,14 @@
 | Test.kt:1:1:8:1 | TestKt<RawFieldUsedKt> | Test.kt:6:3:6:22 | method |
 | Test.kt:10:1:10:20 | FieldUsedKt | Test.kt:10:1:10:20 | <obinit> |
 | Test.kt:10:1:10:20 | FieldUsedKt | Test.kt:10:1:10:20 | FieldUsedKt |
-| Test.kt:10:1:10:20 | FieldUsedKt | Test.kt:10:1:10:20 | equals |
-| Test.kt:10:1:10:20 | FieldUsedKt | Test.kt:10:1:10:20 | hashCode |
-| Test.kt:10:1:10:20 | FieldUsedKt | Test.kt:10:1:10:20 | toString |
 | Test.kt:11:1:11:23 | RawFieldUsedKt | Test.kt:11:1:11:23 | <obinit> |
 | Test.kt:11:1:11:23 | RawFieldUsedKt | Test.kt:11:1:11:23 | RawFieldUsedKt |
-| Test.kt:11:1:11:23 | RawFieldUsedKt | Test.kt:11:1:11:23 | equals |
-| Test.kt:11:1:11:23 | RawFieldUsedKt | Test.kt:11:1:11:23 | hashCode |
-| Test.kt:11:1:11:23 | RawFieldUsedKt | Test.kt:11:1:11:23 | toString |
 | Test.kt:12:1:12:21 | MethodUsedKt | Test.kt:12:1:12:21 | <obinit> |
 | Test.kt:12:1:12:21 | MethodUsedKt | Test.kt:12:1:12:21 | MethodUsedKt |
-| Test.kt:12:1:12:21 | MethodUsedKt | Test.kt:12:1:12:21 | equals |
-| Test.kt:12:1:12:21 | MethodUsedKt | Test.kt:12:1:12:21 | hashCode |
-| Test.kt:12:1:12:21 | MethodUsedKt | Test.kt:12:1:12:21 | toString |
 | Test.kt:13:1:13:26 | ConstructorUsedKt | Test.kt:13:1:13:26 | <obinit> |
 | Test.kt:13:1:13:26 | ConstructorUsedKt | Test.kt:13:1:13:26 | ConstructorUsedKt |
-| Test.kt:13:1:13:26 | ConstructorUsedKt | Test.kt:13:1:13:26 | equals |
-| Test.kt:13:1:13:26 | ConstructorUsedKt | Test.kt:13:1:13:26 | hashCode |
-| Test.kt:13:1:13:26 | ConstructorUsedKt | Test.kt:13:1:13:26 | toString |
 | Test.kt:14:1:14:22 | NeitherUsedKt | Test.kt:14:1:14:22 | <obinit> |
 | Test.kt:14:1:14:22 | NeitherUsedKt | Test.kt:14:1:14:22 | NeitherUsedKt |
-| Test.kt:14:1:14:22 | NeitherUsedKt | Test.kt:14:1:14:22 | equals |
-| Test.kt:14:1:14:22 | NeitherUsedKt | Test.kt:14:1:14:22 | hashCode |
-| Test.kt:14:1:14:22 | NeitherUsedKt | Test.kt:14:1:14:22 | toString |
 | Test.kt:16:1:27:1 | UserKt | Test.kt:16:1:27:1 | <obinit> |
 | Test.kt:16:1:27:1 | UserKt | Test.kt:16:1:27:1 | UserKt |
-| Test.kt:16:1:27:1 | UserKt | Test.kt:16:1:27:1 | equals |
-| Test.kt:16:1:27:1 | UserKt | Test.kt:16:1:27:1 | hashCode |
-| Test.kt:16:1:27:1 | UserKt | Test.kt:16:1:27:1 | toString |
 | Test.kt:16:1:27:1 | UserKt | Test.kt:18:3:25:3 | test |
--- a/java/ql/test/kotlin/library-tests/generics/generics.expected
+++ b/java/ql/test/kotlin/library-tests/generics/generics.expected
@@ -30,29 +30,11 @@ function
 | generics.kt:11:1:11:19 | <obinit> | <obinit>() |
 | generics.kt:11:6:11:19 | C0 | C0() |
 | generics.kt:11:6:11:19 | C0<Integer> | C0<Integer>() |
-| generics.kt:11:6:11:19 | equals | equals(java.lang.Object) |
-| generics.kt:11:6:11:19 | equals | equals(java.lang.Object) |
-| generics.kt:11:6:11:19 | hashCode | hashCode() |
-| generics.kt:11:6:11:19 | hashCode | hashCode() |
-| generics.kt:11:6:11:19 | toString | toString() |
-| generics.kt:11:6:11:19 | toString | toString() |
 | generics.kt:13:1:18:1 | <obinit> | <obinit>() |
 | generics.kt:13:1:18:1 | C1 | C1(java.lang.Object) |
 | generics.kt:13:1:18:1 | C1<Integer,Integer> | C1<Integer,Integer>(int) |
 | generics.kt:13:1:18:1 | C1<String,Integer> | C1<String,Integer>(java.lang.String) |
 | generics.kt:13:1:18:1 | C1<U,U> | C1<U,U>(java.lang.Object) |
-| generics.kt:13:1:18:1 | equals | equals(java.lang.Object) |
-| generics.kt:13:1:18:1 | equals | equals(java.lang.Object) |
-| generics.kt:13:1:18:1 | equals | equals(java.lang.Object) |
-| generics.kt:13:1:18:1 | equals | equals(java.lang.Object) |
-| generics.kt:13:1:18:1 | hashCode | hashCode() |
-| generics.kt:13:1:18:1 | hashCode | hashCode() |
-| generics.kt:13:1:18:1 | hashCode | hashCode() |
-| generics.kt:13:1:18:1 | hashCode | hashCode() |
-| generics.kt:13:1:18:1 | toString | toString() |
-| generics.kt:13:1:18:1 | toString | toString() |
-| generics.kt:13:1:18:1 | toString | toString() |
-| generics.kt:13:1:18:1 | toString | toString() |
 | generics.kt:13:16:13:23 | getT | getT() |
 | generics.kt:13:16:13:23 | getT | getT() |
 | generics.kt:13:16:13:23 | getT | getT() |
@@ -67,16 +49,10 @@ function
 | generics.kt:15:5:17:5 | f2 | f2(java.lang.Object) |
 | generics.kt:20:1:22:1 | <obinit> | <obinit>() |
 | generics.kt:20:1:22:1 | C2 | C2() |
-| generics.kt:20:1:22:1 | equals | equals(java.lang.Object) |
-| generics.kt:20:1:22:1 | hashCode | hashCode() |
-| generics.kt:20:1:22:1 | toString | toString() |
 | generics.kt:21:5:21:23 | f4 | f4(java.lang.Object) |
 | generics.kt:24:1:34:1 | m | m() |
 | generics.kt:36:1:40:1 | <obinit> | <obinit>() |
 | generics.kt:36:1:40:1 | BoundedTest | BoundedTest() |
-| generics.kt:36:1:40:1 | equals | equals(java.lang.Object) |
-| generics.kt:36:1:40:1 | hashCode | hashCode() |
-| generics.kt:36:1:40:1 | toString | toString() |
 | generics.kt:38:5:38:25 | m | m(java.lang.CharSequence,java.lang.CharSequence) |
 genericFunction
 | generics.kt:3:1:5:1 | f0 | generics.kt:0:0:0:0 | GenericsKt | generics.kt:3:6:3:6 | S | 0 |
--- a/java/ql/test/kotlin/library-tests/inherited-callee/Test.java
+++ b/java/ql/test/kotlin/library-tests/inherited-callee/Test.java
@@ -0,0 +1,33 @@
+public class Test {
+
+  void inheritMe() { }
+
+}
+
+interface ParentIf { 
+
+  void inheritedInterfaceMethod();
+
+}
+
+interface ChildIf extends ParentIf {
+
+
+}
+
+class Child extends Test {
+
+  public static void user() {
+
+    Child c = new Child();
+    c.toString();
+    c.equals(c);
+    c.hashCode();
+    c.inheritMe();
+    ChildIf c2 = null;
+    c2.inheritedInterfaceMethod();
+
+  }
+
+}
+
--- a/java/ql/test/kotlin/library-tests/inherited-callee/Test.kt
+++ b/java/ql/test/kotlin/library-tests/inherited-callee/Test.kt
@@ -0,0 +1,33 @@
+open class TestKt {
+
+  fun inheritMe() { }
+
+}
+
+interface ParentIf {
+
+  fun inheritedInterfaceMethod()
+
+}
+
+interface ChildIf : ParentIf {
+
+
+}
+
+class ChildKt : TestKt() {
+
+  fun user() {
+
+    val c = ChildKt()
+    c.toString()
+    c.equals(c)
+    c.hashCode()
+    c.inheritMe()
+    val c2: ParentIf? = null
+    c2?.inheritedInterfaceMethod()
+
+  }
+
+}
+
--- a/java/ql/test/kotlin/library-tests/inherited-callee/test.expected
+++ b/java/ql/test/kotlin/library-tests/inherited-callee/test.expected
@@ -0,0 +1,12 @@
+| Test.java:23:5:23:16 | toString(...) | toString | Object |
+| Test.java:24:5:24:15 | equals(...) | equals | Object |
+| Test.java:25:5:25:16 | hashCode(...) | hashCode | Object |
+| Test.java:26:5:26:17 | inheritMe(...) | inheritMe | Test |
+| Test.java:28:5:28:33 | inheritedInterfaceMethod(...) | inheritedInterfaceMethod | ParentIf |
+| Test.kt:1:1:5:1 | <obinit>(...) | <obinit> | TestKt |
+| Test.kt:18:1:32:1 | <obinit>(...) | <obinit> | ChildKt |
+| Test.kt:23:7:23:16 | toString(...) | toString | Any |
+| Test.kt:24:7:24:15 | equals(...) | equals | Any |
+| Test.kt:25:7:25:16 | hashCode(...) | hashCode | Any |
+| Test.kt:26:7:26:17 | inheritMe(...) | inheritMe | TestKt |
+| Test.kt:28:9:28:34 | inheritedInterfaceMethod(...) | inheritedInterfaceMethod | ParentIf |
--- a/java/ql/test/kotlin/library-tests/inherited-callee/test.ql
+++ b/java/ql/test/kotlin/library-tests/inherited-callee/test.ql
@@ -0,0 +1,5 @@
+import java
+
+from MethodAccess ma, Callable callee, RefType declaringType
+where ma.getCallee() = callee and callee.getDeclaringType() = declaringType
+select ma, callee.toString(), declaringType.toString()
--- a/java/ql/test/kotlin/library-tests/methods/methods.expected
+++ b/java/ql/test/kotlin/library-tests/methods/methods.expected
@@ -1,40 +1,19 @@
 methods
 | methods2.kt:0:0:0:0 | Methods2Kt | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | fooBarTopLevelMethod(int,int) |
 | methods2.kt:7:1:10:1 | Class2 | methods2.kt:7:1:10:1 | <obinit> | <obinit>() |
-| methods2.kt:7:1:10:1 | Class2 | methods2.kt:7:1:10:1 | equals | equals(java.lang.Object) |
-| methods2.kt:7:1:10:1 | Class2 | methods2.kt:7:1:10:1 | hashCode | hashCode() |
-| methods2.kt:7:1:10:1 | Class2 | methods2.kt:7:1:10:1 | toString | toString() |
 | methods2.kt:7:1:10:1 | Class2 | methods2.kt:8:5:9:5 | fooBarClassMethod | fooBarClassMethod(int,int) |
 | methods3.kt:0:0:0:0 | Methods3Kt | methods3.kt:3:1:3:42 | fooBarTopLevelMethodExt | fooBarTopLevelMethodExt(int,int) |
 | methods3.kt:5:1:7:1 | Class3 | methods3.kt:5:1:7:1 | <obinit> | <obinit>() |
-| methods3.kt:5:1:7:1 | Class3 | methods3.kt:5:1:7:1 | equals | equals(java.lang.Object) |
-| methods3.kt:5:1:7:1 | Class3 | methods3.kt:5:1:7:1 | hashCode | hashCode() |
-| methods3.kt:5:1:7:1 | Class3 | methods3.kt:5:1:7:1 | toString | toString() |
 | methods3.kt:5:1:7:1 | Class3 | methods3.kt:6:5:6:46 | fooBarTopLevelMethodExt | fooBarTopLevelMethodExt(int,int) |
 | methods4.kt:3:1:11:1 | NestedTest | methods4.kt:3:1:11:1 | <obinit> | <obinit>() |
-| methods4.kt:3:1:11:1 | NestedTest | methods4.kt:3:1:11:1 | equals | equals(java.lang.Object) |
-| methods4.kt:3:1:11:1 | NestedTest | methods4.kt:3:1:11:1 | hashCode | hashCode() |
-| methods4.kt:3:1:11:1 | NestedTest | methods4.kt:3:1:11:1 | toString | toString() |
 | methods4.kt:5:3:9:3 | InsideNestedTest | methods4.kt:5:3:9:3 | <obinit> | <obinit>() |
-| methods4.kt:5:3:9:3 | InsideNestedTest | methods4.kt:5:3:9:3 | equals | equals(java.lang.Object) |
-| methods4.kt:5:3:9:3 | InsideNestedTest | methods4.kt:5:3:9:3 | hashCode | hashCode() |
-| methods4.kt:5:3:9:3 | InsideNestedTest | methods4.kt:5:3:9:3 | toString | toString() |
 | methods4.kt:5:3:9:3 | InsideNestedTest | methods4.kt:7:5:7:34 | m | m(foo.bar.NestedTest.InsideNestedTest) |
 | methods5.kt:0:0:0:0 | Methods5Kt | methods5.kt:3:1:11:1 | x | x() |
 | methods5.kt:5:3:5:27 | new Object(...) { ... } | methods5.kt:5:3:5:27 | a | a(int) |
 | methods5.kt:9:3:9:32 | new Object(...) { ... } | methods5.kt:9:3:9:32 | f1 | f1(foo.bar.C1,int) |
 | methods5.kt:13:1:13:14 | C1 | methods5.kt:13:1:13:14 | <obinit> | <obinit>() |
-| methods5.kt:13:1:13:14 | C1 | methods5.kt:13:1:13:14 | equals | equals(java.lang.Object) |
-| methods5.kt:13:1:13:14 | C1 | methods5.kt:13:1:13:14 | hashCode | hashCode() |
-| methods5.kt:13:1:13:14 | C1 | methods5.kt:13:1:13:14 | toString | toString() |
-| methods5.kt:13:1:13:14 | C1<Integer> | methods5.kt:13:1:13:14 | equals | equals(java.lang.Object) |
-| methods5.kt:13:1:13:14 | C1<Integer> | methods5.kt:13:1:13:14 | hashCode | hashCode() |
-| methods5.kt:13:1:13:14 | C1<Integer> | methods5.kt:13:1:13:14 | toString | toString() |
 | methods.kt:0:0:0:0 | MethodsKt | methods.kt:2:1:3:1 | topLevelMethod | topLevelMethod(int,int) |
 | methods.kt:5:1:13:1 | Class | methods.kt:5:1:13:1 | <obinit> | <obinit>() |
-| methods.kt:5:1:13:1 | Class | methods.kt:5:1:13:1 | equals | equals(java.lang.Object) |
-| methods.kt:5:1:13:1 | Class | methods.kt:5:1:13:1 | hashCode | hashCode() |
-| methods.kt:5:1:13:1 | Class | methods.kt:5:1:13:1 | toString | toString() |
 | methods.kt:5:1:13:1 | Class | methods.kt:6:5:7:5 | classMethod | classMethod(int,int) |
 | methods.kt:5:1:13:1 | Class | methods.kt:9:5:12:5 | anotherClassMethod | anotherClassMethod(int,int) |
 constructors
--- a/java/ql/test/kotlin/library-tests/methods/parameters.expected
+++ b/java/ql/test/kotlin/library-tests/methods/parameters.expected
@@ -1,24 +1,17 @@
 | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | methods2.kt:4:26:4:31 | x | 0 |
 | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | methods2.kt:4:34:4:39 | y | 1 |
-| methods2.kt:7:1:10:1 | equals | methods2.kt:7:1:10:1 | other | 0 |
 | methods2.kt:8:5:9:5 | fooBarClassMethod | methods2.kt:8:27:8:32 | x | 0 |
 | methods2.kt:8:5:9:5 | fooBarClassMethod | methods2.kt:8:35:8:40 | y | 1 |
 | methods3.kt:3:1:3:42 | fooBarTopLevelMethodExt | methods3.kt:3:5:3:7 | <this> | 0 |
 | methods3.kt:3:1:3:42 | fooBarTopLevelMethodExt | methods3.kt:3:33:3:38 | x | 1 |
-| methods3.kt:5:1:7:1 | equals | methods3.kt:5:1:7:1 | other | 0 |
 | methods3.kt:6:5:6:46 | fooBarTopLevelMethodExt | methods3.kt:6:9:6:11 | <this> | 0 |
 | methods3.kt:6:5:6:46 | fooBarTopLevelMethodExt | methods3.kt:6:37:6:42 | x | 1 |
-| methods4.kt:3:1:11:1 | equals | methods4.kt:3:1:11:1 | other | 0 |
-| methods4.kt:5:3:9:3 | equals | methods4.kt:5:3:9:3 | other | 0 |
 | methods4.kt:7:5:7:34 | m | methods4.kt:7:11:7:29 | x | 0 |
 | methods5.kt:5:3:5:27 | a | methods5.kt:5:13:5:18 | i | 0 |
 | methods5.kt:9:3:9:32 | f1 | methods5.kt:9:12:9:17 | <this> | 0 |
 | methods5.kt:9:3:9:32 | f1 | methods5.kt:9:22:9:27 | i | 1 |
-| methods5.kt:13:1:13:14 | equals | methods5.kt:13:1:13:14 | other | 0 |
-| methods5.kt:13:1:13:14 | equals | methods5.kt:13:1:13:14 | other | 0 |
 | methods.kt:2:1:3:1 | topLevelMethod | methods.kt:2:20:2:25 | x | 0 |
 | methods.kt:2:1:3:1 | topLevelMethod | methods.kt:2:28:2:33 | y | 1 |
-| methods.kt:5:1:13:1 | equals | methods.kt:5:1:13:1 | other | 0 |
 | methods.kt:6:5:7:5 | classMethod | methods.kt:6:21:6:26 | x | 0 |
 | methods.kt:6:5:7:5 | classMethod | methods.kt:6:29:6:34 | y | 1 |
 | methods.kt:9:5:12:5 | anotherClassMethod | methods.kt:9:28:9:33 | a | 0 |
--- a/java/ql/test/kotlin/library-tests/multiple_files/methods.expected
+++ b/java/ql/test/kotlin/library-tests/multiple_files/methods.expected
@@ -1,20 +1,8 @@
 | file1.kt:2:1:13:1 | <obinit> | Class1.<obinit> | file1.kt:2:1:13:1 | Class1 |
-| file1.kt:2:1:13:1 | equals | Class1.equals | file1.kt:2:1:13:1 | Class1 |
-| file1.kt:2:1:13:1 | hashCode | Class1.hashCode | file1.kt:2:1:13:1 | Class1 |
-| file1.kt:2:1:13:1 | toString | Class1.toString | file1.kt:2:1:13:1 | Class1 |
 | file1.kt:3:5:12:5 | fun1 | Class1.fun1 | file1.kt:2:1:13:1 | Class1 |
 | file2.kt:2:1:4:1 | <obinit> | Class2.<obinit> | file2.kt:2:1:4:1 | Class2 |
-| file2.kt:2:1:4:1 | equals | Class2.equals | file2.kt:2:1:4:1 | Class2 |
-| file2.kt:2:1:4:1 | hashCode | Class2.hashCode | file2.kt:2:1:4:1 | Class2 |
-| file2.kt:2:1:4:1 | toString | Class2.toString | file2.kt:2:1:4:1 | Class2 |
 | file2.kt:3:5:3:18 | fun2 | Class2.fun2 | file2.kt:2:1:4:1 | Class2 |
 | file3.kt:3:1:3:16 | <obinit> | Class3.<obinit> | file3.kt:3:1:3:16 | Class3 |
-| file3.kt:3:1:3:16 | equals | Class3.equals | file3.kt:3:1:3:16 | Class3 |
-| file3.kt:3:1:3:16 | hashCode | Class3.hashCode | file3.kt:3:1:3:16 | Class3 |
-| file3.kt:3:1:3:16 | toString | Class3.toString | file3.kt:3:1:3:16 | Class3 |
 | file3.kt:5:1:6:1 | fun3 | MyJvmName.fun3 | file3.kt:0:0:0:0 | MyJvmName |
 | file4.kt:2:1:2:16 | <obinit> | Class4.<obinit> | file4.kt:2:1:2:16 | Class4 |
-| file4.kt:2:1:2:16 | equals | Class4.equals | file4.kt:2:1:2:16 | Class4 |
-| file4.kt:2:1:2:16 | hashCode | Class4.hashCode | file4.kt:2:1:2:16 | Class4 |
-| file4.kt:2:1:2:16 | toString | Class4.toString | file4.kt:2:1:2:16 | Class4 |
 | file4.kt:4:1:5:1 | fun4 | File4Kt.fun4 | file4.kt:0:0:0:0 | File4Kt |
--- a/java/ql/test/kotlin/library-tests/trivial/elements.expected
+++ b/java/ql/test/kotlin/library-tests/trivial/elements.expected
@@ -5,11 +5,7 @@
 | Trivial.kt:1:1:1:16 | <obinit>(...) | MethodAccess |
 | Trivial.kt:1:1:1:16 | Trivial | Class |
 | Trivial.kt:1:1:1:16 | Trivial | Constructor |
-| Trivial.kt:1:1:1:16 | equals | Method |
-| Trivial.kt:1:1:1:16 | hashCode | Method |
-| Trivial.kt:1:1:1:16 | other | Parameter |
 | Trivial.kt:1:1:1:16 | super(...) | SuperConstructorInvocationStmt |
-| Trivial.kt:1:1:1:16 | toString | Method |
 | Trivial.kt:1:1:1:16 | { ... } | BlockStmt |
 | Trivial.kt:1:1:1:16 | { ... } | BlockStmt |
 | file://:0:0:0:0 |  | Package |
--- a/java/ql/test/kotlin/library-tests/types/types.expected
+++ b/java/ql/test/kotlin/library-tests/types/types.expected
@@ -40,13 +40,10 @@
 | ? extends FileAttributeView | Wildcard |
 | ? extends ForkJoinTask<?> | Wildcard |
 | ? extends FormalTypeParameter | Wildcard |
-| ? extends Identity | Wildcard |
 | ? extends InetAddress | Wildcard |
 | ? extends IntStream | Wildcard |
-| ? extends Item | Wildcard |
 | ? extends K | Wildcard |
 | ? extends Kind<?> | Wildcard |
-| ? extends Label | Wildcard |
 | ? extends LinkOption | Wildcard |
 | ? extends Locale | Wildcard |
 | ? extends LongStream | Wildcard |
@@ -75,7 +72,6 @@
 | ? extends SoftReference<LambdaForm> | Wildcard |
 | ? extends SoftReference<MethodHandle> | Wildcard |
 | ? extends StackTraceElement | Wildcard |
-| ? extends StackTraceElement[] | Wildcard |
 | ? extends Stream<? extends R> | Wildcard |
 | ? extends String | Wildcard |
 | ? extends T | Wildcard |
@@ -97,19 +93,13 @@
 | ? extends WorkQueue | Wildcard |
 | ? extends X | Wildcard |
 | ? super A | Wildcard |
-| ? super Boolean | Wildcard |
-| ? super Byte | Wildcard |
-| ? super Character | Wildcard |
 | ? super Class<?> | Wildcard |
 | ? super Cleaner | Wildcard |
 | ? super Double | Wildcard |
 | ? super E | Wildcard |
-| ? super Entry<?> | Wildcard |
 | ? super Entry<K,V> | Wildcard |
-| ? super Float | Wildcard |
 | ? super ForkJoinPool | Wildcard |
 | ? super ForkJoinTask<?> | Wildcard |
-| ? super Identity | Wildcard |
 | ? super Integer | Wildcard |
 | ? super K | Wildcard |
 | ? super Long | Wildcard |
@@ -117,7 +107,6 @@
 | ? super Path | Wildcard |
 | ? super R | Wildcard |
 | ? super Reference<? extends T> | Wildcard |
-| ? super Short | Wildcard |
 | ? super StackFrame | Wildcard |
 | ? super Stream<StackFrame> | Wildcard |
 | ? super T | Wildcard |
@@ -129,16 +118,10 @@
 | A[] | Array |
 | AbstractChronology | Class |
 | AbstractCollection | Class, GenericType, ParameterizedType |
-| AbstractCollection<?> | Class, ParameterizedType |
 | AbstractCollection<E> | Class, ParameterizedType |
-| AbstractCollection<Future<T>> | Class, ParameterizedType |
 | AbstractCollection<Option> | Class, ParameterizedType |
 | AbstractExecutorService | Class |
 | AbstractInterruptibleChannel | Class |
-| AbstractList | Class, GenericType, ParameterizedType |
-| AbstractList<?> | Class, ParameterizedType |
-| AbstractList<E> | Class, ParameterizedType |
-| AbstractList<Future<T>> | Class, ParameterizedType |
 | AbstractMap | Class, GenericType, ParameterizedType |
 | AbstractMap<?,?> | Class, ParameterizedType |
 | AbstractMap<Identity,Entry<?>> | Class, ParameterizedType |
@@ -171,7 +154,6 @@
 | AnnotatedType[] | Array |
 | Annotation | Interface |
 | AnnotationType | Class |
-| AnnotationVisitor | Class |
 | Annotation[] | Array |
 | Annotation[][] | Array |
 | Any | Class |
@@ -183,7 +165,6 @@
 | Array<? extends AnnotatedType> | Class, ParameterizedType |
 | Array<? extends Annotation> | Class, ParameterizedType |
 | Array<? extends Annotation[]> | Class, ParameterizedType |
-| Array<? extends Attribute> | Class, ParameterizedType |
 | Array<? extends AttributedCharacterIterator> | Class, ParameterizedType |
 | Array<? extends BasicType> | Class, ParameterizedType |
 | Array<? extends BigInteger> | Class, ParameterizedType |
@@ -214,9 +195,7 @@
 | Array<? extends ForkJoinTask<?>> | Class, ParameterizedType |
 | Array<? extends FormalTypeParameter> | Class, ParameterizedType |
 | Array<? extends InetAddress> | Class, ParameterizedType |
-| Array<? extends Item> | Class, ParameterizedType |
 | Array<? extends Kind<?>> | Class, ParameterizedType |
-| Array<? extends Label> | Class, ParameterizedType |
 | Array<? extends LinkOption> | Class, ParameterizedType |
 | Array<? extends Locale> | Class, ParameterizedType |
 | Array<? extends MemberName> | Class, ParameterizedType |
@@ -240,7 +219,6 @@
 | Array<? extends SoftReference<LambdaForm>> | Class, ParameterizedType |
 | Array<? extends SoftReference<MethodHandle>> | Class, ParameterizedType |
 | Array<? extends StackTraceElement> | Class, ParameterizedType |
-| Array<? extends StackTraceElement[]> | Class, ParameterizedType |
 | Array<? extends String> | Class, ParameterizedType |
 | Array<? extends T> | Class, ParameterizedType |
 | Array<? extends TemporalField> | Class, ParameterizedType |
@@ -264,7 +242,6 @@
 | Array<Annotation> | Class, ParameterizedType |
 | Array<Annotation[]> | Class, ParameterizedType |
 | Array<ArrayAccess> | Class, ParameterizedType |
-| Array<Attribute> | Class, ParameterizedType |
 | Array<AttributedCharacterIterator> | Class, ParameterizedType |
 | Array<BasicType> | Class, ParameterizedType |
 | Array<BigInteger> | Class, ParameterizedType |
@@ -311,10 +288,8 @@
 | Array<Intrinsic> | Class, ParameterizedType |
 | Array<IsoCountryCode> | Class, ParameterizedType |
 | Array<IsoEra> | Class, ParameterizedType |
-| Array<Item> | Class, ParameterizedType |
 | Array<Kind<?>> | Class, ParameterizedType |
 | Array<Kind> | Class, ParameterizedType |
-| Array<Label> | Class, ParameterizedType |
 | Array<Level> | Class, ParameterizedType |
 | Array<LinkOption> | Class, ParameterizedType |
 | Array<Locale> | Class, ParameterizedType |
@@ -346,7 +321,6 @@
 | Array<SoftReference<LambdaForm>> | Class, ParameterizedType |
 | Array<SoftReference<MethodHandle>> | Class, ParameterizedType |
 | Array<StackTraceElement> | Class, ParameterizedType |
-| Array<StackTraceElement[]> | Class, ParameterizedType |
 | Array<State> | Class, ParameterizedType |
 | Array<Status> | Class, ParameterizedType |
 | Array<String> | Class, ParameterizedType |
@@ -376,10 +350,6 @@
 | ArrayAccess[] | Array |
 | ArrayAccessor | Class |
 | ArrayIndexOutOfBoundsException | Class |
-| ArrayList | Class, GenericType, ParameterizedType |
-| ArrayList<Future<T>> | Class, ParameterizedType |
-| ArrayListSpliterator | Class |
-| ArrayListSpliterator<E> | Class, ParameterizedType |
 | ArrayTypeSignature | Class |
 | AsynchronousChannel | Interface |
 | AsynchronousFileChannel | Class |
@@ -388,7 +358,6 @@
 | AtomicReference<U> | Class, ParameterizedType |
 | Attribute | Class |
 | AttributeView | Interface |
-| Attribute[] | Array |
 | AttributedCharacterIterator | Interface |
 | AttributedCharacterIterator[] | Array |
 | AuthPermission | Class |
@@ -404,11 +373,9 @@
 | BaseStream<Double,DoubleStream> | Interface, ParameterizedType |
 | BaseStream<Double,Stream<Double>> | Interface, ParameterizedType |
 | BaseStream<E,Stream<E>> | Interface, ParameterizedType |
-| BaseStream<Entry<K,V>,Stream<Entry<K,V>>> | Interface, ParameterizedType |
 | BaseStream<InetAddress,Stream<InetAddress>> | Interface, ParameterizedType |
 | BaseStream<Integer,IntStream> | Interface, ParameterizedType |
 | BaseStream<Integer,Stream<Integer>> | Interface, ParameterizedType |
-| BaseStream<K,Stream<K>> | Interface, ParameterizedType |
 | BaseStream<LocalDate,Stream<LocalDate>> | Interface, ParameterizedType |
 | BaseStream<Long,LongStream> | Interface, ParameterizedType |
 | BaseStream<Long,Stream<Long>> | Interface, ParameterizedType |
@@ -422,14 +389,12 @@
 | BaseStream<T,Stream<T>> | Interface, ParameterizedType |
 | BaseStream<U,Stream<U>> | Interface, ParameterizedType |
 | BaseStream<URL,Stream<URL>> | Interface, ParameterizedType |
-| BaseStream<V,Stream<V>> | Interface, ParameterizedType |
 | BaseType | Interface |
 | BasicFileAttributes | Interface |
 | BasicPermission | Class |
 | BasicType | Class |
 | BasicType[] | Array |
 | BiConsumer | GenericType, Interface, ParameterizedType |
-| BiConsumer<? super Identity,? super Entry<?>> | Interface, ParameterizedType |
 | BiConsumer<? super K,? super V> | Interface, ParameterizedType |
 | BiConsumer<? super Object,? super Object> | Interface, ParameterizedType |
 | BiConsumer<? super T,? super U> | Interface, ParameterizedType |
@@ -439,8 +404,6 @@
 | BiConsumer<R,T> | Interface, ParameterizedType |
 | BiConsumer<T,U> | Interface, ParameterizedType |
 | BiFunction | GenericType, Interface, ParameterizedType |
-| BiFunction<? super Entry<?>,? super Entry<?>,? extends Entry<?>> | Interface, ParameterizedType |
-| BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> | Interface, ParameterizedType |
 | BiFunction<? super K,? super K,? extends K> | Interface, ParameterizedType |
 | BiFunction<? super K,? super V,? extends U> | Interface, ParameterizedType |
 | BiFunction<? super K,? super V,? extends V> | Interface, ParameterizedType |
@@ -453,7 +416,6 @@
 | BiFunction<R,R,R> | Interface, ParameterizedType |
 | BiFunction<String,List<Integer>,ArrayIndexOutOfBoundsException> | Interface, ParameterizedType |
 | BiFunction<T,T,T> | Interface, ParameterizedType |
-| BiFunction<T,T,V> | Interface, ParameterizedType |
 | BiFunction<T,U,V> | Interface, ParameterizedType |
 | BiFunction<U,? super T,U> | Interface, ParameterizedType |
 | BiFunction<U,U,U> | Interface, ParameterizedType |
@@ -474,7 +436,6 @@
 | BottomSignature | Class |
 | BoundMethodHandle | Class |
 | Buffer | Class |
-| BufferedWriter | Class |
 | Builder | Class |
 | Builder | GenericType, Interface, ParameterizedType |
 | Builder | Interface |
@@ -498,7 +459,6 @@
 | ByteIterator | Class |
 | ByteOrder | Class |
 | ByteSignature | Class |
-| ByteVector | Class |
 | CallSite | Class |
 | Callable | GenericType, Interface, ParameterizedType |
 | Callable<? extends T> | Interface, ParameterizedType |
@@ -560,66 +520,31 @@
 | Class<?> | Class, ParameterizedType |
 | Class<?>[] | Array |
 | Class<A> | Class, ParameterizedType |
-| Class<AccessMode> | Class, ParameterizedType |
-| Class<AccessType> | Class, ParameterizedType |
-| Class<ArrayAccess> | Class, ParameterizedType |
-| Class<BasicType> | Class, ParameterizedType |
 | Class<Boolean> | Class, ParameterizedType |
 | Class<BoundMethodHandle> | Class, ParameterizedType |
 | Class<Byte> | Class, ParameterizedType |
-| Class<Category> | Class, ParameterizedType |
 | Class<Character> | Class, ParameterizedType |
-| Class<Characteristics> | Class, ParameterizedType |
-| Class<ChronoField> | Class, ParameterizedType |
-| Class<ChronoUnit> | Class, ParameterizedType |
-| Class<DayOfWeek> | Class, ParameterizedType |
 | Class<Double> | Class, ParameterizedType |
 | Class<E> | Class, ParameterizedType |
-| Class<ExtendedOption> | Class, ParameterizedType |
-| Class<FilteringMode> | Class, ParameterizedType |
 | Class<Float> | Class, ParameterizedType |
-| Class<FormatStyle> | Class, ParameterizedType |
 | Class<Integer> | Class, ParameterizedType |
-| Class<Intrinsic> | Class, ParameterizedType |
-| Class<IsoCountryCode> | Class, ParameterizedType |
-| Class<IsoEra> | Class, ParameterizedType |
 | Class<K> | Class, ParameterizedType |
-| Class<Kind> | Class, ParameterizedType |
-| Class<Level> | Class, ParameterizedType |
-| Class<LinkOption> | Class, ParameterizedType |
 | Class<Long> | Class, ParameterizedType |
-| Class<Modifier> | Class, ParameterizedType |
-| Class<Month> | Class, ParameterizedType |
 | Class<NoSuchMemberException> | Class, ParameterizedType |
 | Class<Object> | Class, ParameterizedType |
 | Class<Object>[] | Array |
-| Class<Option> | Class, ParameterizedType |
-| Class<ResolverStyle> | Class, ParameterizedType |
-| Class<RetentionPolicy> | Class, ParameterizedType |
 | Class<S> | Class, ParameterizedType |
-| Class<SettingsParser> | Class, ParameterizedType |
 | Class<Short> | Class, ParameterizedType |
-| Class<SignStyle> | Class, ParameterizedType |
 | Class<SpeciesData> | Class, ParameterizedType |
-| Class<State> | Class, ParameterizedType |
-| Class<Status> | Class, ParameterizedType |
 | Class<String> | Class, ParameterizedType |
 | Class<T> | Class, ParameterizedType |
-| Class<Tag> | Class, ParameterizedType |
-| Class<TextStyle> | Class, ParameterizedType |
-| Class<TimeDefinition> | Class, ParameterizedType |
-| Class<TimeUnit> | Class, ParameterizedType |
-| Class<Type> | Class, ParameterizedType |
 | Class<U> | Class, ParameterizedType |
-| Class<UnicodeScript> | Class, ParameterizedType |
 | Class<V> | Class, ParameterizedType |
 | Class<Void> | Class, ParameterizedType |
-| Class<Wrapper> | Class, ParameterizedType |
 | ClassDataSlot | Class |
 | ClassDataSlot[] | Array |
 | ClassLoader | Class |
 | ClassNotFoundException | Class |
-| ClassReader | Class |
 | ClassSignature | Class |
 | ClassSpecializer | Class, GenericType, ParameterizedType |
 | ClassSpecializer<BoundMethodHandle,String,SpeciesData> | Class, ParameterizedType |
@@ -631,8 +556,6 @@
 | ClassValue<MethodHandle[]> | Class, ParameterizedType |
 | ClassValue<T> | Class, ParameterizedType |
 | ClassValueMap | Class |
-| ClassVisitor | Class |
-| ClassWriter | Class |
 | Class[] | Array |
 | ClassicFormat | Class |
 | Cleanable | Interface |
@@ -808,12 +731,8 @@
 | Comparable<ZoneOffset> | Interface, ParameterizedType |
 | Comparable<ZoneOffsetTransition> | Interface, ParameterizedType |
 | Comparator | GenericType, Interface, ParameterizedType |
-| Comparator<? super Double> | Interface, ParameterizedType |
 | Comparator<? super E> | Interface, ParameterizedType |
-| Comparator<? super Entry<K,V>> | Interface, ParameterizedType |
-| Comparator<? super Integer> | Interface, ParameterizedType |
 | Comparator<? super K> | Interface, ParameterizedType |
-| Comparator<? super Long> | Interface, ParameterizedType |
 | Comparator<? super T> | Interface, ParameterizedType |
 | Comparator<? super U> | Interface, ParameterizedType |
 | Comparator<? super V> | Interface, ParameterizedType |
@@ -859,19 +778,13 @@
 | ConstructorRepository | Class |
 | Constructor[] | Array |
 | Consumer | GenericType, Interface, ParameterizedType |
-| Consumer<? super Boolean> | Interface, ParameterizedType |
-| Consumer<? super Byte> | Interface, ParameterizedType |
-| Consumer<? super Character> | Interface, ParameterizedType |
 | Consumer<? super Double> | Interface, ParameterizedType |
 | Consumer<? super E> | Interface, ParameterizedType |
 | Consumer<? super Entry<K,V>> | Interface, ParameterizedType |
-| Consumer<? super Float> | Interface, ParameterizedType |
 | Consumer<? super Integer> | Interface, ParameterizedType |
 | Consumer<? super K> | Interface, ParameterizedType |
 | Consumer<? super Long> | Interface, ParameterizedType |
-| Consumer<? super Path> | Interface, ParameterizedType |
 | Consumer<? super Reference<? extends T>> | Interface, ParameterizedType |
-| Consumer<? super Short> | Interface, ParameterizedType |
 | Consumer<? super StackFrame> | Interface, ParameterizedType |
 | Consumer<? super T> | Interface, ParameterizedType |
 | Consumer<? super U> | Interface, ParameterizedType |
@@ -945,7 +858,6 @@
 | Duration | Class |
 | E | TypeVariable |
 | E[] | Array |
-| Edge | Class |
 | Empty | Class |
 | Entry | Class |
 | Entry | Class, GenericType, ParameterizedType |
@@ -1022,7 +934,6 @@
 | Enumeration<Object> | Interface, ParameterizedType |
 | Enumeration<Permission> | Interface, ParameterizedType |
 | Enumeration<String> | Interface, ParameterizedType |
-| Enumeration<T> | Interface, ParameterizedType |
 | Enumeration<URL> | Interface, ParameterizedType |
 | Enumeration<V> | Interface, ParameterizedType |
 | Era | Interface |
@@ -1048,8 +959,6 @@
 | FieldPosition | Class |
 | FieldTypeSignature | Interface |
 | FieldTypeSignature[] | Array |
-| FieldVisitor | Class |
-| FieldWriter | Class |
 | Field[] | Array |
 | File | Class |
 | FileAttribute | GenericType, Interface, ParameterizedType |
@@ -1117,7 +1026,6 @@
 | FormatStyle[] | Array |
 | ForwardingNode | Class, GenericType, ParameterizedType |
 | FractionPrinterParser | Class |
-| Frame | Class |
 | Function | GenericType, Interface, ParameterizedType |
 | Function1 | GenericType, Interface, ParameterizedType |
 | Function1<Integer,Boolean> | Interface, ParameterizedType |
@@ -1129,7 +1037,6 @@
 | Function1<Integer,Long> | Interface, ParameterizedType |
 | Function1<Integer,Short> | Interface, ParameterizedType |
 | Function1<Integer,T> | Interface, ParameterizedType |
-| Function<? super Identity,? extends Entry<?>> | Interface, ParameterizedType |
 | Function<? super K,? extends U> | Interface, ParameterizedType |
 | Function<? super K,? extends V> | Interface, ParameterizedType |
 | Function<? super Object,? extends Object> | Interface, ParameterizedType |
@@ -1143,7 +1050,6 @@
 | Function<? super T,? extends R> | Interface, ParameterizedType |
 | Function<? super T,? extends Stream<? extends R>> | Interface, ParameterizedType |
 | Function<? super T,? extends U> | Interface, ParameterizedType |
-| Function<? super T,? extends V> | Interface, ParameterizedType |
 | Function<? super V,? extends T> | Interface, ParameterizedType |
 | Function<? super V,? extends U> | Interface, ParameterizedType |
 | Function<A,R> | Interface, ParameterizedType |
@@ -1165,7 +1071,6 @@
 | Function<T,V> | Interface, ParameterizedType |
 | Function<T> | Interface, ParameterizedType |
 | Function<V,R> | Interface, ParameterizedType |
-| Function<V,T> | Interface, ParameterizedType |
 | Function<V,V> | Interface, ParameterizedType |
 | Future | GenericType, Interface, ParameterizedType |
 | Future<?> | Interface, ParameterizedType |
@@ -1190,7 +1095,6 @@
 | Global | Class |
 | GroupPrincipal | Interface |
 | Guard | Interface |
-| Handle | Class |
 | Hashtable | Class, GenericType, ParameterizedType |
 | Hashtable<?,?> | Class, ParameterizedType |
 | Hashtable<Object,Object> | Class, ParameterizedType |
@@ -1247,8 +1151,6 @@
 | IsoCountryCode[] | Array |
 | IsoEra | Class |
 | IsoEra[] | Array |
-| Item | Class |
-| Item[] | Array |
 | Iterable | GenericType, Interface, ParameterizedType |
 | Iterable<? extends Attribute> | Interface, ParameterizedType |
 | Iterable<? extends Callable<T>> | Interface, ParameterizedType |
@@ -1352,8 +1254,6 @@
 | Kind<?>[] | Array |
 | Kind<T> | Interface, ParameterizedType |
 | Kind[] | Array |
-| Label | Class |
-| Label[] | Array |
 | LambdaForm | Class |
 | LambdaFormEditor | Class |
 | LangReflectAccess | Interface |
@@ -1432,7 +1332,6 @@
 | LoopClauses | Class |
 | ManagedBlocker | Interface |
 | Map | GenericType, Interface, ParameterizedType |
-| Map<? extends Identity,Entry<?>> | Interface, ParameterizedType |
 | Map<? extends K,? extends V> | Interface, ParameterizedType |
 | Map<? extends K,V> | Interface, ParameterizedType |
 | Map<? extends WeakReference<Class<?>>,?> | Interface, ParameterizedType |
@@ -1516,8 +1415,6 @@
 | MethodTypeForm | Class |
 | MethodTypeSignature | Class |
 | MethodType[] | Array |
-| MethodVisitor | Class |
-| MethodWriter | Class |
 | Method[] | Array |
 | Modifier | Class |
 | Modifier | Interface |
@@ -1529,7 +1426,6 @@
 | ModuleLayer | Class |
 | ModuleReader | Interface |
 | ModuleReference | Class |
-| ModuleVisitor | Class |
 | Month | Class |
 | Month[] | Array |
 | MutableCollection | GenericType, Interface, ParameterizedType |
@@ -1545,8 +1441,6 @@
 | NamedFunction | Class |
 | NamedPackage | Class |
 | NativeLibrary | Class |
-| NestHost | Class |
-| NestMembers | Class |
 | NetworkInterface | Class |
 | NoSuchMemberException | TypeVariable |
 | Node | Class |
@@ -1645,7 +1539,6 @@
 | Predicate<? super E> | Interface, ParameterizedType |
 | Predicate<? super Entry<K,V>> | Interface, ParameterizedType |
 | Predicate<? super ForkJoinPool> | Interface, ParameterizedType |
-| Predicate<? super K> | Interface, ParameterizedType |
 | Predicate<? super T> | Interface, ParameterizedType |
 | Predicate<? super V> | Interface, ParameterizedType |
 | Predicate<T> | Interface, ParameterizedType |
@@ -1676,8 +1569,6 @@
 | Queue<NativeLibrary> | Interface, ParameterizedType |
 | R | TypeVariable |
 | Random | Class |
-| RandomAccess | Interface |
-| RandomAccessSpliterator | Class, GenericType, ParameterizedType |
 | RandomDoublesSpliterator | Class |
 | RandomIntsSpliterator | Class |
 | RandomLongsSpliterator | Class |
@@ -1819,21 +1710,18 @@
 | SpeciesData<BoundMethodHandle,String,SpeciesData> | Class, ParameterizedType |
 | SpeciesData<T,K,S> | Class, ParameterizedType |
 | Spliterator | GenericType, Interface, ParameterizedType |
-| Spliterator<Character> | Interface, ParameterizedType |
 | Spliterator<Double> | Interface, ParameterizedType |
 | Spliterator<E> | Interface, ParameterizedType |
 | Spliterator<Entry<K,V>> | Interface, ParameterizedType |
 | Spliterator<Integer> | Interface, ParameterizedType |
 | Spliterator<K> | Interface, ParameterizedType |
 | Spliterator<Long> | Interface, ParameterizedType |
-| Spliterator<Path> | Interface, ParameterizedType |
 | Spliterator<T> | Interface, ParameterizedType |
 | Spliterator<V> | Interface, ParameterizedType |
 | StackFrame | Interface |
 | StackFrameInfo | Class |
 | StackTraceElement | Class |
 | StackTraceElement[] | Array |
-| StackTraceElement[][] | Array |
 | StackWalker | Class |
 | State | Class |
 | State[] | Array |
@@ -1845,10 +1733,8 @@
 | Stream<Configuration> | Interface, ParameterizedType |
 | Stream<Double> | Interface, ParameterizedType |
 | Stream<E> | Interface, ParameterizedType |
-| Stream<Entry<K,V>> | Interface, ParameterizedType |
 | Stream<InetAddress> | Interface, ParameterizedType |
 | Stream<Integer> | Interface, ParameterizedType |
-| Stream<K> | Interface, ParameterizedType |
 | Stream<LocalDate> | Interface, ParameterizedType |
 | Stream<Long> | Interface, ParameterizedType |
 | Stream<ModuleLayer> | Interface, ParameterizedType |
@@ -1861,7 +1747,6 @@
 | Stream<T> | Interface, ParameterizedType |
 | Stream<U> | Interface, ParameterizedType |
 | Stream<URL> | Interface, ParameterizedType |
-| Stream<V> | Interface, ParameterizedType |
 | String | Class |
 | StringBuffer | Class |
 | StringBuilder | Class |
@@ -1960,7 +1845,6 @@
 | TypeArgument | Interface |
 | TypeArgument[] | Array |
 | TypeParam | Class |
-| TypePath | Class |
 | TypeSignature | Interface |
 | TypeSignature[] | Array |
 | TypeTree | Interface |
--- a/java/ql/test/kotlin/library-tests/variables/variables.expected
+++ b/java/ql/test/kotlin/library-tests/variables/variables.expected
@@ -1,12 +1,7 @@
-| variables.kt:2:1:8:1 | other | Object | file://:0:0:0:0 | <none> |
 | variables.kt:3:5:3:21 | prop | int | variables.kt:3:21:3:21 | 1 |
 | variables.kt:5:20:5:29 | param | int | file://:0:0:0:0 | <none> |
 | variables.kt:6:9:6:25 | int local | int | variables.kt:6:21:6:25 | ... + ... |
 | variables.kt:10:1:10:21 | topLevel | int | file://:0:0:0:0 | <none> |
-| variables.kt:12:1:15:1 | other | Object | file://:0:0:0:0 | <none> |
-| variables.kt:16:1:34:1 | other | Object | file://:0:0:0:0 | <none> |
 | variables.kt:16:11:16:18 | o | C1 | file://:0:0:0:0 | <none> |
 | variables.kt:16:11:16:18 | o | C1 | variables.kt:16:11:16:18 | o |
 | variables.kt:23:9:23:10 | <this> | C1 | file://:0:0:0:0 | <none> |
-| variables.kt:36:1:45:1 | other | Object | file://:0:0:0:0 | <none> |
-| variables.kt:38:11:44:5 | other | Object | file://:0:0:0:0 | <none> |