hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clarify test and accept test changes

Browse Source
This commit is contained in:
Chris Smowton
2022-10-04 17:24:52 +01:00
parent 6119670be8
commit 03c895853b
4 changed files with 479 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

459
java/ql/test/kotlin/library-tests/jvmoverloads-annotation/PrintAst.expected
View File

@@ -69,6 +69,56 @@ test.kt:
# 45| 5: [BlockStmt] { ... }
# 45| 0: [ReturnStmt] return ...
# 45| 0: [VarAccess] a
# 45| 5: [Method] testExtensionFunction$default
# 45| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 45| 0: [Parameter] p0
# 45| 0: [TypeAccess] Test
# 45| 1: [Parameter] p1
# 45| 0: [TypeAccess] int
# 45| 2: [Parameter] p2
# 45| 0: [TypeAccess] String
# 45| 3: [Parameter] p3
# 45| 0: [TypeAccess] double
# 45| 4: [Parameter] p4
# 45| 0: [TypeAccess] float
# 45| 5: [Parameter] p5
# 45| 0: [TypeAccess] boolean
# 45| 6: [Parameter] p6
# 45| 0: [TypeAccess] int
# 45| 7: [Parameter] p7
# 45| 0: [TypeAccess] Object
# 45| 5: [BlockStmt] { ... }
# 45| 0: [IfStmt] if (...)
# 45| 0: [EQExpr] ... == ...
# 45| 0: [AndBitwiseExpr] ... & ...
# 45| 0: [IntegerLiteral] 2
# 45| 1: [VarAccess] p6
# 45| 1: [IntegerLiteral] 0
# 45| 1: [ExprStmt] <Expr>;
# 45| 0: [AssignExpr] ...=...
# 45| 0: [VarAccess] p2
# 45| 1: [MethodAccess] getString(...)
# 45| -1: [TypeAccess] TestKt
# 45| 1: [IfStmt] if (...)
# 45| 0: [EQExpr] ... == ...
# 45| 0: [AndBitwiseExpr] ... & ...
# 45| 0: [IntegerLiteral] 8
# 45| 1: [VarAccess] p6
# 45| 1: [IntegerLiteral] 0
# 45| 1: [ExprStmt] <Expr>;
# 45| 0: [AssignExpr] ...=...
# 45| 0: [VarAccess] p4
# 45| 1: [FloatLiteral] 1.0
# 45| 2: [ReturnStmt] return ...
# 45| 0: [MethodAccess] testExtensionFunction(...)
# 45| -1: [TypeAccess] TestKt
# 45| 0: [VarAccess] p0
# 45| 1: [VarAccess] p1
# 45| 2: [VarAccess] p2
# 45| 3: [VarAccess] p3
# 45| 4: [VarAccess] p4
# 45| 5: [VarAccess] p5
# 3| 2: [Class] Test
# 3| 1: [Constructor] Test
# 3| 5: [BlockStmt] { ... }
@@ -129,7 +179,54 @@ test.kt:
# 6| 5: [BlockStmt] { ... }
# 6| 0: [ReturnStmt] return ...
# 6| 0: [VarAccess] a
# 9| 5: [Method] testMemberFunction
# 6| 5: [Method] testStaticFunction$default
# 6| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 6| 0: [Parameter] p0
# 6| 0: [TypeAccess] int
# 6| 1: [Parameter] p1
# 6| 0: [TypeAccess] String
# 6| 2: [Parameter] p2
# 6| 0: [TypeAccess] double
# 6| 3: [Parameter] p3
# 6| 0: [TypeAccess] float
# 6| 4: [Parameter] p4
# 6| 0: [TypeAccess] boolean
# 6| 5: [Parameter] p5
# 6| 0: [TypeAccess] int
# 6| 6: [Parameter] p6
# 6| 0: [TypeAccess] Object
# 6| 5: [BlockStmt] { ... }
# 6| 0: [IfStmt] if (...)
# 6| 0: [EQExpr] ... == ...
# 6| 0: [AndBitwiseExpr] ... & ...
# 6| 0: [IntegerLiteral] 2
# 6| 1: [VarAccess] p5
# 6| 1: [IntegerLiteral] 0
# 6| 1: [ExprStmt] <Expr>;
# 6| 0: [AssignExpr] ...=...
# 6| 0: [VarAccess] p1
# 6| 1: [MethodAccess] getString(...)
# 6| -1: [TypeAccess] TestKt
# 6| 1: [IfStmt] if (...)
# 6| 0: [EQExpr] ... == ...
# 6| 0: [AndBitwiseExpr] ... & ...
# 6| 0: [IntegerLiteral] 8
# 6| 1: [VarAccess] p5
# 6| 1: [IntegerLiteral] 0
# 6| 1: [ExprStmt] <Expr>;
# 6| 0: [AssignExpr] ...=...
# 6| 0: [VarAccess] p3
# 6| 1: [FloatLiteral] 1.0
# 6| 2: [ReturnStmt] return ...
# 6| 0: [MethodAccess] testStaticFunction(...)
# 6| -1: [TypeAccess] Test
# 6| 0: [VarAccess] p0
# 6| 1: [VarAccess] p1
# 6| 2: [VarAccess] p2
# 6| 3: [VarAccess] p3
# 6| 4: [VarAccess] p4
# 9| 6: [Method] testMemberFunction
# 9| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 9| 0: [Parameter] a
@@ -148,7 +245,7 @@ test.kt:
# 9| 2: [VarAccess] c
# 9| 3: [FloatLiteral] 1.0
# 9| 4: [VarAccess] e
# 9| 6: [Method] testMemberFunction
# 9| 7: [Method] testMemberFunction
# 9| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 9| 0: [Parameter] a
@@ -168,7 +265,7 @@ test.kt:
# 9| 2: [VarAccess] c
# 9| 3: [FloatLiteral] 1.0
# 9| 4: [VarAccess] e
# 9| 7: [Method] testMemberFunction
# 9| 8: [Method] testMemberFunction
# 9| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 9| 0: [Parameter] a
@@ -184,7 +281,56 @@ test.kt:
# 9| 5: [BlockStmt] { ... }
# 9| 0: [ReturnStmt] return ...
# 9| 0: [VarAccess] a
# 12| 8: [ExtensionMethod] testMemberExtensionFunction
# 9| 9: [Method] testMemberFunction$default
# 9| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 9| 0: [Parameter] p0
# 9| 0: [TypeAccess] Test
# 9| 1: [Parameter] p1
# 9| 0: [TypeAccess] int
# 9| 2: [Parameter] p2
# 9| 0: [TypeAccess] String
# 9| 3: [Parameter] p3
# 9| 0: [TypeAccess] double
# 9| 4: [Parameter] p4
# 9| 0: [TypeAccess] float
# 9| 5: [Parameter] p5
# 9| 0: [TypeAccess] boolean
# 9| 6: [Parameter] p6
# 9| 0: [TypeAccess] int
# 9| 7: [Parameter] p7
# 9| 0: [TypeAccess] Object
# 9| 5: [BlockStmt] { ... }
# 9| 0: [IfStmt] if (...)
# 9| 0: [EQExpr] ... == ...
# 9| 0: [AndBitwiseExpr] ... & ...
# 9| 0: [IntegerLiteral] 2
# 9| 1: [VarAccess] p6
# 9| 1: [IntegerLiteral] 0
# 9| 1: [ExprStmt] <Expr>;
# 9| 0: [AssignExpr] ...=...
# 9| 0: [VarAccess] p2
# 9| 1: [MethodAccess] getString(...)
# 9| -1: [TypeAccess] TestKt
# 9| 1: [IfStmt] if (...)
# 9| 0: [EQExpr] ... == ...
# 9| 0: [AndBitwiseExpr] ... & ...
# 9| 0: [IntegerLiteral] 8
# 9| 1: [VarAccess] p6
# 9| 1: [IntegerLiteral] 0
# 9| 1: [ExprStmt] <Expr>;
# 9| 0: [AssignExpr] ...=...
# 9| 0: [VarAccess] p4
# 9| 1: [FloatLiteral] 1.0
# 9| 2: [ReturnStmt] return ...
# 9| 0: [MethodAccess] testMemberFunction(...)
# 9| -1: [VarAccess] p0
# 9| 0: [VarAccess] p1
# 9| 1: [VarAccess] p2
# 9| 2: [VarAccess] p3
# 9| 3: [VarAccess] p4
# 9| 4: [VarAccess] p5
# 12| 10: [ExtensionMethod] testMemberExtensionFunction
# 12| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 12| 0: [Parameter] <this>
@@ -206,7 +352,7 @@ test.kt:
# 12| 3: [VarAccess] c
# 12| 4: [FloatLiteral] 1.0
# 12| 5: [VarAccess] e
# 12| 9: [ExtensionMethod] testMemberExtensionFunction
# 12| 11: [ExtensionMethod] testMemberExtensionFunction
# 12| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 12| 0: [Parameter] <this>
@@ -229,7 +375,7 @@ test.kt:
# 12| 3: [VarAccess] c
# 12| 4: [FloatLiteral] 1.0
# 12| 5: [VarAccess] e
# 12| 10: [ExtensionMethod] testMemberExtensionFunction
# 12| 12: [ExtensionMethod] testMemberExtensionFunction
# 12| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 12| 0: [Parameter] <this>
@@ -247,6 +393,58 @@ test.kt:
# 12| 5: [BlockStmt] { ... }
# 12| 0: [ReturnStmt] return ...
# 12| 0: [VarAccess] a
# 12| 13: [Method] testMemberExtensionFunction$default
# 12| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 12| 0: [Parameter] p0
# 12| 0: [TypeAccess] Test2
# 12| 1: [Parameter] p1
# 12| 0: [TypeAccess] Test
# 12| 2: [Parameter] p2
# 12| 0: [TypeAccess] int
# 12| 3: [Parameter] p3
# 12| 0: [TypeAccess] String
# 12| 4: [Parameter] p4
# 12| 0: [TypeAccess] double
# 12| 5: [Parameter] p5
# 12| 0: [TypeAccess] float
# 12| 6: [Parameter] p6
# 12| 0: [TypeAccess] boolean
# 12| 7: [Parameter] p7
# 12| 0: [TypeAccess] int
# 12| 8: [Parameter] p8
# 12| 0: [TypeAccess] Object
# 12| 5: [BlockStmt] { ... }
# 12| 0: [IfStmt] if (...)
# 12| 0: [EQExpr] ... == ...
# 12| 0: [AndBitwiseExpr] ... & ...
# 12| 0: [IntegerLiteral] 2
# 12| 1: [VarAccess] p7
# 12| 1: [IntegerLiteral] 0
# 12| 1: [ExprStmt] <Expr>;
# 12| 0: [AssignExpr] ...=...
# 12| 0: [VarAccess] p3
# 12| 1: [MethodAccess] getString(...)
# 12| -1: [TypeAccess] TestKt
# 12| 1: [IfStmt] if (...)
# 12| 0: [EQExpr] ... == ...
# 12| 0: [AndBitwiseExpr] ... & ...
# 12| 0: [IntegerLiteral] 8
# 12| 1: [VarAccess] p7
# 12| 1: [IntegerLiteral] 0
# 12| 1: [ExprStmt] <Expr>;
# 12| 0: [AssignExpr] ...=...
# 12| 0: [VarAccess] p5
# 12| 1: [FloatLiteral] 1.0
# 12| 2: [ReturnStmt] return ...
# 12| 0: [MethodAccess] testMemberExtensionFunction(...)
# 12| -1: [VarAccess] p1
# 12| 0: [VarAccess] p0
# 12| 1: [VarAccess] p2
# 12| 2: [VarAccess] p3
# 12| 3: [VarAccess] p4
# 12| 4: [VarAccess] p5
# 12| 5: [VarAccess] p6
# 16| 3: [Class] Test2
# 16| 1: [Constructor] Test2
#-----| 4: (Parameters)
@@ -296,7 +494,51 @@ test.kt:
# 16| 5: [BlockStmt] { ... }
# 16| 0: [SuperConstructorInvocationStmt] super(...)
# 16| 1: [BlockStmt] { ... }
# 18| 4: [Class] Companion
# 16| 4: [Constructor] Test2
#-----| 4: (Parameters)
# 16| 0: [Parameter] p0
# 16| 0: [TypeAccess] int
# 16| 1: [Parameter] p1
# 16| 0: [TypeAccess] String
# 16| 2: [Parameter] p2
# 16| 0: [TypeAccess] double
# 16| 3: [Parameter] p3
# 16| 0: [TypeAccess] float
# 16| 4: [Parameter] p4
# 16| 0: [TypeAccess] boolean
# 16| 5: [Parameter] p5
# 16| 0: [TypeAccess] int
# 16| 6: [Parameter] p6
# 16| 0: [TypeAccess] DefaultConstructorMarker
# 16| 5: [BlockStmt] { ... }
# 16| 0: [IfStmt] if (...)
# 16| 0: [EQExpr] ... == ...
# 16| 0: [AndBitwiseExpr] ... & ...
# 16| 0: [IntegerLiteral] 2
# 16| 1: [VarAccess] p5
# 16| 1: [IntegerLiteral] 0
# 16| 1: [ExprStmt] <Expr>;
# 16| 0: [AssignExpr] ...=...
# 16| 0: [VarAccess] p1
# 16| 1: [MethodAccess] getString(...)
# 16| -1: [TypeAccess] TestKt
# 16| 1: [IfStmt] if (...)
# 16| 0: [EQExpr] ... == ...
# 16| 0: [AndBitwiseExpr] ... & ...
# 16| 0: [IntegerLiteral] 8
# 16| 1: [VarAccess] p5
# 16| 1: [IntegerLiteral] 0
# 16| 1: [ExprStmt] <Expr>;
# 16| 0: [AssignExpr] ...=...
# 16| 0: [VarAccess] p3
# 16| 1: [FloatLiteral] 1.0
# 16| 2: [ThisConstructorInvocationStmt] this(...)
# 16| 0: [VarAccess] p0
# 16| 1: [VarAccess] p1
# 16| 2: [VarAccess] p2
# 16| 3: [VarAccess] p3
# 16| 4: [VarAccess] p4
# 18| 5: [Class] Companion
# 18| 1: [Constructor] Companion
# 18| 5: [BlockStmt] { ... }
# 18| 0: [SuperConstructorInvocationStmt] super(...)
@@ -356,7 +598,56 @@ test.kt:
# 21| 5: [BlockStmt] { ... }
# 21| 0: [ReturnStmt] return ...
# 21| 0: [VarAccess] a
# 24| 5: [Method] testStaticCompanionFunction
# 21| 5: [Method] testCompanionFunction$default
# 21| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 21| 0: [Parameter] p0
# 21| 0: [TypeAccess] Companion
# 21| 1: [Parameter] p1
# 21| 0: [TypeAccess] int
# 21| 2: [Parameter] p2
# 21| 0: [TypeAccess] String
# 21| 3: [Parameter] p3
# 21| 0: [TypeAccess] double
# 21| 4: [Parameter] p4
# 21| 0: [TypeAccess] float
# 21| 5: [Parameter] p5
# 21| 0: [TypeAccess] boolean
# 21| 6: [Parameter] p6
# 21| 0: [TypeAccess] int
# 21| 7: [Parameter] p7
# 21| 0: [TypeAccess] Object
# 21| 5: [BlockStmt] { ... }
# 21| 0: [IfStmt] if (...)
# 21| 0: [EQExpr] ... == ...
# 21| 0: [AndBitwiseExpr] ... & ...
# 21| 0: [IntegerLiteral] 2
# 21| 1: [VarAccess] p6
# 21| 1: [IntegerLiteral] 0
# 21| 1: [ExprStmt] <Expr>;
# 21| 0: [AssignExpr] ...=...
# 21| 0: [VarAccess] p2
# 21| 1: [MethodAccess] getString(...)
# 21| -1: [TypeAccess] TestKt
# 21| 1: [IfStmt] if (...)
# 21| 0: [EQExpr] ... == ...
# 21| 0: [AndBitwiseExpr] ... & ...
# 21| 0: [IntegerLiteral] 8
# 21| 1: [VarAccess] p6
# 21| 1: [IntegerLiteral] 0
# 21| 1: [ExprStmt] <Expr>;
# 21| 0: [AssignExpr] ...=...
# 21| 0: [VarAccess] p4
# 21| 1: [FloatLiteral] 1.0
# 21| 2: [ReturnStmt] return ...
# 21| 0: [MethodAccess] testCompanionFunction(...)
# 21| -1: [VarAccess] p0
# 21| 0: [VarAccess] p1
# 21| 1: [VarAccess] p2
# 21| 2: [VarAccess] p3
# 21| 3: [VarAccess] p4
# 21| 4: [VarAccess] p5
# 24| 6: [Method] testStaticCompanionFunction
# 24| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 24| 0: [Parameter] a
@@ -375,7 +666,7 @@ test.kt:
# 24| 2: [VarAccess] c
# 24| 3: [FloatLiteral] 1.0
# 24| 4: [VarAccess] e
# 24| 6: [Method] testStaticCompanionFunction
# 24| 7: [Method] testStaticCompanionFunction
# 24| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 24| 0: [Parameter] a
@@ -395,7 +686,7 @@ test.kt:
# 24| 2: [VarAccess] c
# 24| 3: [FloatLiteral] 1.0
# 24| 4: [VarAccess] e
# 24| 7: [Method] testStaticCompanionFunction
# 24| 8: [Method] testStaticCompanionFunction
# 24| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 24| 0: [Parameter] a
@@ -411,7 +702,56 @@ test.kt:
# 24| 5: [BlockStmt] { ... }
# 24| 0: [ReturnStmt] return ...
# 24| 0: [VarAccess] a
# 24| 5: [Method] testStaticCompanionFunction
# 24| 9: [Method] testStaticCompanionFunction$default
# 24| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 24| 0: [Parameter] p0
# 24| 0: [TypeAccess] Companion
# 24| 1: [Parameter] p1
# 24| 0: [TypeAccess] int
# 24| 2: [Parameter] p2
# 24| 0: [TypeAccess] String
# 24| 3: [Parameter] p3
# 24| 0: [TypeAccess] double
# 24| 4: [Parameter] p4
# 24| 0: [TypeAccess] float
# 24| 5: [Parameter] p5
# 24| 0: [TypeAccess] boolean
# 24| 6: [Parameter] p6
# 24| 0: [TypeAccess] int
# 24| 7: [Parameter] p7
# 24| 0: [TypeAccess] Object
# 24| 5: [BlockStmt] { ... }
# 24| 0: [IfStmt] if (...)
# 24| 0: [EQExpr] ... == ...
# 24| 0: [AndBitwiseExpr] ... & ...
# 24| 0: [IntegerLiteral] 2
# 24| 1: [VarAccess] p6
# 24| 1: [IntegerLiteral] 0
# 24| 1: [ExprStmt] <Expr>;
# 24| 0: [AssignExpr] ...=...
# 24| 0: [VarAccess] p2
# 24| 1: [MethodAccess] getString(...)
# 24| -1: [TypeAccess] TestKt
# 24| 1: [IfStmt] if (...)
# 24| 0: [EQExpr] ... == ...
# 24| 0: [AndBitwiseExpr] ... & ...
# 24| 0: [IntegerLiteral] 8
# 24| 1: [VarAccess] p6
# 24| 1: [IntegerLiteral] 0
# 24| 1: [ExprStmt] <Expr>;
# 24| 0: [AssignExpr] ...=...
# 24| 0: [VarAccess] p4
# 24| 1: [FloatLiteral] 1.0
# 24| 2: [ReturnStmt] return ...
# 24| 0: [MethodAccess] testStaticCompanionFunction(...)
# 24| -1: [VarAccess] p0
# 24| 0: [VarAccess] p1
# 24| 1: [VarAccess] p2
# 24| 2: [VarAccess] p3
# 24| 3: [VarAccess] p4
# 24| 4: [VarAccess] p5
# 24| 6: [Method] testStaticCompanionFunction
# 24| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 24| 0: [Parameter] a
@@ -430,7 +770,7 @@ test.kt:
# 24| 2: [VarAccess] c
# 24| 3: [FloatLiteral] 1.0
# 24| 4: [VarAccess] e
# 24| 6: [Method] testStaticCompanionFunction
# 24| 7: [Method] testStaticCompanionFunction
# 24| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 24| 0: [Parameter] a
@@ -450,7 +790,7 @@ test.kt:
# 24| 2: [VarAccess] c
# 24| 3: [FloatLiteral] 1.0
# 24| 4: [VarAccess] e
# 24| 7: [Method] testStaticCompanionFunction
# 24| 8: [Method] testStaticCompanionFunction
# 24| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 24| 0: [Parameter] a
@@ -515,7 +855,47 @@ test.kt:
# 30| 5: [BlockStmt] { ... }
# 30| 0: [SuperConstructorInvocationStmt] super(...)
# 30| 1: [BlockStmt] { ... }
# 33| 4: [Method] testMemberFunction
# 30| 4: [Constructor] GenericTest
#-----| 4: (Parameters)
# 30| 0: [Parameter] p0
# 30| 0: [TypeAccess] int
# 30| 1: [Parameter] p1
# 30| 0: [TypeAccess] Object
# 30| 2: [Parameter] p2
# 30| 0: [TypeAccess] String
# 30| 3: [Parameter] p3
# 30| 0: [TypeAccess] Object
# 30| 4: [Parameter] p4
# 30| 0: [TypeAccess] int
# 30| 5: [Parameter] p5
# 30| 0: [TypeAccess] DefaultConstructorMarker
# 30| 5: [BlockStmt] { ... }
# 30| 0: [IfStmt] if (...)
# 30| 0: [EQExpr] ... == ...
# 30| 0: [AndBitwiseExpr] ... & ...
# 30| 0: [IntegerLiteral] 1
# 30| 1: [VarAccess] p4
# 30| 1: [IntegerLiteral] 0
# 30| 1: [ExprStmt] <Expr>;
# 30| 0: [AssignExpr] ...=...
# 30| 0: [VarAccess] p0
# 30| 1: [IntegerLiteral] 1
# 30| 1: [IfStmt] if (...)
# 30| 0: [EQExpr] ... == ...
# 30| 0: [AndBitwiseExpr] ... & ...
# 30| 0: [IntegerLiteral] 4
# 30| 1: [VarAccess] p4
# 30| 1: [IntegerLiteral] 0
# 30| 1: [ExprStmt] <Expr>;
# 30| 0: [AssignExpr] ...=...
# 30| 0: [VarAccess] p2
# 30| 1: [StringLiteral] Hello world
# 30| 2: [ThisConstructorInvocationStmt] this(...)
# 30| 0: [VarAccess] p0
# 30| 1: [VarAccess] p1
# 30| 2: [VarAccess] p2
# 30| 3: [VarAccess] p3
# 33| 5: [Method] testMemberFunction
# 33| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 33| 0: [Parameter] b
@@ -530,7 +910,7 @@ test.kt:
# 33| 1: [VarAccess] b
# 33| 2: [StringLiteral] Hello world
# 33| 3: [VarAccess] d
# 33| 5: [Method] testMemberFunction
# 33| 6: [Method] testMemberFunction
# 33| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 33| 0: [Parameter] a
@@ -547,7 +927,7 @@ test.kt:
# 33| 1: [VarAccess] b
# 33| 2: [StringLiteral] Hello world
# 33| 3: [VarAccess] d
# 33| 6: [Method] testMemberFunction
# 33| 7: [Method] testMemberFunction
# 33| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 33| 0: [Parameter] a
@@ -561,7 +941,52 @@ test.kt:
# 33| 5: [BlockStmt] { ... }
# 33| 0: [ReturnStmt] return ...
# 33| 0: [VarAccess] a
# 35| 7: [Method] useSpecialised
# 33| 8: [Method] testMemberFunction$default
# 33| 3: [TypeAccess] int
#-----| 4: (Parameters)
# 33| 0: [Parameter] p0
# 33| 0: [TypeAccess] GenericTest<>
# 33| 1: [Parameter] p1
# 33| 0: [TypeAccess] int
# 33| 2: [Parameter] p2
# 33| 0: [TypeAccess] Object
# 33| 3: [Parameter] p3
# 33| 0: [TypeAccess] String
# 33| 4: [Parameter] p4
# 33| 0: [TypeAccess] Object
# 33| 5: [Parameter] p5
# 33| 0: [TypeAccess] int
# 33| 6: [Parameter] p6
# 33| 0: [TypeAccess] Object
# 33| 5: [BlockStmt] { ... }
# 33| 0: [IfStmt] if (...)
# 33| 0: [EQExpr] ... == ...
# 33| 0: [AndBitwiseExpr] ... & ...
# 33| 0: [IntegerLiteral] 1
# 33| 1: [VarAccess] p5
# 33| 1: [IntegerLiteral] 0
# 33| 1: [ExprStmt] <Expr>;
# 33| 0: [AssignExpr] ...=...
# 33| 0: [VarAccess] p1
# 33| 1: [IntegerLiteral] 1
# 33| 1: [IfStmt] if (...)
# 33| 0: [EQExpr] ... == ...
# 33| 0: [AndBitwiseExpr] ... & ...
# 33| 0: [IntegerLiteral] 4
# 33| 1: [VarAccess] p5
# 33| 1: [IntegerLiteral] 0
# 33| 1: [ExprStmt] <Expr>;
# 33| 0: [AssignExpr] ...=...
# 33| 0: [VarAccess] p3
# 33| 1: [StringLiteral] Hello world
# 33| 2: [ReturnStmt] return ...
# 33| 0: [MethodAccess] testMemberFunction(...)
# 33| -1: [VarAccess] p0
# 33| 0: [VarAccess] p1
# 33| 1: [VarAccess] p2
# 33| 2: [VarAccess] p3
# 33| 3: [VarAccess] p4
# 35| 9: [Method] useSpecialised
# 35| 3: [TypeAccess] Unit
#-----| 4: (Parameters)
# 35| 0: [Parameter] spec1

