Skip to content

Commit 86e5e4c

Browse files
smowtonsmowton
committed
Accept test changes
1 parent 020f29a commit 86e5e4c

File tree

8 files changed

+138
-20
lines changed

8 files changed

+138
-20
lines changed

‎java/ql/integration-tests/posix-only/kotlin/gradle_kotlinx_serialization/PrintAst.expected

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,48 @@ app/src/main/kotlin/testProject/App.kt:
6565
# 0| -3: [TypeAccess] Project
6666
# 0| 0: [VarAccess] name
6767
# 0| 1: [VarAccess] language
68-
# 0| 5: [Method] equals
68+
# 0| 5: [Method] copy$default
69+
# 0| 3: [TypeAccess] Project
70+
#-----| 4: (Parameters)
71+
# 0| 0: [Parameter] p0
72+
# 0| 0: [TypeAccess] Project
73+
# 0| 1: [Parameter] p1
74+
# 0| 0: [TypeAccess] String
75+
# 0| 2: [Parameter] p2
76+
# 0| 0: [TypeAccess] int
77+
# 0| 3: [Parameter] p3
78+
# 0| 0: [TypeAccess] int
79+
# 0| 4: [Parameter] p4
80+
# 0| 0: [TypeAccess] Object
81+
# 0| 5: [BlockStmt] { ... }
82+
# 0| 0: [IfStmt] if (...)
83+
# 0| 0: [EQExpr] ... == ...
84+
# 0| 0: [AndBitwiseExpr] ... & ...
85+
# 0| 0: [IntegerLiteral] 1
86+
# 0| 1: [VarAccess] p3
87+
# 0| 1: [IntegerLiteral] 0
88+
# 0| 1: [ExprStmt] <Expr>;
89+
# 0| 0: [AssignExpr] ...=...
90+
# 0| 0: [VarAccess] p1
91+
# 0| 1: [VarAccess] p0.name
92+
# 0| -1: [VarAccess] p0
93+
# 0| 1: [IfStmt] if (...)
94+
# 0| 0: [EQExpr] ... == ...
95+
# 0| 0: [AndBitwiseExpr] ... & ...
96+
# 0| 0: [IntegerLiteral] 2
97+
# 0| 1: [VarAccess] p3
98+
# 0| 1: [IntegerLiteral] 0
99+
# 0| 1: [ExprStmt] <Expr>;
100+
# 0| 0: [AssignExpr] ...=...
101+
# 0| 0: [VarAccess] p2
102+
# 0| 1: [VarAccess] p0.language
103+
# 0| -1: [VarAccess] p0
104+
# 0| 2: [ReturnStmt] return ...
105+
# 0| 0: [MethodAccess] copy(...)
106+
# 0| -1: [VarAccess] p0
107+
# 0| 0: [VarAccess] p1
108+
# 0| 1: [VarAccess] p2
109+
# 0| 6: [Method] equals
69110
# 0| 3: [TypeAccess] boolean
70111
#-----| 4: (Parameters)
71112
# 0| 0: [Parameter] other
@@ -114,7 +155,7 @@ app/src/main/kotlin/testProject/App.kt:
114155
# 0| 0: [BooleanLiteral] false
115156
# 0| 5: [ReturnStmt] return ...
116157
# 0| 0: [BooleanLiteral] true
117-
# 0| 6: [Method] hashCode
158+
# 0| 7: [Method] hashCode
118159
# 0| 3: [TypeAccess] int
119160
# 0| 5: [BlockStmt] { ... }
120161
# 0| 0: [LocalVariableDeclStmt] var ...;
@@ -134,7 +175,7 @@ app/src/main/kotlin/testProject/App.kt:
134175
# 0| -1: [ThisAccess] this
135176
# 0| 2: [ReturnStmt] return ...
136177
# 0| 0: [VarAccess] result
137-
# 0| 7: [Method] toString
178+
# 0| 8: [Method] toString
138179
# 0| 3: [TypeAccess] String
139180
# 0| 5: [BlockStmt] { ... }
140181
# 0| 0: [ReturnStmt] return ...
@@ -148,7 +189,7 @@ app/src/main/kotlin/testProject/App.kt:
148189
# 0| 5: [VarAccess] this.language
149190
# 0| -1: [ThisAccess] this
150191
# 0| 6: [StringLiteral] )
151-
# 0| 8: [Method] write$Self
192+
# 0| 9: [Method] write$Self
152193
# 0| 3: [TypeAccess] Unit
153194
#-----| 4: (Parameters)
154195
# 0| 0: [Parameter] self
@@ -172,7 +213,7 @@ app/src/main/kotlin/testProject/App.kt:
172213
# 7| 1: [IntegerLiteral] 1
173214
# 7| 2: [MethodAccess] getLanguage(...)
174215
# 7| -1: [VarAccess] self
175-
# 7| 9: [Class] $serializer
216+
# 7| 10: [Class] $serializer
176217
# 0| 1: [FieldDeclaration] SerialDescriptor descriptor;
177218
# 0| -1: [TypeAccess] SerialDescriptor
178219
# 0| 2: [Method] childSerializers
@@ -384,7 +425,7 @@ app/src/main/kotlin/testProject/App.kt:
384425
# 7| -1: [ThisAccess] $serializer.this
385426
# 7| 0: [TypeAccess] $serializer
386427
# 7| 1: [VarAccess] tmp0_serialDesc
387-
# 7| 10: [Class] Companion
428+
# 7| 11: [Class] Companion
388429
# 0| 1: [Method] serializer
389430
# 0| 3: [TypeAccess] KSerializer<Project>
390431
# 0| 0: [TypeAccess] Project
@@ -395,7 +436,7 @@ app/src/main/kotlin/testProject/App.kt:
395436
# 7| 5: [BlockStmt] { ... }
396437
# 7| 0: [SuperConstructorInvocationStmt] super(...)
397438
# 7| 1: [BlockStmt] { ... }
398-
# 8| 11: [Constructor] Project
439+
# 8| 12: [Constructor] Project
399440
#-----| 4: (Parameters)
400441
# 8| 0: [Parameter] name
401442
# 8| 0: [TypeAccess] String
@@ -410,21 +451,21 @@ app/src/main/kotlin/testProject/App.kt:
410451
# 8| 1: [ExprStmt] <Expr>;
411452
# 8| 0: [KtInitializerAssignExpr] ...=...
412453
# 8| 0: [VarAccess] language
413-
# 8| 12: [FieldDeclaration] String name;
454+
# 8| 13: [FieldDeclaration] String name;
414455
# 8| -1: [TypeAccess] String
415456
# 8| 0: [VarAccess] name
416-
# 8| 13: [Method] getName
457+
# 8| 14: [Method] getName
417458
# 8| 3: [TypeAccess] String
418459
# 8| 5: [BlockStmt] { ... }
419460
# 8| 0: [ReturnStmt] return ...
420461
# 8| 0: [VarAccess] this.name
421462
# 8| -1: [ThisAccess] this
422-
# 8| 14: [Method] getLanguage
463+
# 8| 15: [Method] getLanguage
423464
# 8| 3: [TypeAccess] int
424465
# 8| 5: [BlockStmt] { ... }
425466
# 8| 0: [ReturnStmt] return ...
426467
# 8| 0: [VarAccess] this.language
427468
# 8| -1: [ThisAccess] this
428-
# 8| 15: [FieldDeclaration] int language;
469+
# 8| 16: [FieldDeclaration] int language;
429470
# 8| -1: [TypeAccess] int
430471
# 8| 0: [VarAccess] language

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

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,48 @@ dc.kt:
2828
# 0| -3: [TypeAccess] ProtoMapValue
2929
# 0| 0: [VarAccess] bytes
3030
# 0| 1: [VarAccess] strs
31-
# 0| 4: [Method] equals
31+
# 0| 4: [Method] copy$default
32+
# 0| 3: [TypeAccess] ProtoMapValue
33+
#-----| 4: (Parameters)
34+
# 0| 0: [Parameter] p0
35+
# 0| 0: [TypeAccess] ProtoMapValue
36+
# 0| 1: [Parameter] p1
37+
# 0| 0: [TypeAccess] byte[]
38+
# 0| 2: [Parameter] p2
39+
# 0| 0: [TypeAccess] String[]
40+
# 0| 3: [Parameter] p3
41+
# 0| 0: [TypeAccess] int
42+
# 0| 4: [Parameter] p4
43+
# 0| 0: [TypeAccess] Object
44+
# 0| 5: [BlockStmt] { ... }
45+
# 0| 0: [IfStmt] if (...)
46+
# 0| 0: [EQExpr] ... == ...
47+
# 0| 0: [AndBitwiseExpr] ... & ...
48+
# 0| 0: [IntegerLiteral] 1
49+
# 0| 1: [VarAccess] p3
50+
# 0| 1: [IntegerLiteral] 0
51+
# 0| 1: [ExprStmt] <Expr>;
52+
# 0| 0: [AssignExpr] ...=...
53+
# 0| 0: [VarAccess] p1
54+
# 0| 1: [VarAccess] p0.bytes
55+
# 0| -1: [VarAccess] p0
56+
# 0| 1: [IfStmt] if (...)
57+
# 0| 0: [EQExpr] ... == ...
58+
# 0| 0: [AndBitwiseExpr] ... & ...
59+
# 0| 0: [IntegerLiteral] 2
60+
# 0| 1: [VarAccess] p3
61+
# 0| 1: [IntegerLiteral] 0
62+
# 0| 1: [ExprStmt] <Expr>;
63+
# 0| 0: [AssignExpr] ...=...
64+
# 0| 0: [VarAccess] p2
65+
# 0| 1: [VarAccess] p0.strs
66+
# 0| -1: [VarAccess] p0
67+
# 0| 2: [ReturnStmt] return ...
68+
# 0| 0: [MethodAccess] copy(...)
69+
# 0| -1: [VarAccess] p0
70+
# 0| 0: [VarAccess] p1
71+
# 0| 1: [VarAccess] p2
72+
# 0| 5: [Method] equals
3273
# 0| 3: [TypeAccess] boolean
3374
#-----| 4: (Parameters)
3475
# 0| 0: [Parameter] other
@@ -77,7 +118,7 @@ dc.kt:
77118
# 0| 0: [BooleanLiteral] false
78119
# 0| 5: [ReturnStmt] return ...
79120
# 0| 0: [BooleanLiteral] true
80-
# 0| 5: [Method] hashCode
121+
# 0| 6: [Method] hashCode
81122
# 0| 3: [TypeAccess] int
82123
# 0| 5: [BlockStmt] { ... }
83124
# 0| 0: [LocalVariableDeclStmt] var ...;
@@ -99,7 +140,7 @@ dc.kt:
99140
# 0| -1: [ThisAccess] this
100141
# 0| 2: [ReturnStmt] return ...
101142
# 0| 0: [VarAccess] result
102-
# 0| 6: [Method] toString
143+
# 0| 7: [Method] toString
103144
# 0| 3: [TypeAccess] String
104145
# 0| 5: [BlockStmt] { ... }
105146
# 0| 0: [ReturnStmt] return ...
@@ -117,7 +158,7 @@ dc.kt:
117158
# 0| 0: [VarAccess] this.strs
118159
# 0| -1: [ThisAccess] this
119160
# 0| 6: [StringLiteral] )
120-
# 1| 7: [Constructor] ProtoMapValue
161+
# 1| 8: [Constructor] ProtoMapValue
121162
#-----| 4: (Parameters)
122163
# 1| 0: [Parameter] bytes
123164
# 1| 0: [TypeAccess] byte[]
@@ -133,20 +174,20 @@ dc.kt:
133174
# 1| 1: [ExprStmt] <Expr>;
134175
# 1| 0: [KtInitializerAssignExpr] ...=...
135176
# 1| 0: [VarAccess] strs
136-
# 1| 8: [FieldDeclaration] byte[] bytes;
177+
# 1| 9: [FieldDeclaration] byte[] bytes;
137178
# 1| -1: [TypeAccess] byte[]
138179
# 1| 0: [VarAccess] bytes
139-
# 1| 9: [Method] getBytes
180+
# 1| 10: [Method] getBytes
140181
# 1| 3: [TypeAccess] byte[]
141182
# 1| 5: [BlockStmt] { ... }
142183
# 1| 0: [ReturnStmt] return ...
143184
# 1| 0: [VarAccess] this.bytes
144185
# 1| -1: [ThisAccess] this
145-
# 1| 10: [FieldDeclaration] String[] strs;
186+
# 1| 11: [FieldDeclaration] String[] strs;
146187
# 1| -1: [TypeAccess] String[]
147188
# 1| 0: [TypeAccess] String
148189
# 1| 0: [VarAccess] strs
149-
# 1| 11: [Method] getStrs
190+
# 1| 12: [Method] getStrs
150191
# 1| 3: [TypeAccess] String[]
151192
# 1| 0: [TypeAccess] String
152193
# 1| 5: [BlockStmt] { ... }

