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

Fix (generic) type access extraction for lambdas

Browse Source
This commit is contained in:
Tamas Vajk
2022-03-02 12:10:27 +01:00
committed by Ian Lynagh
parent a8c94c500e
commit a70ade224f
7 changed files with 193 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/ql/test/kotlin/library-tests/classes/PrintAst.expected
View File

@@ -441,6 +441,9 @@ local_anonymous.kt:
# 16| 0: [VarAccess] a
# 16| 1: [VarAccess] b
# 16| -3: [TypeAccess] Function2<Integer,Integer,Integer>
# 16| 0: [TypeAccess] Integer
# 16| 1: [TypeAccess] Integer
# 16| 2: [TypeAccess] Integer
# 17| 1: [LocalVariableDeclStmt] var ...;
# 17| 1: [LocalVariableDeclExpr] lambda2
# 17| 0: [LambdaExpr] ...->...
@@ -458,6 +461,9 @@ local_anonymous.kt:
# 17| 0: [VarAccess] a
# 17| 1: [VarAccess] b
# 17| -3: [TypeAccess] Function2<Integer,Integer,Integer>
# 17| 0: [TypeAccess] Integer
# 17| 1: [TypeAccess] Integer
# 17| 2: [TypeAccess] Integer
# 20| 5: [Method] fn4
# 20| 5: [BlockStmt] { ... }
# 21| 0: [LocalVariableDeclStmt] var ...;

98
java/ql/test/kotlin/library-tests/exprs/PrintAst.expected
View File

