Skip to content

Commit 7890dc6

Browse files
jketemajketema
committed
Swift: Update expected test results after 6.2 update
1 parent bc835a3 commit 7890dc6

File tree

15 files changed

+119
-100
lines changed

15 files changed

+119
-100
lines changed

‎swift/ql/test/extractor-tests/expressions/all.expected‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
| expressions.swift:6:9:6:9 | hello world | StringLiteralExpr |
77
| expressions.swift:7:10:7:10 | "..." | InterpolatedStringLiteralExpr |
88
| expressions.swift:7:10:7:10 | OpaqueValueExpr | OpaqueValueExpr |
9+
| expressions.swift:7:10:7:10 | appendLiteral(_:) | DeclRefExpr |
910
| expressions.swift:7:10:7:10 | hello | StringLiteralExpr |
1011
| expressions.swift:7:10:7:21 | TapExpr | TapExpr |
11-
| expressions.swift:7:11:7:10 | call to appendLiteral(_:) | CallExpr |
1212
| expressions.swift:7:11:7:11 | $interpolation | DeclRefExpr |
1313
| expressions.swift:7:11:7:11 | &... | InOutExpr |
1414
| expressions.swift:7:11:7:11 | .appendLiteral(_:) | MethodLookupExpr |
15+
| expressions.swift:7:11:7:11 | call to appendLiteral(_:) | CallExpr |
1516
| expressions.swift:7:18:7:18 | $interpolation | DeclRefExpr |
1617
| expressions.swift:7:18:7:18 | &... | InOutExpr |
1718
| expressions.swift:7:18:7:18 | .appendInterpolation(_:) | MethodLookupExpr |
@@ -22,6 +23,7 @@
2223
| expressions.swift:7:21:7:21 | $interpolation | DeclRefExpr |
2324
| expressions.swift:7:21:7:21 | &... | InOutExpr |
2425
| expressions.swift:7:21:7:21 | .appendLiteral(_:) | MethodLookupExpr |
26+
| expressions.swift:7:21:7:21 | appendLiteral(_:) | DeclRefExpr |
2527
| expressions.swift:7:21:7:21 | call to appendLiteral(_:) | CallExpr |
2628
| expressions.swift:8:15:8:15 | nil | NilLiteralExpr |
2729
| expressions.swift:15:9:15:9 | x | DeclRefExpr |

‎swift/ql/test/extractor-tests/expressions/semantics.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
| expressions.swift:7:10:7:10 | appendLiteral(_:) | OrdinarySemantics |
12
| expressions.swift:7:11:7:11 | $interpolation | OrdinarySemantics |
23
| expressions.swift:7:18:7:18 | $interpolation | OrdinarySemantics |
34
| expressions.swift:7:18:7:18 | appendInterpolation(_:) | OrdinarySemantics |
45
| expressions.swift:7:19:7:19 | a | OrdinarySemantics |
56
| expressions.swift:7:21:7:21 | $interpolation | OrdinarySemantics |
7+
| expressions.swift:7:21:7:21 | appendLiteral(_:) | OrdinarySemantics |
68
| expressions.swift:15:9:15:9 | x | OrdinarySemantics |
79
| expressions.swift:15:11:15:11 | !=(_:_:) | OrdinarySemantics |
810
| expressions.swift:16:19:16:19 | failed | OrdinarySemantics |

