Skip to content

Commit 6a78163

Browse files
smowtonsmowton
committed
Accept Kotlin 2.1.20 test changes
These are mainly small changes in how source-locations are ascribed to synthetic expressions, plus three real changes: - The comment extractor is performing better presumably due to improvements in the underlying representation - *= /= and %= operations are once again extracted correctly; presumably their origin information has been fixed - Reference to a static final Java field can lead to more constant propagation than before The last one might be a minor nuisance to someone trying to find references to such a field.
1 parent e350741 commit 6a78163

File tree

25 files changed

+699
-713
lines changed

25 files changed

+699
-713
lines changed

‎java/ql/test-kotlin2/library-tests/annotation_classes/classes.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ annotations
3232
| def.kt:41:5:41:12 | Annot0k | def.kt:41:5:42:19 | Z | def.kt:5:1:21:60 | Annot0k |
3333
| def.kt:45:1:45:8 | Annot0k | def.kt:45:1:51:1 | fn | def.kt:5:1:21:60 | Annot0k |
3434
| def.kt:46:21:46:28 | Annot0k | def.kt:46:21:46:39 | a | def.kt:5:1:21:60 | Annot0k |
35-
| def.kt:54:1:54:12 | Annot0k | def.kt:53:1:57:23 | getP | def.kt:5:1:21:60 | Annot0k |
36-
| def.kt:55:1:55:12 | Annot0k | def.kt:53:1:57:23 | setP | def.kt:5:1:21:60 | Annot0k |
35+
| def.kt:54:1:54:12 | Annot0k | def.kt:53:1:57:19 | getP | def.kt:5:1:21:60 | Annot0k |
36+
| def.kt:55:1:55:12 | Annot0k | def.kt:53:1:57:19 | setP | def.kt:5:1:21:60 | Annot0k |
3737
| def.kt:56:1:56:14 | Annot0k | def.kt:53:1:57:23 | p | def.kt:5:1:21:60 | Annot0k |
3838
| def.kt:59:5:59:21 | Annot0k | def.kt:59:5:59:28 | <this> | def.kt:5:1:21:60 | Annot0k |
3939
| use.java:10:5:10:21 | Annot0j | use.java:14:18:14:18 | Z | Annot0j.java:1:19:1:25 | Annot0j |

‎java/ql/test-kotlin2/library-tests/annotations/jvmName/test.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
| Test.java:2:17:2:17 | m | m | m |
22
| test.kt:3:9:4:18 | getX_prop | getX_prop | getX |
33
| test.kt:6:5:6:19 | getX | getX | getX |
4-
| test.kt:8:5:10:19 | changeY | changeY | setY |
5-
| test.kt:8:5:10:19 | y | y | getY |
4+
| test.kt:8:5:10:14 | changeY | changeY | setY |
5+
| test.kt:8:5:10:14 | y | y | getY |
66
| test.kt:12:5:13:15 | method | method | fn |
77
| test.kt:17:5:17:14 | p | p | p |
88
| test.kt:18:5:18:32 | w | w | q |