@@ -1163,6 +1163,7 @@ funcExprs.kt:
# 16| 0: [ReturnStmt] return ...
# 16| 0: [IntegerLiteral] 5
# 16| -3: [TypeAccess] Function0<Integer>
# 16| 0: [TypeAccess] Integer
# 17| 1: [ExprStmt] <Expr>;
# 17| 0: [MethodAccess] functionExpression0b(...)
# 17| 0: [LambdaExpr] ...->...
@@ -1175,6 +1176,7 @@ funcExprs.kt:
# 17| 0: [ReturnStmt] return ...
# 17| 0: [IntegerLiteral] 5
# 17| -3: [TypeAccess] Function0<Object>
# 17| 0: [TypeAccess] Object
# 18| 2: [ExprStmt] <Expr>;
# 18| 0: [MethodAccess] functionExpression0c(...)
# 18| 0: [LambdaExpr] ...->...
@@ -1187,6 +1189,7 @@ funcExprs.kt:
# 18| 0: [ReturnStmt] return ...
# 18| 0: [IntegerLiteral] 5
# 18| -3: [TypeAccess] Function0<Object>
# 18| 0: [TypeAccess] Object
# 19| 3: [ExprStmt] <Expr>;
# 19| 0: [MethodAccess] functionExpression1a(...)
# 19| 0: [IntegerLiteral] 5
@@ -1202,6 +1205,8 @@ funcExprs.kt:
# 19| 0: [ReturnStmt] return ...
# 19| 0: [IntegerLiteral] 5
# 19| -3: [TypeAccess] Function1<Integer,Integer>
# 19| 0: [TypeAccess] Integer
# 19| 1: [TypeAccess] Integer
# 20| 4: [ExprStmt] <Expr>;
# 20| 0: [MethodAccess] functionExpression1a(...)
# 20| 0: [IntegerLiteral] 5
@@ -1217,6 +1222,8 @@ funcExprs.kt:
# 20| 0: [ReturnStmt] return ...
# 20| 0: [VarAccess] it
# 20| -3: [TypeAccess] Function1<Integer,Integer>
# 20| 0: [TypeAccess] Integer
# 20| 1: [TypeAccess] Integer
# 21| 5: [ExprStmt] <Expr>;
# 21| 0: [MethodAccess] functionExpression1a(...)
# 21| 0: [IntegerLiteral] 5
@@ -1232,6 +1239,8 @@ funcExprs.kt:
# 21| 0: [ReturnStmt] return ...
# 21| 0: [IntegerLiteral] 5
# 21| -3: [TypeAccess] Function1<Integer,Integer>
# 21| 0: [TypeAccess] Integer
# 21| 1: [TypeAccess] Integer
# 22| 6: [ExprStmt] <Expr>;
# 22| 0: [MethodAccess] functionExpression1a(...)
# 22| 0: [IntegerLiteral] 5
@@ -1252,6 +1261,8 @@ funcExprs.kt:
# 23| 0: [ReturnStmt] return ...
# 23| 0: [VarAccess] a
# 23| -3: [TypeAccess] Function1<Object,Object>
# 23| 0: [TypeAccess] Object
# 23| 1: [TypeAccess] Object
# 24| 8: [ExprStmt] <Expr>;
# 24| 0: [MethodAccess] functionExpression2(...)
# 24| 0: [IntegerLiteral] 5
@@ -1268,6 +1279,9 @@ funcExprs.kt:
# 24| 0: [ReturnStmt] return ...
# 24| 0: [IntegerLiteral] 5
# 24| -3: [TypeAccess] Function2<Integer,Integer,Integer>
# 24| 0: [TypeAccess] Integer
# 24| 1: [TypeAccess] Integer
# 24| 2: [TypeAccess] Integer
# 25| 9: [ExprStmt] <Expr>;
# 25| 0: [MethodAccess] functionExpression2(...)
# 25| 0: [IntegerLiteral] 5
@@ -1284,6 +1298,9 @@ funcExprs.kt:
# 25| 0: [ReturnStmt] return ...
# 25| 0: [IntegerLiteral] 5
# 25| -3: [TypeAccess] Function2<Integer,Integer,Integer>
# 25| 0: [TypeAccess] Integer
# 25| 1: [TypeAccess] Integer
# 25| 2: [TypeAccess] Integer
# 26| 10: [ExprStmt] <Expr>;
# 26| 0: [MethodAccess] functionExpression3(...)
# 26| 0: [IntegerLiteral] 5
@@ -1302,6 +1319,9 @@ funcExprs.kt:
# 26| 0: [ThisAccess] this
# 26| 1: [VarAccess] a
# 26| -3: [TypeAccess] Function2<Integer,Integer,Integer>
# 26| 0: [TypeAccess] Integer
# 26| 1: [TypeAccess] Integer
# 26| 2: [TypeAccess] Integer
# 27| 11: [ExprStmt] <Expr>;
# 27| 0: [MethodAccess] functionExpression4(...)
# 27| 0: [IntegerLiteral] 5
@@ -1327,7 +1347,13 @@ funcExprs.kt:
# 27| 0: [ReturnStmt] return ...
# 27| 0: [DoubleLiteral] 5.0
# 27| -3: [TypeAccess] Function1<Integer,Double>
# 27| 0: [TypeAccess] Integer
# 27| 1: [TypeAccess] Double
# 27| -3: [TypeAccess] Function1<Integer,Function1<Integer,Double>>
# 27| 0: [TypeAccess] Integer
# 27| 1: [TypeAccess] Function1<Integer,Double>
# 27| 0: [TypeAccess] Integer
# 27| 1: [TypeAccess] Double
# 29| 12: [ExprStmt] <Expr>;
# 29| 0: [MethodAccess] functionExpression22(...)
# 29| 0: [IntegerLiteral] 5
@@ -1366,6 +1392,29 @@ funcExprs.kt:
# 29| 0: [TypeAccess] Unit
# 29| 1: [IntegerLiteral] 5
# 29| -3: [TypeAccess] Function22<Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Unit>
# 29| 0: [TypeAccess] Integer
# 29| 1: [TypeAccess] Integer
# 29| 2: [TypeAccess] Integer
# 29| 3: [TypeAccess] Integer
# 29| 4: [TypeAccess] Integer
# 29| 5: [TypeAccess] Integer
# 29| 6: [TypeAccess] Integer
# 29| 7: [TypeAccess] Integer
# 29| 8: [TypeAccess] Integer
# 29| 9: [TypeAccess] Integer
# 29| 10: [TypeAccess] Integer
# 29| 11: [TypeAccess] Integer
# 29| 12: [TypeAccess] Integer
# 29| 13: [TypeAccess] Integer
# 29| 14: [TypeAccess] Integer
# 29| 15: [TypeAccess] Integer
# 29| 16: [TypeAccess] Integer
# 29| 17: [TypeAccess] Integer
# 29| 18: [TypeAccess] Integer
# 29| 19: [TypeAccess] Integer
# 29| 20: [TypeAccess] Integer
# 29| 21: [TypeAccess] Integer
# 29| 22: [TypeAccess] Unit
# 30| 13: [ExprStmt] <Expr>;
# 30| 0: [MethodAccess] functionExpression23(...)
# 30| 0: [IntegerLiteral] 5
@@ -1525,6 +1574,7 @@ funcExprs.kt:
# 30| 0: [VarAccess] a0
# 30| 1: [IntegerLiteral] 22
# 30| -3: [TypeAccess] FunctionN<String>
# 30| 0: [TypeAccess] String
# 32| 14: [ExprStmt] <Expr>;
# 32| 0: [MethodAccess] functionExpression0a(...)
# 32| 0: [MemberRefExpr] ...::...
@@ -2188,6 +2238,41 @@ funcExprs.kt:
# 64| 5: [BlockStmt] { ... }
# 64| 0: [ReturnStmt] return ...
# 64| 0: [StringLiteral]
# 67| 4: [Class] Class3
# 67| 1: [Constructor] Class3
# 67| 5: [BlockStmt] { ... }
# 67| 0: [SuperConstructorInvocationStmt] super(...)
# 68| 2: [Method] call
# 68| 5: [BlockStmt] { ... }
# 69| 0: [ExprStmt] <Expr>;
# 69| 0: [MethodAccess] fn(...)
# 69| -1: [ThisAccess] this
# 69| 0: [LambdaExpr] ...->...
# 69| -4: [AnonymousClass] new Function1<Generic<Generic<Integer>>,String>(...) { ... }
# 69| 1: [Constructor]
# 69| 5: [BlockStmt] { ... }
# 69| 0: [SuperConstructorInvocationStmt] super(...)
# 69| 1: [Method] invoke
#-----| 4: (Parameters)
# 69| 0: [Parameter] a
# 69| 5: [BlockStmt] { ... }
# 69| 0: [ReturnStmt] return ...
# 69| 0: [StringLiteral] a
# 69| -3: [TypeAccess] Function1<Generic<Generic<Integer>>,String>
# 69| 0: [TypeAccess] Generic<Generic<Integer>>
# 69| 0: [TypeAccess] Generic<Integer>
# 69| 0: [TypeAccess] Integer
# 69| 1: [TypeAccess] String
# 71| 3: [Method] fn
#-----| 4: (Parameters)
# 71| 0: [Parameter] f
# 71| 5: [BlockStmt] { ... }
# 73| 4: [Class,GenericType,ParameterizedType] Generic
#-----| -2: (Generic Parameters)
# 73| 0: [TypeVariable] T
# 73| 1: [Constructor] Generic
# 73| 5: [BlockStmt] { ... }
# 73| 0: [SuperConstructorInvocationStmt] super(...)
localFunctionCalls.kt:
# 0| [CompilationUnit] localFunctionCalls
# 0| 1: [Class] LocalFunctionCallsKt
@@ -2308,6 +2393,8 @@ samConversion.kt:
# 2| 1: [IntegerLiteral] 2
# 2| 1: [IntegerLiteral] 0
# 2| -3: [TypeAccess] Function1<Integer,Boolean>
# 2| 0: [TypeAccess] Integer
# 2| 1: [TypeAccess] Boolean
# 4| 1: [LocalVariableDeclStmt] var ...;
# 4| 1: [LocalVariableDeclExpr] i0
# 4| 0: [CastExpr] (...)...
@@ -2350,6 +2437,9 @@ samConversion.kt:
# 4| 0: [ExprStmt] <Expr>;
# 4| 0: [VarAccess] INSTANCE
# 4| -3: [TypeAccess] Function2<Integer,Integer,Unit>
# 4| 0: [TypeAccess] Integer
# 4| 1: [TypeAccess] Integer
# 4| 2: [TypeAccess] Unit
# 5| 2: [LocalVariableDeclStmt] var ...;
# 5| 1: [LocalVariableDeclExpr] i1
# 5| 0: [CastExpr] (...)...
@@ -2441,6 +2531,9 @@ samConversion.kt:
# 7| 0: [ThisAccess] this
# 7| 1: [StringLiteral]
# 7| -3: [TypeAccess] Function2<String,Integer,Boolean>
# 7| 0: [TypeAccess] String
# 7| 1: [TypeAccess] Integer
# 7| 2: [TypeAccess] Boolean
# 9| 4: [LocalVariableDeclStmt] var ...;
# 9| 1: [LocalVariableDeclExpr] x
# 9| 0: [CastExpr] (...)...
@@ -2488,6 +2581,8 @@ samConversion.kt:
# 10| 1: [IntegerLiteral] 2
# 10| 1: [IntegerLiteral] 0
# 9| -3: [TypeAccess] Function1<Integer,Boolean>
# 9| 0: [TypeAccess] Integer
# 9| 1: [TypeAccess] Boolean
#-----| 1: (branch)
# 9| 0: [BooleanLiteral] true
# 11| 1: [ExprStmt] <Expr>;
@@ -2507,6 +2602,8 @@ samConversion.kt:
# 12| 1: [IntegerLiteral] 2
# 12| 1: [IntegerLiteral] 1
# 11| -3: [TypeAccess] Function1<Integer,Boolean>
# 11| 0: [TypeAccess] Integer
# 11| 1: [TypeAccess] Boolean
# 20| 2: [Method] fn2
#-----| 4: (Parameters)
# 20| 0: [Parameter] i
@@ -2981,6 +3078,7 @@ samConversion.kt:
# 43| 0: [VarAccess] a0
# 43| 1: [IntegerLiteral] 22
# 43| -3: [TypeAccess] FunctionN<Boolean>
# 43| 0: [TypeAccess] Boolean
# 16| 2: [Interface] IntPredicate
# 17| 1: [Method] accept
#-----| 4: (Parameters)