‎swift/ql/test/extractor-tests/generated/decl/CapturedDecl/PrintAst.expected‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,16 @@ closures.swift:
222222
# 39| getExpr(): [IntegerLiteralExpr] 1
223223
# 39| getResult().getFullyConverted(): [AwaitExpr] await ...
224224
# 39| getCapture(0): [CapturedDecl] callback
225-
# 41| getElement(1): [CallExpr] call to Task<Success, Never>.init(priority:operation:)
226-
# 41| getFunction(): [MethodLookupExpr] Task<Success, Never>.init(priority:operation:)
225+
# 41| getElement(1): [CallExpr] call to Task<Success, Never>.init(name:priority:operation:)
226+
# 41| getFunction(): [MethodLookupExpr] Task<Success, Never>.init(name:priority:operation:)
227227
# 41| getBase(): [TypeExpr] Task<(), Never>.Type
228228
# 41| getTypeRepr(): [TypeRepr] Task<(), Never>
229-
# 41| getMethodRef(): [DeclRefExpr] Task<Success, Never>.init(priority:operation:)
230-
# 41| getArgument(0): [Argument] priority: default priority
229+
# 41| getMethodRef(): [DeclRefExpr] Task<Success, Never>.init(name:priority:operation:)
230+
# 41| getArgument(0): [Argument] name: default name
231+
# 41| getExpr(): [DefaultArgumentExpr] default name
232+
# 41| getArgument(1): [Argument] priority: default priority
231233
# 41| getExpr(): [DefaultArgumentExpr] default priority
232-
# 41| getArgument(1): [Argument] operation: { ... }
234+
# 41| getArgument(2): [Argument] operation: { ... }
233235
# 41| getExpr(): [ExplicitClosureExpr] { ... }
234236
# 41| getBody(): [BraceStmt] { ... }
235237
# 42| getElement(0): [ReturnStmt] return ...
@@ -270,6 +272,7 @@ closures.swift:
270272
# 46| getArgument(1): [Argument] : 1
271273
# 46| getExpr(): [IntegerLiteralExpr] 1
272274
# 41| [NilLiteralExpr] nil
275+
# 41| [NilLiteralExpr] nil
273276
# 50| [NamedFunction] foo()
274277
# 50| InterfaceType = () -> Int
275278
# 50| getBody(): [BraceStmt] { ... }

‎swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ getParentPattern
103103
| var_decls.swift:65:19:65:19 | case_variable | var_decls.swift:65:8:65:35 | .value(...) |
104104
| var_decls.swift:67:22:67:22 | unused_case_variable | var_decls.swift:67:8:67:42 | .value(...) |
105105
getParentInitializer
106-
| var_decls.swift:2:12:2:12 | $i$generator | var_decls.swift:2:12:2:16 | call to makeIterator() |
106+
| var_decls.swift:2:12:2:12 | $i$generator | var_decls.swift:2:12:2:12 | call to makeIterator() |
107107
| var_decls.swift:4:7:4:7 | i | var_decls.swift:4:11:4:11 | 0 |
108108
| var_decls.swift:7:5:7:5 | numbers | var_decls.swift:7:15:7:18 | [...] |
109109
| var_decls.swift:10:12:10:12 | numbers | var_decls.swift:10:22:10:35 | [...] |

‎swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ instances
1515
| file://:0:0:0:0 | @attached(memberAttribute) | getKind: | 8 | getMacroSyntax: | 1 |
1616
| file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 |
1717
| file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 |
18+
| file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 |
1819
| test.swift:1:2:1:26 | #freestanding(declaration) | getKind: | 2 | getMacroSyntax: | 0 |
1920
| test.swift:3:2:3:25 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 |
2021
| test.swift:5:2:5:17 | @attached(member) | getKind: | 16 | getMacroSyntax: | 1 |
2122
| test.swift:6:2:6:20 | @attached(extension) | getKind: | 256 | getMacroSyntax: | 1 |
2223
getConformance
2324
getName
2425
| file://:0:0:0:0 | @attached(peer) | 0 | $() |
26+
| file://:0:0:0:0 | @attached(peer) | 0 | _() |
2527
| file://:0:0:0:0 | @attached(peer) | 0 | _lldb_summary() |

