hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Accept test changes

Browse Source 
Accept test changes from Kotlin 2.3.0 update

Updates expected test outputs for kotlin2 library tests to match
actual compiler output. Changes include:
- Location adjustments for properties/methods (now point to identifiers)
- CastExpr -> ImplicitCastExpr for implicit type casts
- Removed duplicate BlockStmt entries in loop ASTs
- Super constructor call location changes

Note that in Kotlin 2.3.0 super constructor calls now have locations spanning
entire class declarations instead of the actual super call site.
This commit is contained in:
Anders Fugmann
2026-01-15 11:37:35 -08:00
parent 86d9c349ec
commit 31867a56fb
40 changed files with 902 additions and 941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
java/ql/test-kotlin2/library-tests/methods/exprs.expected
View File

@@ -23,7 +23,6 @@
| dataClass.kt:0:0:0:0 | "DataClass(" | StringLiteral |
| dataClass.kt:0:0:0:0 | "x=" | StringLiteral |
| dataClass.kt:0:0:0:0 | "y=" | StringLiteral |
| dataClass.kt:0:0:0:0 | (...)... | CastExpr |
| dataClass.kt:0:0:0:0 | ... !is ... | NotInstanceOfExpr |
| dataClass.kt:0:0:0:0 | ... & ... | AndBitwiseExpr |
| dataClass.kt:0:0:0:0 | ... & ... | AndBitwiseExpr |
@@ -37,6 +36,7 @@
| dataClass.kt:0:0:0:0 | ...=... | AssignExpr |
| dataClass.kt:0:0:0:0 | ...=... | AssignExpr |
| dataClass.kt:0:0:0:0 | ...=... | AssignExpr |
| dataClass.kt:0:0:0:0 | <implicit cast> | ImplicitCastExpr |
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
| dataClass.kt:0:0:0:0 | DataClass | TypeAccess |
@@ -233,12 +233,12 @@
| enumClass.kt:0:0:0:0 | EnumWithFunctions | TypeAccess |
| enumClass.kt:0:0:0:0 | EnumWithFunctions | TypeAccess |
| enumClass.kt:0:0:0:0 | EnumWithFunctions[] | TypeAccess |
| enumClass.kt:1:1:4:1 | 0 | IntegerLiteral |
| enumClass.kt:1:1:4:1 | Enum<EnumClass> | TypeAccess |
| enumClass.kt:1:1:4:1 | EnumClass | TypeAccess |
| enumClass.kt:1:1:4:1 | String | TypeAccess |
| enumClass.kt:1:21:1:32 | 0 | IntegerLiteral |
| enumClass.kt:1:21:1:32 | Enum<EnumClass> | TypeAccess |
| enumClass.kt:1:21:1:32 | EnumClass | TypeAccess |
| enumClass.kt:1:21:1:32 | new Enum<EnumClass>(...) | ClassInstanceExpr |
| enumClass.kt:1:21:1:32 | null | NullLiteral |
| enumClass.kt:1:1:4:1 | new Enum<EnumClass>(...) | ClassInstanceExpr |
| enumClass.kt:1:1:4:1 | null | NullLiteral |
| enumClass.kt:1:22:1:31 | ...=... | KtInitializerAssignExpr |
| enumClass.kt:1:22:1:31 | int | TypeAccess |
| enumClass.kt:1:22:1:31 | int | TypeAccess |
@@ -275,19 +275,19 @@
| enumClass.kt:8:3:11:4 | VAL | TypeAccess |
| enumClass.kt:8:3:11:4 | new EnumWithFunctions(...) | ClassInstanceExpr |
| enumClass.kt:8:3:11:4 | new VAL(...) | ClassInstanceExpr |
| enumClass.kt:9:5:9:30 | int | TypeAccess |
| enumClass.kt:9:14:9:30 | int | TypeAccess |
| enumClass.kt:9:20:9:25 | int | TypeAccess |
| enumClass.kt:9:30:9:30 | i | VarAccess |
| enumClass.kt:10:5:10:42 | int | TypeAccess |
| enumClass.kt:10:14:10:42 | int | TypeAccess |
| enumClass.kt:10:20:10:25 | int | TypeAccess |
| enumClass.kt:10:30:10:33 | this | ThisAccess |
| enumClass.kt:10:30:10:38 | f(...) | MethodCall |
| enumClass.kt:10:30:10:42 | ... + ... | AddExpr |
| enumClass.kt:10:37:10:37 | i | VarAccess |
| enumClass.kt:10:42:10:42 | i | VarAccess |
| enumClass.kt:13:3:13:29 | int | TypeAccess |
| enumClass.kt:13:12:13:29 | int | TypeAccess |
| enumClass.kt:13:18:13:23 | int | TypeAccess |
| enumClass.kt:14:3:14:29 | int | TypeAccess |
| enumClass.kt:14:12:14:29 | int | TypeAccess |
| enumClass.kt:14:18:14:23 | int | TypeAccess |
| methods2.kt:4:1:5:1 | Unit | TypeAccess |
| methods2.kt:4:26:4:31 | int | TypeAccess |
@@ -374,7 +374,7 @@
| methods5.kt:10:13:10:18 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
| methods5.kt:10:13:10:18 | Unit | TypeAccess |
| methods5.kt:10:16:10:17 | 42 | IntegerLiteral |
| methods6.kt:3:1:4:1 | Unit | TypeAccess |
| methods6.kt:3:9:4:1 | Unit | TypeAccess |
| methods.kt:2:1:3:1 | Unit | TypeAccess |
| methods.kt:2:20:2:25 | int | TypeAccess |
| methods.kt:2:28:2:33 | int | TypeAccess |
@@ -392,9 +392,9 @@
| methods.kt:11:9:11:28 | topLevelMethod(...) | MethodCall |
| methods.kt:11:24:11:24 | b | VarAccess |
| methods.kt:11:27:11:27 | 4 | IntegerLiteral |
| methods.kt:14:5:14:29 | Unit | TypeAccess |
| methods.kt:15:5:15:35 | Unit | TypeAccess |
| methods.kt:16:5:16:31 | Unit | TypeAccess |
| methods.kt:17:5:17:33 | Unit | TypeAccess |
| methods.kt:14:12:14:29 | Unit | TypeAccess |
| methods.kt:15:15:15:35 | Unit | TypeAccess |
| methods.kt:16:13:16:31 | Unit | TypeAccess |
| methods.kt:17:14:17:33 | Unit | TypeAccess |
| methods.kt:18:5:18:36 | Unit | TypeAccess |
| methods.kt:19:5:19:29 | Unit | TypeAccess |
| methods.kt:19:12:19:29 | Unit | TypeAccess |

