Skip to content

Commit 43907b6

Browse files
author
Robert Marsh
authored
Merge pull request #9409 from github/alexdenisov/swift-fix-ctor-dtor-tostring
Swift: fix ctor/dtor names in toString
2 parents 2187bf5 + 1dab01a commit 43907b6

File tree

8 files changed

+128
-128
lines changed

8 files changed

+128
-128
lines changed

‎swift/ql/lib/codeql/swift/elements/decl/ConstructorDecl.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
private import codeql.swift.generated.decl.ConstructorDecl
22

33
class ConstructorDecl extends ConstructorDeclBase {
4-
override string toString() { result = "deinit" }
4+
override string toString() { result = "init" }
55
}

‎swift/ql/lib/codeql/swift/elements/decl/DestructorDecl.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
private import codeql.swift.generated.decl.DestructorDecl
22

33
class DestructorDecl extends DestructorDeclBase {
4-
override string toString() { result = "init" }
4+
override string toString() { result = "deinit" }
55
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| declarations.swift:1:1:7:1 | Foo |
2-
| declarations.swift:1:8:1:8 | deinit |
3-
| declarations.swift:1:8:1:8 | deinit |
2+
| declarations.swift:1:8:1:8 | init |
3+
| declarations.swift:1:8:1:8 | init |
44
| declarations.swift:1:8:1:8 | x |
55
| declarations.swift:2:3:2:11 | var ... = ... |
66
| declarations.swift:2:7:2:7 | (unnamed function decl) |
@@ -86,17 +86,17 @@
8686
| declarations.swift:41:7:41:7 | set |
8787
| declarations.swift:41:7:41:7 | value |
8888
| declarations.swift:42:3:42:3 | self |
89-
| declarations.swift:42:3:44:3 | deinit |
89+
| declarations.swift:42:3:44:3 | init |
9090
| declarations.swift:46:3:46:3 | self |
91-
| declarations.swift:46:3:48:3 | init |
91+
| declarations.swift:46:3:48:3 | deinit |
9292
| declarations.swift:50:3:52:3 | +- |
9393
| declarations.swift:50:26:50:33 | other |
9494
| declarations.swift:55:8:55:17 | +- |
9595
| declarations.swift:57:1:62:1 | precedencegroup ... |
9696
| declarations.swift:64:7:64:16 | +++ |
9797
| declarations.swift:66:7:66:21 | *** |
9898
| declarations.swift:68:18:74:1 | ZeroWrapper |
99-
| declarations.swift:68:25:68:25 | deinit |
99+
| declarations.swift:68:25:68:25 | init |
100100
| declarations.swift:69:3:73:3 | var ... = ... |
101101
| declarations.swift:69:7:69:7 | wrappedValue |
102102
| declarations.swift:70:5:72:5 | get |
@@ -106,12 +106,12 @@
106106
| declarations.swift:77:20:77:20 | get |
107107
| declarations.swift:77:20:77:20 | x |
108108
| declarations.swift:81:1:136:1 | HasPropertyAndObserver |
109-
| declarations.swift:81:8:81:8 | deinit |
110109
| declarations.swift:81:8:81:8 | hasBoth |
111110
| declarations.swift:81:8:81:8 | hasDidSet1 |
112111
| declarations.swift:81:8:81:8 | hasDidSet2 |
113112
| declarations.swift:81:8:81:8 | hasWillSet1 |
114113
| declarations.swift:81:8:81:8 | hasWillSet2 |
114+
| declarations.swift:81:8:81:8 | init |
115115
| declarations.swift:81:8:81:8 | normalField |
116116
| declarations.swift:82:3:87:3 | var ... = ... |
117117
| declarations.swift:82:7:82:7 | (unnamed function decl) |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
| expressions.swift:21:14:21:14 | 11 |
4747
| expressions.swift:27:13:27:13 | Klass.Type |
4848
| expressions.swift:27:13:27:13 | call to ... |
49-
| expressions.swift:27:13:27:13 | deinit |
49+
| expressions.swift:27:13:27:13 | init |
5050
| expressions.swift:27:13:27:19 | call to ... |
5151
| expressions.swift:29:9:29:19 | [...] |
5252
| expressions.swift:29:10:29:10 | 1 |
@@ -167,7 +167,7 @@
167167
| expressions.swift:79:19:79:19 | 22 |
168168
| expressions.swift:83:15:83:15 | Derived.Type |
169169
| expressions.swift:83:15:83:15 | call to ... |
170-
| expressions.swift:83:15:83:15 | deinit |
170+
| expressions.swift:83:15:83:15 | init |
171171
| expressions.swift:83:15:83:23 | call to ... |
172172
| expressions.swift:84:1:84:1 | _ |
173173
| expressions.swift:84:1:84:13 | ... = ... |
@@ -188,7 +188,7 @@
188188
| expressions.swift:92:24:92:24 | passRetained |
189189
| expressions.swift:92:37:92:37 | ToPtr.Type |
190190
| expressions.swift:92:37:92:37 | call to ... |
191-
| expressions.swift:92:37:92:37 | deinit |
191+
| expressions.swift:92:37:92:37 | init |
192192
| expressions.swift:92:37:92:43 | call to ... |
193193
| expressions.swift:92:46:92:46 | toOpaque |
194194
| expressions.swift:93:1:93:16 | Unmanaged<ToPtr>.Type |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
| expressions.swift:16:19:16:19 | failed | OrdinarySemantics |
99
| expressions.swift:20:6:20:6 | failure | OrdinarySemantics |
1010
| expressions.swift:21:6:21:6 | failure | OrdinarySemantics |
11-
| expressions.swift:27:13:27:13 | deinit | OrdinarySemantics |
11+
| expressions.swift:27:13:27:13 | init | OrdinarySemantics |
1212
| expressions.swift:35:1:35:1 | print | OrdinarySemantics |
1313
| expressions.swift:35:7:35:7 | d | OrdinarySemantics |
1414
| expressions.swift:35:7:35:12 | ...[...] | OrdinarySemantics |
@@ -41,14 +41,14 @@
4141
| expressions.swift:73:5:73:5 | self | OrdinarySemantics |
4242
| expressions.swift:73:10:73:10 | x | OrdinarySemantics |
4343
| expressions.swift:77:7:77:7 | _unimplementedInitializer | OrdinarySemantics |
44-
| expressions.swift:83:15:83:15 | deinit | OrdinarySemantics |
44+
| expressions.swift:83:15:83:15 | init | OrdinarySemantics |
4545
| expressions.swift:84:5:84:5 | derived | OrdinarySemantics |
4646
| expressions.swift:84:5:84:13 | .xx | OrdinarySemantics |
4747
| expressions.swift:87:1:87:1 | opt | OrdinarySemantics |
4848
| expressions.swift:88:1:88:1 | d | OrdinarySemantics |
4949
| expressions.swift:88:1:88:6 | ...[...] | OrdinarySemantics |
5050
| expressions.swift:92:24:92:24 | passRetained | OrdinarySemantics |
51-
| expressions.swift:92:37:92:37 | deinit | OrdinarySemantics |
51+
| expressions.swift:92:37:92:37 | init | OrdinarySemantics |
5252
| expressions.swift:92:46:92:46 | toOpaque | OrdinarySemantics |
5353
| expressions.swift:93:18:93:18 | fromOpaque | OrdinarySemantics |
5454
| expressions.swift:93:29:93:29 | opaque | OrdinarySemantics |

‎swift/ql/test/extractor-tests/types/Types.expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
| types.swift:3:11:3:11 | 10 | Int |
2020
| types.swift:7:16:7:16 | X.Type | X.Type |
2121
| types.swift:7:16:7:16 | call to ... | () -> X |
22-
| types.swift:7:16:7:16 | deinit | (X.Type) -> () -> X |
22+
| types.swift:7:16:7:16 | init | (X.Type) -> () -> X |
2323
| types.swift:7:16:7:18 | call to ... | X |
2424
| types.swift:13:17:13:17 | C.Type | C.Type |
2525
| types.swift:13:17:13:17 | call to ... | () -> C |
26-
| types.swift:13:17:13:17 | deinit | (C.Type) -> () -> C |
26+
| types.swift:13:17:13:17 | init | (C.Type) -> () -> C |
2727
| types.swift:13:17:13:19 | call to ... | C |
2828
| types.swift:14:22:14:24 | C.Nested.Type | C.Nested.Type |
2929
| types.swift:14:22:14:24 | call to ... | () -> C.Nested |
3030
| types.swift:14:22:14:31 | call to ... | C.Nested |
31-
| types.swift:14:24:14:24 | deinit | (C.Nested.Type) -> () -> C.Nested |
31+
| types.swift:14:24:14:24 | init | (C.Nested.Type) -> () -> C.Nested |
3232
| types.swift:17:10:17:10 | x | Int |
3333
| types.swift:17:10:17:14 | ... call to + ... | Int |
3434
| types.swift:17:12:17:12 | + | (Int.Type) -> (Int, Int) -> Int |

0 commit comments

Comments
 (0)