9
java/ql/test/kotlin/library-tests/jvmoverloads-annotation/test.expected
View File

@@ -16,19 +16,24 @@
| test.kt:0:0:0:0 | TestKt | test.kt:45:1:45:112 | testExtensionFunction | testExtensionFunction(Test,int,double,boolean) |
| test.kt:0:0:0:0 | TestKt | test.kt:45:1:45:112 | testExtensionFunction | testExtensionFunction(Test,int,java.lang.String,double,boolean) |
| test.kt:0:0:0:0 | TestKt | test.kt:45:1:45:112 | testExtensionFunction | testExtensionFunction(Test,int,java.lang.String,double,float,boolean) |
| test.kt:0:0:0:0 | TestKt | test.kt:45:1:45:112 | testExtensionFunction$default | testExtensionFunction$default(Test,int,java.lang.String,double,float,boolean,int,java.lang.Object) |
| test.kt:3:1:14:1 | Test | test.kt:3:1:14:1 | Test | Test() |
| test.kt:3:1:14:1 | Test | test.kt:6:3:6:106 | testStaticFunction | testStaticFunction(int,double,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:6:3:6:106 | testStaticFunction | testStaticFunction(int,java.lang.String,double,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:6:3:6:106 | testStaticFunction | testStaticFunction(int,java.lang.String,double,float,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:6:3:6:106 | testStaticFunction$default | testStaticFunction$default(int,java.lang.String,double,float,boolean,int,java.lang.Object) |
| test.kt:3:1:14:1 | Test | test.kt:9:3:9:106 | testMemberFunction | testMemberFunction(int,double,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:9:3:9:106 | testMemberFunction | testMemberFunction(int,java.lang.String,double,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:9:3:9:106 | testMemberFunction | testMemberFunction(int,java.lang.String,double,float,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:9:3:9:106 | testMemberFunction$default | testMemberFunction$default(Test,int,java.lang.String,double,float,boolean,int,java.lang.Object) |
| test.kt:3:1:14:1 | Test | test.kt:12:3:12:121 | testMemberExtensionFunction | testMemberExtensionFunction(Test2,int,double,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:12:3:12:121 | testMemberExtensionFunction | testMemberExtensionFunction(Test2,int,java.lang.String,double,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:12:3:12:121 | testMemberExtensionFunction | testMemberExtensionFunction(Test2,int,java.lang.String,double,float,boolean) |
| test.kt:3:1:14:1 | Test | test.kt:12:3:12:121 | testMemberExtensionFunction$default | testMemberExtensionFunction$default(Test2,Test,int,java.lang.String,double,float,boolean,int,java.lang.Object) |
| test.kt:16:1:28:1 | Test2 | test.kt:16:34:28:1 | Test2 | Test2(int,double,boolean) |
| test.kt:16:1:28:1 | Test2 | test.kt:16:34:28:1 | Test2 | Test2(int,java.lang.String,double,boolean) |
| test.kt:16:1:28:1 | Test2 | test.kt:16:34:28:1 | Test2 | Test2(int,java.lang.String,double,float,boolean) |
| test.kt:16:1:28:1 | Test2 | test.kt:16:34:28:1 | Test2 | Test2(int,java.lang.String,double,float,boolean,int,kotlin.jvm.internal.DefaultConstructorMarker) |
| test.kt:16:1:28:1 | Test2 | test.kt:24:5:24:117 | testStaticCompanionFunction | testStaticCompanionFunction(int,double,boolean) |
| test.kt:16:1:28:1 | Test2 | test.kt:24:5:24:117 | testStaticCompanionFunction | testStaticCompanionFunction(int,java.lang.String,double,boolean) |
| test.kt:16:1:28:1 | Test2 | test.kt:24:5:24:117 | testStaticCompanionFunction | testStaticCompanionFunction(int,java.lang.String,double,float,boolean) |
@@ -36,13 +41,17 @@
| test.kt:18:3:26:3 | Companion | test.kt:21:5:21:111 | testCompanionFunction | testCompanionFunction(int,double,boolean) |
| test.kt:18:3:26:3 | Companion | test.kt:21:5:21:111 | testCompanionFunction | testCompanionFunction(int,java.lang.String,double,boolean) |
| test.kt:18:3:26:3 | Companion | test.kt:21:5:21:111 | testCompanionFunction | testCompanionFunction(int,java.lang.String,double,float,boolean) |
| test.kt:18:3:26:3 | Companion | test.kt:21:5:21:111 | testCompanionFunction$default | testCompanionFunction$default(Test2.Companion,int,java.lang.String,double,float,boolean,int,java.lang.Object) |
| test.kt:18:3:26:3 | Companion | test.kt:24:5:24:117 | testStaticCompanionFunction | testStaticCompanionFunction(int,double,boolean) |
| test.kt:18:3:26:3 | Companion | test.kt:24:5:24:117 | testStaticCompanionFunction | testStaticCompanionFunction(int,java.lang.String,double,boolean) |
| test.kt:18:3:26:3 | Companion | test.kt:24:5:24:117 | testStaticCompanionFunction | testStaticCompanionFunction(int,java.lang.String,double,float,boolean) |
| test.kt:18:3:26:3 | Companion | test.kt:24:5:24:117 | testStaticCompanionFunction$default | testStaticCompanionFunction$default(Test2.Companion,int,java.lang.String,double,float,boolean,int,java.lang.Object) |
| test.kt:30:1:42:1 | GenericTest | test.kt:30:43:42:1 | GenericTest | GenericTest(int,java.lang.Object,java.lang.Object) |
| test.kt:30:1:42:1 | GenericTest | test.kt:30:43:42:1 | GenericTest | GenericTest(int,java.lang.Object,java.lang.String,java.lang.Object) |
| test.kt:30:1:42:1 | GenericTest | test.kt:30:43:42:1 | GenericTest | GenericTest(int,java.lang.Object,java.lang.String,java.lang.Object,int,kotlin.jvm.internal.DefaultConstructorMarker) |
| test.kt:30:1:42:1 | GenericTest | test.kt:30:43:42:1 | GenericTest | GenericTest(java.lang.Object,java.lang.Object) |
| test.kt:30:1:42:1 | GenericTest | test.kt:33:3:33:84 | testMemberFunction | testMemberFunction(int,java.lang.Object,java.lang.Object) |
| test.kt:30:1:42:1 | GenericTest | test.kt:33:3:33:84 | testMemberFunction | testMemberFunction(int,java.lang.Object,java.lang.String,java.lang.Object) |
| test.kt:30:1:42:1 | GenericTest | test.kt:33:3:33:84 | testMemberFunction | testMemberFunction(java.lang.Object,java.lang.Object) |
| test.kt:30:1:42:1 | GenericTest | test.kt:33:3:33:84 | testMemberFunction$default | testMemberFunction$default(GenericTest,int,java.lang.Object,java.lang.String,java.lang.Object,int,java.lang.Object) |
| test.kt:30:1:42:1 | GenericTest | test.kt:35:3:40:3 | useSpecialised | useSpecialised(GenericTest,GenericTest) |

48
java/ql/test/kotlin/library-tests/jvmoverloads_flow/test.expected
View File

@@ -1,21 +1,27 @@
| User.java:9:30:9:37 | source(...) | test.kt:13:97:13:97 | s |
| User.java:10:30:10:37 | source(...) | test.kt:13:97:13:97 | s |
| User.java:14:37:14:44 | source(...) | test.kt:25:105:25:105 | s |
| User.java:15:37:15:44 | source(...) | test.kt:25:105:25:105 | s |
| User.java:19:28:19:35 | source(...) | test.kt:33:97:33:97 | s |
| User.java:20:28:20:35 | source(...) | test.kt:33:97:33:97 | s |
| User.java:24:28:24:35 | source(...) | test.kt:43:93:43:93 | s |
| User.java:25:28:25:35 | source(...) | test.kt:43:93:43:93 | s |
| User.java:29:45:29:52 | source(...) | test.kt:58:10:58:10 | s |
| User.java:30:45:30:52 | source(...) | test.kt:58:10:58:10 | s |
| User.java:34:61:34:68 | source(...) | test.kt:74:10:74:10 | s |
| User.java:35:61:35:68 | source(...) | test.kt:74:10:74:10 | s |
| User.java:38:28:38:35 | source(...) | test.kt:84:10:84:10 | y |
| User.java:39:20:39:27 | source(...) | test.kt:84:10:84:10 | y |
| test.kt:10:55:10:62 | source(...) | test.kt:10:84:10:84 | s |
| test.kt:22:63:22:70 | source(...) | test.kt:22:92:22:92 | s |
| test.kt:22:63:22:70 | source(...) | test.kt:22:92:22:92 | s |
| test.kt:30:55:30:62 | source(...) | test.kt:30:84:30:84 | s |
| test.kt:40:53:40:60 | source(...) | test.kt:40:80:40:80 | s |
| test.kt:47:92:47:99 | source(...) | test.kt:50:10:50:10 | s |
| test.kt:63:100:63:107 | source(...) | test.kt:66:10:66:10 | s |
| User.java:9:30:9:37 | source(...) | test.kt:13:97:13:97 | s | User.java:5:22:5:25 | test |
| User.java:10:30:10:37 | source(...) | test.kt:13:97:13:97 | s | User.java:5:22:5:25 | test |
| User.java:14:37:14:44 | source(...) | test.kt:25:105:25:105 | s | User.java:5:22:5:25 | test |
| User.java:15:37:15:44 | source(...) | test.kt:25:105:25:105 | s | User.java:5:22:5:25 | test |
| User.java:19:28:19:35 | source(...) | test.kt:33:97:33:97 | s | User.java:5:22:5:25 | test |
| User.java:20:28:20:35 | source(...) | test.kt:33:97:33:97 | s | User.java:5:22:5:25 | test |
| User.java:24:28:24:35 | source(...) | test.kt:43:93:43:93 | s | User.java:5:22:5:25 | test |
| User.java:25:28:25:35 | source(...) | test.kt:43:93:43:93 | s | User.java:5:22:5:25 | test |
| User.java:29:45:29:52 | source(...) | test.kt:58:10:58:10 | s | User.java:5:22:5:25 | test |
| User.java:30:45:30:52 | source(...) | test.kt:58:10:58:10 | s | User.java:5:22:5:25 | test |
| User.java:34:61:34:68 | source(...) | test.kt:74:10:74:10 | s | User.java:5:22:5:25 | test |
| User.java:35:61:35:68 | source(...) | test.kt:74:10:74:10 | s | User.java:5:22:5:25 | test |
| User.java:38:28:38:35 | source(...) | test.kt:84:10:84:10 | y | User.java:5:22:5:25 | test |
| User.java:39:20:39:27 | source(...) | test.kt:84:10:84:10 | y | User.java:5:22:5:25 | test |
| test.kt:10:55:10:62 | source(...) | test.kt:10:84:10:84 | s | test.kt:10:3:10:87 | taintSuppliedAsDefault |
| test.kt:10:55:10:62 | source(...) | test.kt:10:84:10:84 | s | test.kt:10:3:10:87 | taintSuppliedAsDefault$default |
| test.kt:22:63:22:70 | source(...) | test.kt:22:92:22:92 | s | test.kt:22:5:22:95 | taintSuppliedAsDefaultStatic |
| test.kt:22:63:22:70 | source(...) | test.kt:22:92:22:92 | s | test.kt:22:5:22:95 | taintSuppliedAsDefaultStatic |
| test.kt:22:63:22:70 | source(...) | test.kt:22:92:22:92 | s | test.kt:22:5:22:95 | taintSuppliedAsDefaultStatic$default |
| test.kt:30:55:30:62 | source(...) | test.kt:30:84:30:84 | s | test.kt:30:3:30:87 | taintSuppliedAsDefault |
| test.kt:30:55:30:62 | source(...) | test.kt:30:84:30:84 | s | test.kt:30:3:30:87 | taintSuppliedAsDefault$default |
| test.kt:40:53:40:60 | source(...) | test.kt:40:80:40:80 | s | test.kt:40:3:40:83 | taintSuppliedAsDefault |
| test.kt:40:53:40:60 | source(...) | test.kt:40:80:40:80 | s | test.kt:40:3:40:83 | taintSuppliedAsDefault$default |
| test.kt:47:92:47:99 | source(...) | test.kt:50:10:50:10 | s | test.kt:47:55:53:1 | ConstructorTaintsByDefault |
| test.kt:47:92:47:99 | source(...) | test.kt:50:10:50:10 | s | test.kt:47:55:53:1 | ConstructorTaintsByDefault |
| test.kt:63:100:63:107 | source(...) | test.kt:66:10:66:10 | s | test.kt:63:65:69:1 | GenericConstructorTaintsByDefault |
| test.kt:63:100:63:107 | source(...) | test.kt:66:10:66:10 | s | test.kt:63:65:69:1 | GenericConstructorTaintsByDefault |

2
java/ql/test/kotlin/library-tests/jvmoverloads_flow/test.ql
View File

@@ -15,4 +15,4 @@ class Config extends DataFlow::Configuration {
from Config c, DataFlow::Node source, DataFlow::Node sink
where c.hasFlow(source, sink)
select source, sink
select source, sink, source.getEnclosingCallable()