Skip to content

Commit ba3d50a

Browse files
authored
Merge pull request #11566 from MathiasVP/skip-lvalue-types
2 parents 3593806 + 05d89b2 commit ba3d50a

File tree

7 files changed

+62
-6
lines changed

7 files changed

+62
-6
lines changed

swift/ql/.generated.list

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ ql/lib/codeql/swift/elements/type/GenericTypeParamType.qll 6881305d3599d5a511561
319319
ql/lib/codeql/swift/elements/type/GenericTypeParamTypeConstructor.qll 4265701fad1ad336be3e08e820946dcd1f119b4fa29132ae913318c784236172 d4bf5127edc0dfa4fb8758081a557b768c6e4854c9489184c7955f66b68d3148
320320
ql/lib/codeql/swift/elements/type/InOutType.qll d2f6be1da40e93a6d6745b467824b1e974bb64ec56378dc328cc3e864c54e433 942f46afd617151783c79c69d96234aa4ca5741084b12b3d8349338cebb99cc2
321321
ql/lib/codeql/swift/elements/type/InOutTypeConstructor.qll c4889f1009018a55d0ac18c5f2a006572ac6de1f57633adc904e8a2046c09e83 8a2496df02e9f5fcb07331165cee64f97dd40dc4b4f8f32eacaf395c7c014a99
322-
ql/lib/codeql/swift/elements/type/LValueType.qll 60a55935763564f2fa7a5ca71af5ac59914289435d2385aee9a01e5d161b1600 daa1eacb13397c20fe3c092e4b7f7f5798da43005bad61c0fef2b18357770b01
323322
ql/lib/codeql/swift/elements/type/LValueTypeConstructor.qll e426dac8fce60f9bbd6aa12b8e33230c405c9c773046226c948bc9791e03c911 4d495938b0eb604033cea8ff105854c0c9917dbad59bb47a8751fc12d7554bdd
324323
ql/lib/codeql/swift/elements/type/MetatypeType.qll 5d2995b2269ec118daf81268cca62beaa4189e65cae32ef7ec83b9129858cef8 34c021dc051d5d80410cd7aa25b45ccd2d7b267b2bbcb92f4249f528f524c5d8
325324
ql/lib/codeql/swift/elements/type/MetatypeTypeConstructor.qll 5dfa528a0c849afa46ad08c4c92e47c3bc3418abb7674e94a0d36bc0e45d5686 6b95579b99e4cdd53cc95d9288ecbdb07ef268e5344e467336d89adddb7cc853
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// generated by codegen/codegen.py, remove this comment if you wish to edit this file
21
private import codeql.swift.generated.type.LValueType
32

4-
class LValueType extends Generated::LValueType { }
3+
class LValueType extends Generated::LValueType {
4+
override Type getResolveStep() { result = this.getImmediateObjectType() }
5+
}

swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr_getType.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
| identity_expressions.swift:4:9:4:14 | .self | A |
2-
| identity_expressions.swift:4:9:4:21 | .self | @lvalue Int |
2+
| identity_expressions.swift:4:9:4:21 | .self | Int |
33
| identity_expressions.swift:4:28:4:31 | (...) | (Int) |
44
| identity_expressions.swift:8:5:8:9 | (...) | (A) |
55
| identity_expressions.swift:11:28:11:43 | (...) | (A) |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
| implicit_conversions.swift:2:3:2:3 | (UnsafePointer<CChar>) ... | StringToPointerExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:2:3:2:3 | Hello |
22
| implicit_conversions.swift:4:16:4:16 | (Int?) ... | InjectIntoOptionalExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:4:16:4:16 | 42 |
33
| implicit_conversions.swift:5:25:5:25 | (Equatable) ... | ErasureExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:5:25:5:25 | 42 |
4-
| implicit_conversions.swift:12:3:12:5 | (@lvalue (() -> Void)?) ... | AbiSafeConversionExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:3:12:5 | .b |
4+
| implicit_conversions.swift:12:3:12:5 | ((() -> Void)?) ... | AbiSafeConversionExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:3:12:5 | .b |
55
| implicit_conversions.swift:12:9:12:10 | ((() -> Void)?) ... | InjectIntoOptionalExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:9:12:10 | { ... } |
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
| implicit_conversions.swift:2:3:2:3 | (UnsafePointer<CChar>) ... | UnsafePointer<CChar> |
22
| implicit_conversions.swift:4:16:4:16 | (Int?) ... | Int? |
33
| implicit_conversions.swift:5:25:5:25 | (Equatable) ... | Equatable |
4-
| implicit_conversions.swift:12:3:12:5 | (@lvalue (() -> Void)?) ... | @lvalue (() -> Void)? |
4+
| implicit_conversions.swift:12:3:12:5 | ((() -> Void)?) ... | (() -> Void)? |
55
| implicit_conversions.swift:12:9:12:10 | ((() -> Void)?) ... | (() -> Void)? |

swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
| test.swift:6:9:6:13 | SSA def(t1) | test.swift:7:15:7:15 | t1 |
22
| test.swift:6:19:6:26 | call to source() | test.swift:6:9:6:13 | SSA def(t1) |
3+
| test.swift:7:15:7:15 | [post] t1 | test.swift:8:10:8:10 | t1 |
34
| test.swift:7:15:7:15 | t1 | test.swift:8:10:8:10 | t1 |
45
| test.swift:8:5:8:10 | SSA def(t2) | test.swift:10:15:10:15 | t2 |
56
| test.swift:8:10:8:10 | t1 | test.swift:8:5:8:10 | SSA def(t2) |
67
| test.swift:8:10:8:10 | t1 | test.swift:9:15:9:15 | t1 |
8+
| test.swift:9:15:9:15 | [post] t1 | test.swift:11:8:11:8 | t1 |
79
| test.swift:9:15:9:15 | t1 | test.swift:11:8:11:8 | t1 |
810
| test.swift:12:9:12:14 | SSA def(t2) | test.swift:13:19:13:19 | t2 |
911
| test.swift:12:14:12:14 | 0 | test.swift:12:9:12:14 | SSA def(t2) |
@@ -27,6 +29,7 @@
2729
| test.swift:54:11:54:18 | call to source() | test.swift:54:5:54:18 | SSA def(arg) |
2830
| test.swift:59:9:59:12 | SSA def(x) | test.swift:60:15:60:15 | x |
2931
| test.swift:59:18:59:18 | 0 | test.swift:59:9:59:12 | SSA def(x) |
32+
| test.swift:60:15:60:15 | [post] x | test.swift:61:23:61:23 | x |
3033
| test.swift:60:15:60:15 | x | test.swift:61:23:61:23 | x |
3134
| test.swift:61:22:61:23 | &... | test.swift:62:15:62:15 | x |
3235
| test.swift:61:22:61:23 | [post] &... | test.swift:62:15:62:15 | x |
@@ -64,12 +67,14 @@
6467
| test.swift:93:17:93:23 | bool | test.swift:93:17:93:23 | SSA def(bool) |
6568
| test.swift:95:13:95:16 | SSA def(x) | test.swift:96:19:96:19 | x |
6669
| test.swift:95:22:95:22 | 0 | test.swift:95:13:95:16 | SSA def(x) |
70+
| test.swift:96:19:96:19 | [post] x | test.swift:97:40:97:40 | x |
6771
| test.swift:96:19:96:19 | x | test.swift:97:40:97:40 | x |
6872
| test.swift:97:39:97:40 | &... | test.swift:98:19:98:19 | x |
6973
| test.swift:97:39:97:40 | [post] &... | test.swift:98:19:98:19 | x |
7074
| test.swift:97:40:97:40 | x | test.swift:97:39:97:40 | &... |
7175
| test.swift:102:13:102:16 | SSA def(x) | test.swift:103:19:103:19 | x |
7276
| test.swift:102:22:102:22 | 0 | test.swift:102:13:102:16 | SSA def(x) |
77+
| test.swift:103:19:103:19 | [post] x | test.swift:104:41:104:41 | x |
7378
| test.swift:103:19:103:19 | x | test.swift:104:41:104:41 | x |
7479
| test.swift:104:40:104:41 | &... | test.swift:105:19:105:19 | x |
7580
| test.swift:104:40:104:41 | [post] &... | test.swift:105:19:105:19 | x |

0 commit comments

Comments
 (0)