‎java/ql/test-kotlin2/library-tests/arrays/arrayAccesses.expected

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
| 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 |
2-
| 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 |
3-
| 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 |
4-
| 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 |
5-
| 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 |
6-
| 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 |
7-
| 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 |
8-
| 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 |
9-
| 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 |
1+
| arrayGetsSets.kt:12:3:12:15 | ...[...] | arrayGetsSets.kt:12:3:12:15 | ...=... | int[] | arrayGetsSets.kt:12:3:12:4 | a1 | arrayGetsSets.kt:12:6:12:6 | 0 |
2+
| arrayGetsSets.kt:12:11:12:15 | ...[...] | arrayGetsSets.kt:12:3:12:15 | ...=... | int | arrayGetsSets.kt:12:11:12:12 | a1 | arrayGetsSets.kt:12:14:12:14 | 0 |
3+
| arrayGetsSets.kt:13:3:13:15 | ...[...] | arrayGetsSets.kt:13:3:13:15 | ...=... | short[] | arrayGetsSets.kt:13:3:13:4 | a2 | arrayGetsSets.kt:13:6:13:6 | 0 |
4+
| arrayGetsSets.kt:13:11:13:15 | ...[...] | arrayGetsSets.kt:13:3:13:15 | ...=... | short | arrayGetsSets.kt:13:11:13:12 | a2 | arrayGetsSets.kt:13:14:13:14 | 0 |
5+
| arrayGetsSets.kt:14:3:14:15 | ...[...] | arrayGetsSets.kt:14:3:14:15 | ...=... | byte[] | arrayGetsSets.kt:14:3:14:4 | a3 | arrayGetsSets.kt:14:6:14:6 | 0 |
6+
| arrayGetsSets.kt:14:11:14:15 | ...[...] | arrayGetsSets.kt:14:3:14:15 | ...=... | byte | arrayGetsSets.kt:14:11:14:12 | a3 | arrayGetsSets.kt:14:14:14:14 | 0 |
7+
| arrayGetsSets.kt:15:3:15:15 | ...[...] | arrayGetsSets.kt:15:3:15:15 | ...=... | long[] | arrayGetsSets.kt:15:3:15:4 | a4 | arrayGetsSets.kt:15:6:15:6 | 0 |
8+
| arrayGetsSets.kt:15:11:15:15 | ...[...] | arrayGetsSets.kt:15:3:15:15 | ...=... | long | arrayGetsSets.kt:15:11:15:12 | a4 | arrayGetsSets.kt:15:14:15:14 | 0 |
9+
| arrayGetsSets.kt:16:3:16:15 | ...[...] | arrayGetsSets.kt:16:3:16:15 | ...=... | float[] | arrayGetsSets.kt:16:3:16:4 | a5 | arrayGetsSets.kt:16:6:16:6 | 0 |
10+
| arrayGetsSets.kt:16:11:16:15 | ...[...] | arrayGetsSets.kt:16:3:16:15 | ...=... | float | arrayGetsSets.kt:16:11:16:12 | a5 | arrayGetsSets.kt:16:14:16:14 | 0 |
11+
| arrayGetsSets.kt:17:3:17:15 | ...[...] | arrayGetsSets.kt:17:3:17:15 | ...=... | double[] | arrayGetsSets.kt:17:3:17:4 | a6 | arrayGetsSets.kt:17:6:17:6 | 0 |
12+
| arrayGetsSets.kt:17:11:17:15 | ...[...] | arrayGetsSets.kt:17:3:17:15 | ...=... | double | arrayGetsSets.kt:17:11:17:12 | a6 | arrayGetsSets.kt:17:14:17:14 | 0 |
13+
| arrayGetsSets.kt:18:3:18:15 | ...[...] | arrayGetsSets.kt:18:3:18:15 | ...=... | boolean[] | arrayGetsSets.kt:18:3:18:4 | a7 | arrayGetsSets.kt:18:6:18:6 | 0 |
14+
| arrayGetsSets.kt:18:11:18:15 | ...[...] | arrayGetsSets.kt:18:3:18:15 | ...=... | boolean | arrayGetsSets.kt:18:11:18:12 | a7 | arrayGetsSets.kt:18:14:18:14 | 0 |
15+
| arrayGetsSets.kt:19:3:19:15 | ...[...] | arrayGetsSets.kt:19:3:19:15 | ...=... | char[] | arrayGetsSets.kt:19:3:19:4 | a8 | arrayGetsSets.kt:19:6:19:6 | 0 |
16+
| arrayGetsSets.kt:19:11:19:15 | ...[...] | arrayGetsSets.kt:19:3:19:15 | ...=... | char | arrayGetsSets.kt:19:11:19:12 | a8 | arrayGetsSets.kt:19:14:19:14 | 0 |
17+
| arrayGetsSets.kt:20:3:20:15 | ...[...] | arrayGetsSets.kt:20:3:20:15 | ...=... | Object[] | arrayGetsSets.kt:20:3:20:4 | a9 | arrayGetsSets.kt:20:6:20:6 | 0 |
18+
| arrayGetsSets.kt:20:11:20:15 | ...[...] | arrayGetsSets.kt:20:3:20:15 | ...=... | Object | arrayGetsSets.kt:20:11:20:12 | a9 | arrayGetsSets.kt:20:14:20:14 | 0 |
1019
| 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 |
1120
| 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 |
1221
| 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 |