72
java/ql/test/kotlin/library-tests/exprs/exprs.expected
View File

@@ -736,29 +736,38 @@
| funcExprs.kt:16:5:16:33 | functionExpression0a(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:16:26:16:33 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:16:26:16:33 | Function0<Integer> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:16:26:16:33 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:16:31:16:31 | 5 | funcExprs.kt:16:26:16:33 | invoke | IntegerLiteral |
| funcExprs.kt:17:5:17:33 | functionExpression0b(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:17:26:17:33 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:17:26:17:33 | Function0<Object> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:17:26:17:33 | Object | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:17:31:17:31 | 5 | funcExprs.kt:17:26:17:33 | invoke | IntegerLiteral |
| funcExprs.kt:18:5:18:33 | functionExpression0c(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:18:26:18:33 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:18:26:18:33 | Function0<Object> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:18:26:18:33 | Object | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:18:31:18:31 | 5 | funcExprs.kt:18:26:18:33 | invoke | IntegerLiteral |
| funcExprs.kt:19:5:19:38 | functionExpression1a(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:19:26:19:26 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:19:29:19:38 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:19:29:19:38 | Function1<Integer,Integer> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:19:29:19:38 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:19:29:19:38 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:19:36:19:36 | 5 | funcExprs.kt:19:29:19:38 | invoke | IntegerLiteral |
| funcExprs.kt:20:5:20:34 | functionExpression1a(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:20:26:20:26 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:20:29:20:34 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:20:29:20:34 | Function1<Integer,Integer> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:20:29:20:34 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:20:29:20:34 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:20:31:20:32 | it | funcExprs.kt:20:29:20:34 | invoke | VarAccess |
| funcExprs.kt:21:5:21:43 | functionExpression1a(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:21:26:21:26 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:21:29:21:42 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:21:29:21:42 | Function1<Integer,Integer> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:21:29:21:42 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:21:29:21:42 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:21:42:21:42 | 5 | funcExprs.kt:21:29:21:42 | invoke | IntegerLiteral |
| funcExprs.kt:22:5:22:39 | functionExpression1a(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:22:26:22:26 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
@@ -768,35 +777,75 @@
| funcExprs.kt:23:26:23:26 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:23:29:23:37 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:23:29:23:37 | Function1<Object,Object> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:23:29:23:37 | Object | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:23:29:23:37 | Object | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:23:36:23:36 | a | funcExprs.kt:23:29:23:37 | invoke | VarAccess |
| funcExprs.kt:24:5:24:51 | functionExpression2(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:24:25:24:25 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:24:28:24:50 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:24:28:24:50 | Function2<Integer,Integer,Integer> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:24:28:24:50 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:24:28:24:50 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:24:28:24:50 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:24:50:24:50 | 5 | funcExprs.kt:24:28:24:50 | invoke | IntegerLiteral |
| funcExprs.kt:25:5:25:40 | functionExpression2(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:25:25:25:25 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:25:28:25:40 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:25:28:25:40 | Function2<Integer,Integer,Integer> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:25:28:25:40 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:25:28:25:40 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:25:28:25:40 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:25:38:25:38 | 5 | funcExprs.kt:25:28:25:40 | invoke | IntegerLiteral |
| funcExprs.kt:26:5:26:44 | functionExpression3(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:26:25:26:25 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:26:28:26:44 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:26:28:26:44 | Function2<Integer,Integer,Integer> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:26:28:26:44 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:26:28:26:44 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:26:28:26:44 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:26:35:26:38 | this | funcExprs.kt:26:28:26:44 | invoke | ThisAccess |
| funcExprs.kt:26:35:26:42 | ... + ... | funcExprs.kt:26:28:26:44 | invoke | AddExpr |
| funcExprs.kt:26:42:26:42 | a | funcExprs.kt:26:28:26:44 | invoke | VarAccess |
| funcExprs.kt:27:5:27:51 | functionExpression4(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:27:25:27:25 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:27:28:27:51 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:27:28:27:51 | Double | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:27:28:27:51 | Function1<Integer,Double> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:27:28:27:51 | Function1<Integer,Function1<Integer,Double>> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:27:28:27:51 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:27:28:27:51 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:27:37:27:47 | ...->... | funcExprs.kt:27:28:27:51 | invoke | LambdaExpr |
| funcExprs.kt:27:37:27:47 | Double | funcExprs.kt:27:28:27:51 | invoke | TypeAccess |
| funcExprs.kt:27:37:27:47 | Function1<Integer,Double> | funcExprs.kt:27:28:27:51 | invoke | TypeAccess |
| funcExprs.kt:27:37:27:47 | Integer | funcExprs.kt:27:28:27:51 | invoke | TypeAccess |
| funcExprs.kt:27:44:27:46 | 5.0 | funcExprs.kt:27:37:27:47 | invoke | DoubleLiteral |
| funcExprs.kt:29:5:29:112 | functionExpression22(...) | funcExprs.kt:15:1:46:1 | call | MethodAccess |
| funcExprs.kt:29:26:29:26 | 5 | funcExprs.kt:15:1:46:1 | call | IntegerLiteral |
| funcExprs.kt:29:29:29:112 | ...->... | funcExprs.kt:15:1:46:1 | call | LambdaExpr |
| funcExprs.kt:29:29:29:112 | Function22<Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Unit> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Integer | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:29:29:112 | Unit | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:29:111:29:111 | 5 | funcExprs.kt:29:29:29:112 | invoke | IntegerLiteral |
| funcExprs.kt:29:111:29:111 | <implicit coercion to unit> | funcExprs.kt:29:29:29:112 | invoke | ImplicitCoercionToUnitExpr |
| funcExprs.kt:29:111:29:111 | Unit | funcExprs.kt:29:29:29:112 | invoke | TypeAccess |
@@ -873,6 +922,7 @@
| funcExprs.kt:30:29:30:117 | ...[...] | funcExprs.kt:30:29:30:117 | invoke | ArrayAccess |
| funcExprs.kt:30:29:30:117 | ...[...] | funcExprs.kt:30:29:30:117 | invoke | ArrayAccess |
| funcExprs.kt:30:29:30:117 | FunctionN<String> | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:30:29:30:117 | String | funcExprs.kt:15:1:46:1 | call | TypeAccess |
| funcExprs.kt:30:29:30:117 | a0 | funcExprs.kt:30:29:30:117 | invoke | VarAccess |
| funcExprs.kt:30:29:30:117 | a0 | funcExprs.kt:30:29:30:117 | invoke | VarAccess |
| funcExprs.kt:30:29:30:117 | a0 | funcExprs.kt:30:29:30:117 | invoke | VarAccess |
@@ -1336,6 +1386,15 @@
| funcExprs.kt:59:21:59:21 | 5 | funcExprs.kt:59:5:59:21 | f0 | IntegerLiteral |
| funcExprs.kt:60:27:60:27 | 5 | funcExprs.kt:60:5:60:27 | f1 | IntegerLiteral |
| funcExprs.kt:64:134:64:135 | | funcExprs.kt:63:5:64:135 | f23 | StringLiteral |
| funcExprs.kt:69:9:69:22 | fn(...) | funcExprs.kt:68:5:70:5 | call | MethodAccess |
| funcExprs.kt:69:9:69:22 | this | funcExprs.kt:68:5:70:5 | call | ThisAccess |
| funcExprs.kt:69:12:69:22 | ...->... | funcExprs.kt:68:5:70:5 | call | LambdaExpr |
| funcExprs.kt:69:12:69:22 | Function1<Generic<Generic<Integer>>,String> | funcExprs.kt:68:5:70:5 | call | TypeAccess |
| funcExprs.kt:69:12:69:22 | Generic<Generic<Integer>> | funcExprs.kt:68:5:70:5 | call | TypeAccess |
| funcExprs.kt:69:12:69:22 | Generic<Integer> | funcExprs.kt:68:5:70:5 | call | TypeAccess |
| funcExprs.kt:69:12:69:22 | Integer | funcExprs.kt:68:5:70:5 | call | TypeAccess |
| funcExprs.kt:69:12:69:22 | String | funcExprs.kt:68:5:70:5 | call | TypeAccess |
| funcExprs.kt:69:20:69:20 | a | funcExprs.kt:69:12:69:22 | invoke | StringLiteral |
| localFunctionCalls.kt:4:5:4:13 | x | localFunctionCalls.kt:3:1:11:1 | x | LocalVariableDeclExpr |
| localFunctionCalls.kt:4:13:4:13 | 5 | localFunctionCalls.kt:3:1:11:1 | x | IntegerLiteral |
| localFunctionCalls.kt:5:25:5:25 | i | localFunctionCalls.kt:5:5:5:29 | a | VarAccess |
@@ -1379,7 +1438,9 @@
| samConversion.kt:2:18:2:45 | this | samConversion.kt:2:18:2:45 | | ThisAccess |
| samConversion.kt:2:18:2:45 | this.<fn> | samConversion.kt:2:18:2:45 | | VarAccess |
| samConversion.kt:2:31:2:45 | ...->... | samConversion.kt:1:1:14:1 | main | LambdaExpr |
| samConversion.kt:2:31:2:45 | Boolean | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:2:31:2:45 | Function1<Integer,Boolean> | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:2:31:2:45 | Integer | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:2:33:2:34 | it | samConversion.kt:2:31:2:45 | invoke | VarAccess |
| samConversion.kt:2:33:2:38 | ... % ... | samConversion.kt:2:31:2:45 | invoke | RemExpr |
| samConversion.kt:2:33:2:43 | ... (value equals) ... | samConversion.kt:2:31:2:45 | invoke | ValueEQExpr |
@@ -1401,6 +1462,9 @@
| samConversion.kt:4:14:4:42 | this.<fn> | samConversion.kt:4:14:4:42 | | VarAccess |
| samConversion.kt:4:27:4:42 | ...->... | samConversion.kt:1:1:14:1 | main | LambdaExpr |
| samConversion.kt:4:27:4:42 | Function2<Integer,Integer,Unit> | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:4:27:4:42 | Integer | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:4:27:4:42 | Integer | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:4:27:4:42 | Unit | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:4:37:4:40 | INSTANCE | samConversion.kt:4:27:4:42 | invoke | VarAccess |
| samConversion.kt:5:5:5:32 | i1 | samConversion.kt:1:1:14:1 | main | LocalVariableDeclExpr |
| samConversion.kt:5:14:5:32 | (...)... | samConversion.kt:1:1:14:1 | main | CastExpr |
@@ -1439,7 +1503,10 @@
| samConversion.kt:7:13:7:46 | this | samConversion.kt:7:13:7:46 | | ThisAccess |
| samConversion.kt:7:13:7:46 | this.<fn> | samConversion.kt:7:13:7:46 | | VarAccess |
| samConversion.kt:7:29:7:46 | ...->... | samConversion.kt:1:1:14:1 | main | LambdaExpr |
| samConversion.kt:7:29:7:46 | Boolean | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:7:29:7:46 | Function2<String,Integer,Boolean> | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:7:29:7:46 | Integer | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:7:29:7:46 | String | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:7:36:7:39 | this | samConversion.kt:7:29:7:46 | invoke | ThisAccess |
| samConversion.kt:7:36:7:45 | ... (value equals) ... | samConversion.kt:7:29:7:46 | invoke | ValueEQExpr |
| samConversion.kt:7:44:7:45 | | samConversion.kt:7:29:7:46 | invoke | StringLiteral |
@@ -1460,14 +1527,18 @@
| samConversion.kt:9:26:13:5 | when ... | samConversion.kt:1:1:14:1 | main | WhenExpr |
| samConversion.kt:9:30:9:30 | b | samConversion.kt:1:1:14:1 | main | VarAccess |
| samConversion.kt:9:33:11:5 | ...->... | samConversion.kt:1:1:14:1 | main | LambdaExpr |
| samConversion.kt:9:33:11:5 | Boolean | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:9:33:11:5 | Function1<Integer,Boolean> | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:9:33:11:5 | Integer | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:10:14:10:14 | j | samConversion.kt:9:33:11:5 | invoke | VarAccess |
| samConversion.kt:10:14:10:18 | ... % ... | samConversion.kt:9:33:11:5 | invoke | RemExpr |
| samConversion.kt:10:14:10:23 | ... (value equals) ... | samConversion.kt:9:33:11:5 | invoke | ValueEQExpr |
| samConversion.kt:10:18:10:18 | 2 | samConversion.kt:9:33:11:5 | invoke | IntegerLiteral |
| samConversion.kt:10:23:10:23 | 0 | samConversion.kt:9:33:11:5 | invoke | IntegerLiteral |
| samConversion.kt:11:12:13:5 | ...->... | samConversion.kt:1:1:14:1 | main | LambdaExpr |
| samConversion.kt:11:12:13:5 | Boolean | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:11:12:13:5 | Function1<Integer,Boolean> | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:11:12:13:5 | Integer | samConversion.kt:1:1:14:1 | main | TypeAccess |
| samConversion.kt:12:14:12:14 | j | samConversion.kt:11:12:13:5 | invoke | VarAccess |
| samConversion.kt:12:14:12:18 | ... % ... | samConversion.kt:11:12:13:5 | invoke | RemExpr |
| samConversion.kt:12:14:12:23 | ... (value equals) ... | samConversion.kt:11:12:13:5 | invoke | ValueEQExpr |
@@ -1743,6 +1814,7 @@
| samConversion.kt:43:31:45:43 | ...[...] | samConversion.kt:43:31:45:43 | invoke | ArrayAccess |
| samConversion.kt:43:31:45:43 | ...[...] | samConversion.kt:43:31:45:43 | invoke | ArrayAccess |
| samConversion.kt:43:31:45:43 | ...[...] | samConversion.kt:43:31:45:43 | invoke | ArrayAccess |
| samConversion.kt:43:31:45:43 | Boolean | samConversion.kt:40:1:46:1 | fn | TypeAccess |
| samConversion.kt:43:31:45:43 | FunctionN<Boolean> | samConversion.kt:40:1:46:1 | fn | TypeAccess |
| samConversion.kt:43:31:45:43 | a0 | samConversion.kt:43:31:45:43 | invoke | VarAccess |
| samConversion.kt:43:31:45:43 | a0 | samConversion.kt:43:31:45:43 | invoke | VarAccess |

1
java/ql/test/kotlin/library-tests/exprs/funcExprs.expected
View File

@@ -13,6 +13,7 @@ lambdaExpr
| funcExprs.kt:27:37:27:47 | ...->... | stmt body | funcExprs.kt:27:37:27:47 | invoke | invoke(int) | funcExprs.kt:27:37:27:47 | new Function1<Integer,Double>(...) { ... } |
| funcExprs.kt:29:29:29:112 | ...->... | stmt body | funcExprs.kt:29:29:29:112 | invoke | invoke(int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int) | funcExprs.kt:29:29:29:112 | new Function22<Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Integer,Unit>(...) { ... } |
| funcExprs.kt:30:29:30:117 | ...->... | stmt body | funcExprs.kt:30:29:30:117 | invoke | invoke(java.lang.Object[]) | funcExprs.kt:30:29:30:117 | new FunctionN<String>(...) { ... } |
| funcExprs.kt:69:12:69:22 | ...->... | stmt body | funcExprs.kt:69:12:69:22 | invoke | invoke(Class3.Generic) | funcExprs.kt:69:12:69:22 | new Function1<Generic<Generic<Integer>>,String>(...) { ... } |
| samConversion.kt:2:31:2:45 | ...->... | stmt body | samConversion.kt:2:31:2:45 | invoke | invoke(int) | samConversion.kt:2:31:2:45 | new Function1<Integer,Boolean>(...) { ... } |
| samConversion.kt:4:27:4:42 | ...->... | stmt body | samConversion.kt:4:27:4:42 | invoke | invoke(int,int) | samConversion.kt:4:27:4:42 | new Function2<Integer,Integer,Unit>(...) { ... } |
| samConversion.kt:7:29:7:46 | ...->... | stmt body | samConversion.kt:7:29:7:46 | invoke | invoke(java.lang.String,int) | samConversion.kt:7:29:7:46 | new Function2<String,Integer,Boolean>(...) { ... } |

9
java/ql/test/kotlin/library-tests/exprs/funcExprs.kt
View File

@@ -63,3 +63,12 @@ class FuncRef {
fun f23(a0: Int, a1: Int, a2: Int, a3: Int, a4: Int, a5: Int, a6: Int, a7: Int, a8: Int, a9: Int, a10: Int,
a11: Int, a12: Int, a13: Int, a14: Int, a15: Int, a16:Int, a17: Int, a18: Int, a19: Int, a20: Int, a21: Int, a22: Int) = ""
}
class Class3 {
fun call() {
fn { a -> "a"}
}
private fun fn(f: (Generic<Generic<Int>>) -> String) { }
class Generic<T> { }
}

2
java/ql/test/kotlin/library-tests/reflection/PrintAst.expected
View File

@@ -327,6 +327,8 @@ reflection.kt:
# 22| -1: [VarAccess] it
# 22| 1: [StringLiteral] p3
# 22| -3: [TypeAccess] Function1<KCallable<?>,Boolean>
# 22| 0: [TypeAccess] KCallable<?>
# 22| 1: [TypeAccess] Boolean
# 23| 15: [LocalVariableDeclStmt] var ...;
# 23| 1: [LocalVariableDeclExpr] z0
# 23| 0: [MethodAccess] get(...)