20
java/ql/test-kotlin2/library-tests/methods/methods.expected
View File

@@ -34,10 +34,10 @@ methods
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | getEntries | getEntries() | final, public, static | Compiler generated |
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | valueOf | valueOf(java.lang.String) | final, public, static | Compiler generated |
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | values | values() | final, public, static | Compiler generated |
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:13:3:13:29 | f | f(int) | abstract, public | |
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:14:3:14:29 | g | g(int) | abstract, public | |
| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:9:5:9:30 | f | f(int) | override, public | |
| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:10:5:10:42 | g | g(int) | override, public | |
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:13:12:13:29 | f | f(int) | abstract, public | |
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:14:12:14:29 | g | g(int) | abstract, public | |
| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:9:14:9:30 | f | f(int) | override, public | |
| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:10:14:10:42 | g | g(int) | override, public | |
| methods2.kt:0:0:0:0 | Methods2Kt | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | fooBarTopLevelMethod(int,int) | final, public, static | |
| methods2.kt:7:1:10:1 | Class2 | methods2.kt:8:5:9:5 | fooBarClassMethod | fooBarClassMethod(int,int) | final, public | |
| methods3.kt:0:0:0:0 | Methods3Kt | methods3.kt:3:1:3:49 | fooBarTopLevelMethodExt | fooBarTopLevelMethodExt(java.lang.String,int) | final, public, static | |
@@ -48,16 +48,16 @@ methods
| methods5.kt:0:0:0:0 | Methods5Kt | methods5.kt:3:1:11:1 | x | x() | final, public, static | |
| methods5.kt:5:3:5:27 | | methods5.kt:5:3:5:27 | a | a(int) | final, public | |
| methods5.kt:9:3:9:32 | | methods5.kt:9:3:9:32 | f1 | f1(foo.bar.C1,int) | final, public | |
| methods6.kt:0:0:0:0 | Methods6Kt | methods6.kt:3:1:4:1 | s | s() | final, public, static, suspend | |
| methods6.kt:0:0:0:0 | Methods6Kt | methods6.kt:3:9:4:1 | s | s() | final, public, static, suspend | |
| methods.kt:0:0:0:0 | MethodsKt | methods.kt:2:1:3:1 | topLevelMethod | topLevelMethod(int,int) | final, public, static | |
| methods.kt:5:1:20:1 | Class | methods.kt:6:5:7:5 | classMethod | classMethod(int,int) | final, public | |
| methods.kt:5:1:20:1 | Class | methods.kt:9:5:12:5 | anotherClassMethod | anotherClassMethod(int,int) | final, public | |
| methods.kt:5:1:20:1 | Class | methods.kt:14:5:14:29 | publicFun | publicFun() | final, public | |
| methods.kt:5:1:20:1 | Class | methods.kt:15:5:15:35 | protectedFun | protectedFun() | final, protected | |
| methods.kt:5:1:20:1 | Class | methods.kt:16:5:16:31 | privateFun | privateFun() | final, private | |
| methods.kt:5:1:20:1 | Class | methods.kt:17:5:17:33 | internalFun$main | internalFun$main() | final, internal | |
| methods.kt:5:1:20:1 | Class | methods.kt:14:12:14:29 | publicFun | publicFun() | final, public | |
| methods.kt:5:1:20:1 | Class | methods.kt:15:15:15:35 | protectedFun | protectedFun() | final, protected | |
| methods.kt:5:1:20:1 | Class | methods.kt:16:13:16:31 | privateFun | privateFun() | final, private | |
| methods.kt:5:1:20:1 | Class | methods.kt:17:14:17:33 | internalFun$main | internalFun$main() | final, internal | |
| methods.kt:5:1:20:1 | Class | methods.kt:18:5:18:36 | noExplicitVisibilityFun | noExplicitVisibilityFun() | final, public | |
| methods.kt:5:1:20:1 | Class | methods.kt:19:5:19:29 | inlineFun | inlineFun() | final, inline, public | |
| methods.kt:5:1:20:1 | Class | methods.kt:19:12:19:29 | inlineFun | inlineFun() | final, inline, public | |
constructors
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:21:1:47 | DataClass | DataClass(int,java.lang.String) |
| delegates.kt:3:1:12:1 | MyClass | delegates.kt:3:1:12:1 | MyClass | MyClass() |