‎java/ql/test-kotlin2/library-tests/classes/PrintAst.expected

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -882,20 +882,16 @@ localClassField.kt:
882882
# 2| 0: [WhenExpr] when ...
883883
# 2| 0: [WhenBranch] ... -> ...
884884
# 2| 0: [BooleanLiteral] true
885-
# 2| 1: [ExprStmt] <Expr>;
886-
# 2| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
887-
# 2| 0: [TypeAccess] Unit
888-
# 2| 1: [StmtExpr] <Stmt>
889-
# 2| 0: [BlockStmt] { ... }
890-
# 3| 0: [LocalTypeDeclStmt] class ...
891-
# 3| 0: [LocalClass] L
892-
# 3| 1: [Constructor] L
893-
# 3| 5: [BlockStmt] { ... }
894-
# 3| 0: [SuperConstructorInvocationStmt] super(...)
895-
# 3| 1: [BlockStmt] { ... }
896-
# 4| 1: [ExprStmt] <Expr>;
897-
# 4| 0: [ClassInstanceExpr] new L(...)
898-
# 4| -3: [TypeAccess] L
885+
# 2| 1: [BlockStmt] { ... }
886+
# 3| 0: [LocalTypeDeclStmt] class ...
887+
# 3| 0: [LocalClass] L
888+
# 3| 1: [Constructor] L
889+
# 3| 5: [BlockStmt] { ... }
890+
# 3| 0: [SuperConstructorInvocationStmt] super(...)
891+
# 3| 1: [BlockStmt] { ... }
892+
# 4| 1: [ExprStmt] <Expr>;
893+
# 4| 0: [ClassInstanceExpr] new L(...)
894+
# 4| -3: [TypeAccess] L
899895
# 5| 1: [WhenBranch] ... -> ...
900896
# 5| 0: [BooleanLiteral] true
901897
# 5| 1: [BlockStmt] { ... }
@@ -910,20 +906,16 @@ localClassField.kt:
910906
# 7| 0: [WhenExpr] when ...
911907
# 7| 0: [WhenBranch] ... -> ...
912908
# 7| 0: [BooleanLiteral] true
913-
# 7| 1: [ExprStmt] <Expr>;
914-
# 7| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
915-
# 7| 0: [TypeAccess] Unit
916-
# 7| 1: [StmtExpr] <Stmt>
917-
# 7| 0: [BlockStmt] { ... }
918-
# 8| 0: [LocalTypeDeclStmt] class ...
919-
# 8| 0: [LocalClass] L
920-
# 8| 1: [Constructor] L
921-
# 8| 5: [BlockStmt] { ... }
922-
# 8| 0: [SuperConstructorInvocationStmt] super(...)
923-
# 8| 1: [BlockStmt] { ... }
924-
# 9| 1: [ExprStmt] <Expr>;
925-
# 9| 0: [ClassInstanceExpr] new L(...)
926-
# 9| -3: [TypeAccess] L
909+
# 7| 1: [BlockStmt] { ... }
910+
# 8| 0: [LocalTypeDeclStmt] class ...
911+
# 8| 0: [LocalClass] L
912+
# 8| 1: [Constructor] L
913+
# 8| 5: [BlockStmt] { ... }
914+
# 8| 0: [SuperConstructorInvocationStmt] super(...)
915+
# 8| 1: [BlockStmt] { ... }
916+
# 9| 1: [ExprStmt] <Expr>;
917+
# 9| 0: [ClassInstanceExpr] new L(...)
918+
# 9| -3: [TypeAccess] L
927919
# 10| 1: [WhenBranch] ... -> ...
928920
# 10| 0: [BooleanLiteral] true
929921
# 10| 1: [BlockStmt] { ... }