‎swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ instances
1414
| method_lookups.swift:37:11:37:11 | X.init() | getBase: | method_lookups.swift:37:11:37:11 | X.Type | getMethodRef: | method_lookups.swift:37:11:37:11 | X.init() |
1515
| method_lookups.swift:37:11:37:15 | (no string representation) | getBase: | method_lookups.swift:37:11:37:13 | call to X.init() | getMethodRef: | method_lookups.swift:37:15:37:15 | { ... } |
1616
| method_lookups.swift:37:15:37:15 | .baz(_:) | getBase: | file://:0:0:0:0 | self | getMethodRef: | method_lookups.swift:37:15:37:15 | baz(_:) |
17-
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | getBase: | method_lookups.swift:40:1:40:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) |
17+
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(name:priority:operation:) | getBase: | method_lookups.swift:40:1:40:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(name:priority:operation:) |
1818
| method_lookups.swift:41:3:41:5 | .foo(_:_:) | getBase: | method_lookups.swift:41:3:41:3 | Y.Type | getMethodRef: | method_lookups.swift:41:5:41:5 | foo(_:_:) |
1919
| method_lookups.swift:42:9:42:9 | Y.init() | getBase: | method_lookups.swift:42:9:42:9 | Y.Type | getMethodRef: | method_lookups.swift:42:9:42:9 | Y.init() |
2020
| method_lookups.swift:42:9:42:13 | .baz(_:) | getBase: | method_lookups.swift:42:9:42:11 | call to Y.init() | getMethodRef: | method_lookups.swift:42:13:42:13 | baz(_:) |
2121
| method_lookups.swift:44:11:44:13 | .foo(_:_:) | getBase: | method_lookups.swift:44:11:44:11 | Y.Type | getMethodRef: | method_lookups.swift:44:13:44:13 | foo(_:_:) |
22-
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) |
22+
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(name:priority:operation:) | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(name:priority:operation:) |
2323
| method_lookups.swift:48:9:48:11 | .foo(_:_:) | getBase: | method_lookups.swift:48:9:48:9 | Z.Type | getMethodRef: | method_lookups.swift:48:11:48:11 | foo(_:_:) |
2424
| method_lookups.swift:49:9:49:11 | .bar() | getBase: | method_lookups.swift:49:9:49:9 | Z.Type | getMethodRef: | method_lookups.swift:49:11:49:11 | bar() |
2525
| method_lookups.swift:50:9:50:9 | Z.init() | getBase: | method_lookups.swift:50:9:50:9 | Z.Type | getMethodRef: | method_lookups.swift:50:9:50:9 | Z.init() |
@@ -44,12 +44,12 @@ getType
4444
| method_lookups.swift:37:11:37:11 | X.init() | () -> X |
4545
| method_lookups.swift:37:11:37:15 | (no string representation) | (Int) -> () |
4646
| method_lookups.swift:37:15:37:15 | .baz(_:) | (Int) -> () |
47-
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | (TaskPriority?, sending @escaping @isolated(any) () async -> ()) -> Task<(), Never> |
47+
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(name:priority:operation:) | (String?, TaskPriority?, sending @escaping @isolated(any) () async -> ()) -> Task<(), Never> |
4848
| method_lookups.swift:41:3:41:5 | .foo(_:_:) | (Int, Int) -> () |
4949
| method_lookups.swift:42:9:42:9 | Y.init() | () -> Y |
5050
| method_lookups.swift:42:9:42:13 | .baz(_:) | (Int) -> () |
5151
| method_lookups.swift:44:11:44:13 | .foo(_:_:) | (Int, Int) -> () |
52-
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | (TaskPriority?, sending @escaping @isolated(any) () async -> ()) -> Task<(), Never> |
52+
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(name:priority:operation:) | (String?, TaskPriority?, sending @escaping @isolated(any) () async -> ()) -> Task<(), Never> |
5353
| method_lookups.swift:48:9:48:11 | .foo(_:_:) | @MainActor (Int, Int) -> () |
5454
| method_lookups.swift:49:9:49:11 | .bar() | () -> () |
5555
| method_lookups.swift:50:9:50:9 | Z.init() | @MainActor () -> Z |
@@ -70,12 +70,12 @@ getMember
7070
| method_lookups.swift:36:11:36:13 | .bar() | method_lookups.swift:3:3:3:21 | bar() |
7171
| method_lookups.swift:37:11:37:11 | X.init() | method_lookups.swift:6:3:8:3 | X.init() |
7272
| method_lookups.swift:37:15:37:15 | .baz(_:) | method_lookups.swift:4:3:4:21 | baz(_:) |
73-
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(priority:operation:) |
73+
| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(name:priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(name:priority:operation:) |
7474
| method_lookups.swift:41:3:41:5 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
7575
| method_lookups.swift:42:9:42:9 | Y.init() | method_lookups.swift:15:3:17:3 | Y.init() |
7676
| method_lookups.swift:42:9:42:13 | .baz(_:) | method_lookups.swift:13:3:13:21 | baz(_:) |
7777
| method_lookups.swift:44:11:44:13 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
78-
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(priority:operation:) |
78+
| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(name:priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(name:priority:operation:) |
7979
| method_lookups.swift:48:9:48:11 | .foo(_:_:) | method_lookups.swift:22:3:22:35 | foo(_:_:) |
8080
| method_lookups.swift:49:9:49:11 | .bar() | method_lookups.swift:23:15:23:33 | bar() |
8181
| method_lookups.swift:50:9:50:9 | Z.init() | method_lookups.swift:26:3:28:3 | Z.init() |

0 commit comments

Comments
 (0)