‎java/ql/test/kotlin/library-tests/data-classes/callees.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
| dc.kt:0:0:0:0 | copy(...) | ProtoMapValue.copy |
12
| dc.kt:0:0:0:0 | hashCode(...) | java.util.Arrays.hashCode |
23
| dc.kt:0:0:0:0 | hashCode(...) | java.util.Arrays.hashCode |
34
| dc.kt:0:0:0:0 | new ProtoMapValue(...) | ProtoMapValue.ProtoMapValue |

‎java/ql/test/kotlin/library-tests/methods/exprs.expected

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,66 @@
1212
| clinit.kt:3:1:3:24 | int | TypeAccess |
1313
| clinit.kt:3:1:3:24 | int | TypeAccess |
1414
| clinit.kt:3:24:3:24 | 0 | IntegerLiteral |
15+
| dataClass.kt:0:0:0:0 | 0 | IntegerLiteral |
16+
| dataClass.kt:0:0:0:0 | 0 | IntegerLiteral |
17+
| dataClass.kt:0:0:0:0 | 1 | IntegerLiteral |
18+
| dataClass.kt:0:0:0:0 | 2 | IntegerLiteral |
1519
| dataClass.kt:0:0:0:0 | 31 | IntegerLiteral |
1620
| dataClass.kt:0:0:0:0 | "..." | StringTemplateExpr |
1721
| dataClass.kt:0:0:0:0 | (...)... | CastExpr |
1822
| dataClass.kt:0:0:0:0 | ) | StringLiteral |
1923
| dataClass.kt:0:0:0:0 | , | StringLiteral |
2024
| dataClass.kt:0:0:0:0 | ... !is ... | NotInstanceOfExpr |
25+
| dataClass.kt:0:0:0:0 | ... & ... | AndBitwiseExpr |
26+
| dataClass.kt:0:0:0:0 | ... & ... | AndBitwiseExpr |
2127
| dataClass.kt:0:0:0:0 | ... (value not-equals) ... | ValueNEExpr |
2228
| dataClass.kt:0:0:0:0 | ... (value not-equals) ... | ValueNEExpr |
2329
| dataClass.kt:0:0:0:0 | ... * ... | MulExpr |
2430
| dataClass.kt:0:0:0:0 | ... + ... | AddExpr |
2531
| dataClass.kt:0:0:0:0 | ... == ... | EQExpr |
32+
| dataClass.kt:0:0:0:0 | ... == ... | EQExpr |
33+
| dataClass.kt:0:0:0:0 | ... == ... | EQExpr |
34+
| dataClass.kt:0:0:0:0 | ...=... | AssignExpr |
2635
| dataClass.kt:0:0:0:0 | ...=... | AssignExpr |
36+
| dataClass.kt:0:0:0:0 | ...=... | AssignExpr |
37+
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
38+
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
2739
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
2840
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
2941
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
3042
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
3143
| dataClass.kt:0:0:0:0 | DataClass( | StringLiteral |
3244
| dataClass.kt:0:0:0:0 | Object | TypeAccess |
45+
| dataClass.kt:0:0:0:0 | Object | TypeAccess |
46+
| dataClass.kt:0:0:0:0 | String | TypeAccess |
3347
| dataClass.kt:0:0:0:0 | String | TypeAccess |
3448
| dataClass.kt:0:0:0:0 | String | TypeAccess |
3549
| dataClass.kt:0:0:0:0 | boolean | TypeAccess |
50+
| dataClass.kt:0:0:0:0 | copy(...) | MethodAccess |
3651
| dataClass.kt:0:0:0:0 | false | BooleanLiteral |
3752
| dataClass.kt:0:0:0:0 | false | BooleanLiteral |
3853
| dataClass.kt:0:0:0:0 | false | BooleanLiteral |
3954
| dataClass.kt:0:0:0:0 | hashCode(...) | MethodAccess |
4055
| dataClass.kt:0:0:0:0 | hashCode(...) | MethodAccess |
4156
| dataClass.kt:0:0:0:0 | int | TypeAccess |
4257
| dataClass.kt:0:0:0:0 | int | TypeAccess |
58+
| dataClass.kt:0:0:0:0 | int | TypeAccess |
59+
| dataClass.kt:0:0:0:0 | int | TypeAccess |
4360
| dataClass.kt:0:0:0:0 | new DataClass(...) | ClassInstanceExpr |
4461
| dataClass.kt:0:0:0:0 | other | VarAccess |
4562
| dataClass.kt:0:0:0:0 | other | VarAccess |
4663
| dataClass.kt:0:0:0:0 | other | VarAccess |
64+
| dataClass.kt:0:0:0:0 | p0 | VarAccess |
65+
| dataClass.kt:0:0:0:0 | p0 | VarAccess |
66+
| dataClass.kt:0:0:0:0 | p0 | VarAccess |
67+
| dataClass.kt:0:0:0:0 | p0.x | VarAccess |
68+
| dataClass.kt:0:0:0:0 | p0.y | VarAccess |
69+
| dataClass.kt:0:0:0:0 | p1 | VarAccess |
70+
| dataClass.kt:0:0:0:0 | p1 | VarAccess |
71+
| dataClass.kt:0:0:0:0 | p2 | VarAccess |
72+
| dataClass.kt:0:0:0:0 | p2 | VarAccess |
73+
| dataClass.kt:0:0:0:0 | p3 | VarAccess |
74+
| dataClass.kt:0:0:0:0 | p3 | VarAccess |
4775
| dataClass.kt:0:0:0:0 | result | LocalVariableDeclExpr |
4876
| dataClass.kt:0:0:0:0 | result | VarAccess |
4977
| dataClass.kt:0:0:0:0 | result | VarAccess |

‎java/ql/test/kotlin/library-tests/methods/methods.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ methods
55
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | component1 | component1() | public | Compiler generated |
66
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | component2 | component2() | public | Compiler generated |
77
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | copy | copy(int,java.lang.String) | public | Compiler generated |
8+
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | copy$default | copy$default(DataClass,int,java.lang.String,int,java.lang.Object) | public, static | Compiler generated |
89
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | equals | equals(java.lang.Object) | override, public | Compiler generated |
910
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | hashCode | hashCode() | override, public | Compiler generated |
1011
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | toString | toString() | override, public | Compiler generated |

‎java/ql/test/kotlin/library-tests/methods/parameters.expected

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
| clinit.kt:3:1:3:24 | setTopLevelInt | clinit.kt:3:1:3:24 | <set-?> | 0 |
22
| dataClass.kt:0:0:0:0 | copy | dataClass.kt:1:22:1:31 | x | 0 |
33
| dataClass.kt:0:0:0:0 | copy | dataClass.kt:1:34:1:46 | y | 1 |
4+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p0 | 0 |
5+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p1 | 1 |
6+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p2 | 2 |
7+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p3 | 3 |
8+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p4 | 4 |
49
| dataClass.kt:0:0:0:0 | equals | dataClass.kt:0:0:0:0 | other | 0 |
510
| dataClass.kt:1:34:1:46 | setY | dataClass.kt:1:34:1:46 | <set-?> | 0 |
611
| delegates.kt:4:18:6:5 | get | delegates.kt:4:18:6:5 | a0 | 0 |

‎java/ql/test/kotlin/library-tests/multiple_extensions/calls.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
| PropertyReferenceDelegatesKt | getValue(KProperty0<? extends V>, Object, KProperty<?>) |
22
| PropertyReferenceDelegatesKt | getValue(KProperty1<T,? extends V>, T, KProperty<?>) |
33
| StringsKt | removePrefix(String, CharSequence) |
4-
| StringsKt | startsWith(String, String, boolean) |
4+
| StringsKt | startsWith$default(String, String, boolean, int, Object) |

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ compGenerated
233233
| file://<external>/Class2.class:0:0:0:0 | getValue | 3 |
234234
| file://<external>/Class2.class:0:0:0:0 | getValue | 3 |
235235
| file://<external>/KTypeProjection.class:0:0:0:0 | contravariant | 8 |
236+
| file://<external>/KTypeProjection.class:0:0:0:0 | copy$default | 10 |
236237
| file://<external>/KTypeProjection.class:0:0:0:0 | covariant | 8 |
237238
| file://<external>/KTypeProjection.class:0:0:0:0 | invariant | 8 |
238239
| reflection.kt:33:9:33:23 | getP0 | 3 |

0 commit comments

Comments
 (0)