‎java/ql/test-kotlin2/library-tests/classes/genericExprTypes.expected

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
| generic_anonymous.kt:1:26:1:33 | t | T |
77
| generic_anonymous.kt:1:26:1:33 | this | Generic |
88
| generic_anonymous.kt:1:26:1:33 | this.t | T |
9+
| generic_anonymous.kt:3:3:3:15 | T | T |
10+
| generic_anonymous.kt:3:3:3:15 | new Object(...) { ... } | new Object(...) { ... } |
11+
| generic_anonymous.kt:3:3:3:15 | this | Generic |
12+
| generic_anonymous.kt:3:3:3:15 | this.x | new Object(...) { ... } |
913
| generic_anonymous.kt:3:3:5:3 | ...=... | new Object(...) { ... } |
1014
| generic_anonymous.kt:3:3:5:3 | T | T |
11-
| generic_anonymous.kt:3:3:5:3 | T | T |
12-
| generic_anonymous.kt:3:3:5:3 | new Object(...) { ... } | new Object(...) { ... } |
1315
| generic_anonymous.kt:3:3:5:3 | new Object(...) { ... } | new Object(...) { ... } |
14-
| generic_anonymous.kt:3:3:5:3 | this | Generic |
15-
| generic_anonymous.kt:3:3:5:3 | this.x | new Object(...) { ... } |
1616
| generic_anonymous.kt:3:3:5:3 | x | new Object(...) { ... } |
1717
| generic_anonymous.kt:3:19:5:3 | <Stmt> | new Object(...) { ... } |
1818
| generic_anonymous.kt:3:19:5:3 | Object | Object |
1919
| generic_anonymous.kt:3:19:5:3 | new (...) | new Object(...) { ... } |
20+
| generic_anonymous.kt:4:7:4:16 | T | T |
21+
| generic_anonymous.kt:4:7:4:16 | this | new Object(...) { ... } |
22+
| generic_anonymous.kt:4:7:4:16 | this.member | T |
2023
| generic_anonymous.kt:4:7:4:20 | ...=... | T |
2124
| generic_anonymous.kt:4:7:4:20 | T | T |
22-
| generic_anonymous.kt:4:7:4:20 | T | T |
2325
| generic_anonymous.kt:4:7:4:20 | member | T |
24-
| generic_anonymous.kt:4:7:4:20 | this | new Object(...) { ... } |
25-
| generic_anonymous.kt:4:7:4:20 | this.member | T |
2626
| generic_anonymous.kt:4:20:4:20 | Generic | Generic |
2727
| generic_anonymous.kt:4:20:4:20 | Generic.this | Generic |
2828
| generic_anonymous.kt:4:20:4:20 | getT(...) | T |

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,22 @@ comments
1818
commentOwners
1919
| comments.kt:1:1:1:36 | /** Kdoc owned by CompilationUnit */ | comments.kt:0:0:0:0 | comments |
2020
| 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 |
21-
| comments.kt:14:5:16:7 | /**\n * Members of this group.\n */ | comments.kt:17:5:17:46 | getMembers$private |
21+
| comments.kt:14:5:16:7 | /**\n * Members of this group.\n */ | comments.kt:17:5:17:23 | getMembers$private |
2222
| comments.kt:14:5:16:7 | /**\n * Members of this group.\n */ | comments.kt:17:5:17:46 | members |
2323
| comments.kt:14:5:16:7 | /**\n * Members of this group.\n */ | comments.kt:17:5:17:46 | members |
2424
| comments.kt:19:5:22:7 | /**\n * Adds a [member] to this group.\n * @return the new size of the group.\n */ | comments.kt:23:5:26:5 | add |
25+
| comments.kt:48:1:50:3 | /**\n * A type alias comment\n */ | comments.kt:51:1:51:24 | MyType |
2526
| comments.kt:61:5:63:7 | /**\n * A prop comment\n */ | comments.kt:64:5:68:17 | prop |
2627
| comments.kt:65:9:67:11 | /**\n * An accessor comment\n */ | comments.kt:68:9:68:17 | getProp |
2728
| comments.kt:79:9:81:11 | /**\n * A local function comment\n */ | comments.kt:82:9:82:24 | localFn |
29+
| comments.kt:88:10:90:11 | /**\n * An anonymous object comment\n */ | comments.kt:87:15:92:5 | |
2830
| comments.kt:88:10:90:11 | /**\n * An anonymous object comment\n */ | comments.kt:87:15:92:5 | new X(...) { ... } |
2931
commentNoOwners
3032
| comments.kt:24:9:24:25 | // A line comment |
3133
| comments.kt:28:5:30:6 | /*\n A block comment\n */ |
3234
| comments.kt:35:5:35:34 | /** Medium is in the middle */ |
3335
| comments.kt:37:5:37:23 | /** This is high */ |
3436
| comments.kt:42:5:44:7 | /**\n * A variable.\n */ |
35-
| comments.kt:48:1:50:3 | /**\n * A type alias comment\n */ |
3637
| comments.kt:54:5:56:7 | /**\n * An init block comment\n */ |
3738
| comments.kt:71:9:73:11 | /**\n * An anonymous function comment\n */ |
3839
commentSections

0 commit comments

Comments
 (0)