8
java/ql/test-kotlin2/library-tests/methods/parameters.expected
View File

@@ -24,10 +24,10 @@
| delegates.kt:8:66:11:5 | invoke | delegates.kt:9:20:9:22 | new | 2 |
| enumClass.kt:0:0:0:0 | valueOf | enumClass.kt:1:1:4:1 | value | 0 |
| enumClass.kt:0:0:0:0 | valueOf | enumClass.kt:6:1:16:1 | value | 0 |
| enumClass.kt:9:5:9:30 | f | enumClass.kt:9:20:9:25 | i | 0 |
| enumClass.kt:10:5:10:42 | g | enumClass.kt:10:20:10:25 | i | 0 |
| enumClass.kt:13:3:13:29 | f | enumClass.kt:13:18:13:23 | i | 0 |
| enumClass.kt:14:3:14:29 | g | enumClass.kt:14:18:14:23 | i | 0 |
| enumClass.kt:9:14:9:30 | f | enumClass.kt:9:20:9:25 | i | 0 |
| enumClass.kt:10:14:10:42 | g | enumClass.kt:10:20:10:25 | i | 0 |
| enumClass.kt:13:12:13:29 | f | enumClass.kt:13:18:13:23 | i | 0 |
| enumClass.kt:14:12:14:29 | g | enumClass.kt:14:18:14:23 | i | 0 |
| 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:8:5:9:5 | fooBarClassMethod | methods2.kt:8:27:8:32 | x | 0 |