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

Merge pull request #15984 from github/alexdenisov/swift-5.10

Browse Source 
Swift: upgrade to 5.10
This commit is contained in:
Paolo Tranquilli
2024-03-28 13:58:39 +01:00
committed by GitHub
parent 5dcd635403 a34bb2608d
commit 2fa2a5a53c
46 changed files with 11646 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
swift/downgrades/15a630f68e14f053932cf6a23797f43d958eedc9/downgrade.ql Normal file
View File

@@ -0,0 +1,17 @@
class Element extends @element {
string toString() { none() }
}
query predicate new_unspecified_elements(Element e, string property, string error) {
unspecified_elements(e, property, error)
or
error = "ThenStmt nodes removed during database downgrade. Please update your CodeQL code." and
property = "" and
then_stmts(e, _)
}
query predicate new_unspecified_element_children(Element e, int index, Element child) {
unspecified_element_children(e, index, child)
or
then_stmts(e, child) and index = 0
}

2786
swift/downgrades/15a630f68e14f053932cf6a23797f43d958eedc9/old.dbscheme Normal file
View File

File diff suppressed because it is too large Load Diff

2780
swift/downgrades/15a630f68e14f053932cf6a23797f43d958eedc9/swift.dbscheme Normal file
View File

File diff suppressed because it is too large Load Diff

5
swift/downgrades/15a630f68e14f053932cf6a23797f43d958eedc9/upgrade.properties Normal file
View File

@@ -0,0 +1,5 @@
description: Remove `ThenStmt` wrapper nodes.
compatibility: partial
unspecified_elements.rel: run downgrade.ql new_unspecified_elements
unspecified_element_children.rel: run downgrade.ql new_unspecified_element_children
then_stmts.rel: delete

1
swift/extractor/infra/SwiftTagTraits.h
View File

@@ -43,6 +43,7 @@ MAP(swift::Stmt, StmtTag)
MAP(swift::BraceStmt, BraceStmtTag)
MAP(swift::ReturnStmt, ReturnStmtTag)
MAP(swift::YieldStmt, YieldStmtTag)
MAP(swift::ThenStmt, ThenStmtTag)
MAP(swift::DeferStmt, DeferStmtTag)
MAP(swift::LabeledStmt, LabeledStmtTag)
MAP(swift::LabeledConditionalStmt, LabeledConditionalStmtTag)

6
swift/extractor/translators/DeclTranslator.cpp
View File

@@ -269,8 +269,8 @@ void DeclTranslator::fillOperatorDecl(const swift::OperatorDecl& decl,
void DeclTranslator::fillTypeDecl(const swift::TypeDecl& decl, codeql::TypeDecl& entry) {
entry.name = decl.getNameStr().str();
for (auto& typeLoc : decl.getInherited()) {
if (auto type = typeLoc.getType()) {
for (auto& inherited : decl.getInherited().getEntries()) {
if (auto type = inherited.getType()) {
entry.inherited_types.push_back(dispatcher.fetchLabel(type));
}
}
@@ -289,7 +289,7 @@ void DeclTranslator::fillIterableDeclContext(const swift::IterableDeclContext& d
void DeclTranslator::fillVarDecl(const swift::VarDecl& decl, codeql::VarDecl& entry) {
entry.name = decl.getNameStr().str();
entry.type = dispatcher.fetchLabel(decl.getType());
entry.type = dispatcher.fetchLabel(decl.getTypeInContext());
entry.parent_pattern = dispatcher.fetchOptionalLabel(decl.getParentPattern());
entry.parent_initializer = dispatcher.fetchOptionalLabel(decl.getParentInitializer());
if (decl.hasAttachedPropertyWrapper()) {

6
swift/extractor/translators/StmtTranslator.cpp
View File

@@ -218,4 +218,10 @@ codeql::DiscardStmt StmtTranslator::translateDiscardStmt(const swift::DiscardStm
return entry;
}
codeql::ThenStmt StmtTranslator::translateThenStmt(const swift::ThenStmt& stmt) {
auto entry = dispatcher.createEntry(stmt);
entry.result = dispatcher.fetchLabel(stmt.getResult());
return entry;
}
} // namespace codeql

1
swift/extractor/translators/StmtTranslator.h
View File

@@ -40,6 +40,7 @@ class StmtTranslator : public AstTranslatorBase<StmtTranslator> {
codeql::FailStmt translateFailStmt(const swift::FailStmt& stmt);
codeql::PoundAssertStmt translatePoundAssertStmt(const swift::PoundAssertStmt& stmt);
codeql::DiscardStmt translateDiscardStmt(const swift::DiscardStmt& stmt);
codeql::ThenStmt translateThenStmt(const swift::ThenStmt& stmt);
private:
void fillLabeledStmt(const swift::LabeledStmt& stmt, codeql::LabeledStmt& entry);

14
swift/ql/.generated.list generated
View File

@@ -271,6 +271,8 @@ lib/codeql/swift/elements/stmt/ReturnStmtConstructor.qll 2c66c1b1ece31bcfee06c87
lib/codeql/swift/elements/stmt/Stmt.qll b21643c4dd6a7e22c422df36c66d7389918c71cb05e71b58c2086f998035ca8a 2fd87fce67d61461dfd40f1430b67e2611729eb3205fd508a79c4fabf6cc51b8
lib/codeql/swift/elements/stmt/StmtConditionConstructor.qll 978a7c1dd6cc51194c847a6ed4785200515d90d484d013c367d7b86a177656f2 4a0dd278470676232b29e2ed02fef5b88061d9dd3ca082238e5fc4e978dcd66f
lib/codeql/swift/elements/stmt/SwitchStmtConstructor.qll 8431feb4b68505ac0072be07a6ed07d71559daf5443e5164d0aad38bc8c5cc12 98a9e32dc3774e47070ec3b0f7f4febfe2ec298858955275e22471682da270bc
lib/codeql/swift/elements/stmt/ThenStmt.qll 70c38206142fa0bc5bbcfe3661dbfb4dcc53416160eef3e6f301504cddb4b0ae f7066479d4319db057de7d49d723dbfa9a6bc221738f8ea6cea795f5ef1e341a
lib/codeql/swift/elements/stmt/ThenStmtConstructor.qll 88823800957584b9a5f9601f85f75875d45d262718d736851b0e40d4028c5dc1 98c480d82177e5d223307aa0e2fe82bf859915b050ec66a5d959f7d0e58ee068
lib/codeql/swift/elements/stmt/ThrowStmtConstructor.qll 974ec76e814030df10362a516da9aa0f90dbb1040ef3297a12632b0654d95dfc a02f73cd6f36d96d6093ffb4608be6e5fb15d8412f3c4ff0f4648b82b909f582
lib/codeql/swift/elements/stmt/WhileStmtConstructor.qll a49c46100da57dc6e8b3cfcc665bd2d6cfa1b49efb0f7d66f49ed719b42ff34d d527c8f6d08b91917d209554c76aade2b35b90c09caec6aa21c3ba951e8e8bf7
lib/codeql/swift/elements/stmt/YieldStmtConstructor.qll ac2047e02add0796b5eff4180c777dc4ebd4bc52c2083036b959e3a1caa41bad 78209a97874bc3bb2c4c3b919ff4b9e68010b0d047d2b455881b980f5100767a
@@ -390,7 +392,7 @@ lib/codeql/swift/elements/type/UnresolvedTypeConstructor.qll 7f75d489b4d7ce65cae
lib/codeql/swift/elements/type/VariadicSequenceTypeConstructor.qll fc74a5a2a2effa28ef24509b20ee4373d97cf6e8c71840121bb031c6adedf584 c9b2effc1d01c13c5e6a74a111122fa79a2f6554dda3cb016d68ba397e566ec4
lib/codeql/swift/elements/type/WeakStorageType.qll edd13dd97b53040684409e187c1f975bcada6807c919e1345d8977144dbebb6f 9434c044d264a7f5f503a6422c106c9b8fedf74aaae314174473a29ea6ed17b9
lib/codeql/swift/elements/type/WeakStorageTypeConstructor.qll 5fdce3716aba6318522174a2c455a63480970222ae81c732fb19c6dd3ae2d271 60ea79d6943e129deba0deccb566cf9d73f78398b0f7f0212674d91287d6b2ae
lib/codeql/swift/elements.qll 27da89b0b50ea17b96a47aad31453ff0d43b8277ab660385f785879ce6cc243e 27da89b0b50ea17b96a47aad31453ff0d43b8277ab660385f785879ce6cc243e
lib/codeql/swift/elements.qll bb863ff140bfaa0bf887708f421a16c85816886f4d061bbc5af752a4e4d810d3 bb863ff140bfaa0bf887708f421a16c85816886f4d061bbc5af752a4e4d810d3
lib/codeql/swift/generated/AstNode.qll 68877daa9e14b462247ac6b7b724f5e683288e39953a8ebb02a362b7d1df8e4c 54d3512744738e1ee15645f3af116437053cb5209687f4106361a1943b38b666
lib/codeql/swift/generated/AvailabilityInfo.qll e74e218a1ab00416cb8823610ff93642101aa784aa61cbc2b4deef61471a5bac e2c6c19860dc3e6e211041c95d8e6d52c3505ccff7018b80a849735cc98141af
lib/codeql/swift/generated/AvailabilitySpec.qll a8afc5071887a67b4e0dec27356ab8cbf3e176b5358cb34c785e3015b2cad5a2 c7f88b0d701612c821359c983b3102f31b23edc211c3dcfe97de5adec61af386
@@ -407,12 +409,12 @@ lib/codeql/swift/generated/Locatable.qll 6cb437dd7ff7331429ec6586b0af50b1af15e4f
lib/codeql/swift/generated/Location.qll 3f3bad413be87d05a596fe7b8004f415c2caa98cb759021a6aad20b589b7d700 ed30ed646962b3ffb6b47c97c6434fe47a6b1ea8e3f2e0589577bea5cf96c88e
lib/codeql/swift/generated/MacroRole.qll aaf5631c49de81e046854955341202d6d3516713cd09bc2e7b870e40c261cc9f 6cd17d40cbf1d8fa4ef01dfb8b3462b7cee902e6058fb76417c2035be12481d1
lib/codeql/swift/generated/OtherAvailabilitySpec.qll 06393a08e8da36106c5ec6efb9f1bd56a5c7b3d3f3d0bcefc6fa07fa96860c31 06393a08e8da36106c5ec6efb9f1bd56a5c7b3d3f3d0bcefc6fa07fa96860c31
lib/codeql/swift/generated/ParentChild.qll 523f0fdf11a8007a80b35d7f8b99f736face08513311c8e998ca20ae1e535ebe 2829f5e61adbd863f4ad823ecfd7c1bb5eccaf14bb121b85ad460175b733fe30
lib/codeql/swift/generated/ParentChild.qll eae164aa8a78e883e707fba6c671ff2cd0ddab1084b0871fc5ae27c44cded4c5 3af88b63e21d58090f9702e6e4716a5b8a5a65897b8c92362b6e3c0fba60ddc2
lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll 5355be9da8b778d1d8ae60d25d9c3394477da24f94e8a6ab4484c6a16d07cd7c 075438c1762ec0a7775004b39032dcf85aada038a4269e6f428c34b8282786e9
lib/codeql/swift/generated/PureSynthConstructors.qll 40f5c0c573ce12f16322d9efb12306750f672254cbc36a200c298cb08e504229 40f5c0c573ce12f16322d9efb12306750f672254cbc36a200c298cb08e504229
lib/codeql/swift/generated/Raw.qll 252bb96829d1c284ec8036e54f14db83d5a3c9be1c2bdc05bc7add7cf46ca618 4cdc6643270b2fc78805635a738dfd506bdee9dc770bc74ec66558c1efff7697
lib/codeql/swift/generated/Synth.qll b8bf274c60f60df473ed9093b50906822613dee047bda19ad37d07c308f04564 692590b0b18556a23cc1de0c8a60fd17534791dccb876cab85170bbf78392bd1
lib/codeql/swift/generated/SynthConstructors.qll d3b4b5d93be989004d7c05bbc32a5b859eaad768b4a52cfb01a767c90542f9a4 d3b4b5d93be989004d7c05bbc32a5b859eaad768b4a52cfb01a767c90542f9a4
lib/codeql/swift/generated/Raw.qll 10633b948918d315b98b6ff6733d4c368e082c5afd78334c0862291f9d883216 66abde4c9a2283773033d90a4633c1203d6563fc238ddbd48fdf1b910f90021a
lib/codeql/swift/generated/Synth.qll 848284b2ae9854c5be74e5ef50a51090e248e5c9c02289a6bc63455e440122da e2607f46a4830e81718ca1636fa65bc29420a18539443d109fafd7f1af1591ce
lib/codeql/swift/generated/SynthConstructors.qll 7edffc30d3dddc4d73241f4e0d3df4501a99eb38d056f82043ed69e481404342 7edffc30d3dddc4d73241f4e0d3df4501a99eb38d056f82043ed69e481404342
lib/codeql/swift/generated/UnknownFile.qll 5325944cf96a72d5d224597745e15960fb6a9448b96b6644ececd6344dfd9d74 5325944cf96a72d5d224597745e15960fb6a9448b96b6644ececd6344dfd9d74
lib/codeql/swift/generated/UnknownLocation.qll dfdeb8eedb2564eccaac416695784ea04fe9754a3e109e8484c695021af4e554 dfdeb8eedb2564eccaac416695784ea04fe9754a3e109e8484c695021af4e554
lib/codeql/swift/generated/UnspecifiedElement.qll 8ecc275cc131fe5aa61052299e10c49c3718f96416df9eeacabf5aea34d97982 b02dfcf0df3859551b176e065291da943670ab4da6ed84d02a0861ff689001c6
@@ -624,6 +626,7 @@ lib/codeql/swift/generated/stmt/ReturnStmt.qll 82910f3c8360b39a2b5b649d41d206372
lib/codeql/swift/generated/stmt/Stmt.qll 3912b8b28aaf01624ac377bdf8caae2c20741c9ef98cef75156e1b0c3a8b5163 9805adf45af0ad4a0734477a5d80b5bcbb2bece8e83411a76aba96042d0c7f18
lib/codeql/swift/generated/stmt/StmtCondition.qll cf03296a32292d836ff9050ffc6d3d5fc56c90f9473e7f70a67116417590ee76 c5694a39bdcab60beaa04a275ec99616dd868c12c878513f783a0eb52f328ba9
lib/codeql/swift/generated/stmt/SwitchStmt.qll 4e0ee2230d295e7b592e837b3ad94f122540f06107139a279302f67cff5cefe8 5bd92a4997e7308b046d985f04f21b1f4284c6f782b56563c1020021f34755a4
lib/codeql/swift/generated/stmt/ThenStmt.qll b0fb20f9ebfa836675912c385c133acbfc57f48b431a58ede48099cac131491d c78838d9084ff18f813e9cad68a56f8a838ed4ac59f046411442226bb41ad763
lib/codeql/swift/generated/stmt/ThrowStmt.qll 888825d19ced5a03dad6a20af8f8d86e8d8eb8fd8f69eaba9c0d0b58cbefac90 517d4aa93a9ae1874ac64dc1d6a170b4cde8e51c8f842dcba058ff2c61086ffd
lib/codeql/swift/generated/stmt/WhileStmt.qll cca25bd25aaea758dce474354d5e57d92eaa5ca5abb918f8d677feb2be6d3b0d d7ae1bdd69c25d8eb882522053b07048f3a0f1bb5ed8dcbd5b3efbfe0f72631b
lib/codeql/swift/generated/stmt/YieldStmt.qll c4619558f406dcf3ed1a0171b6c4b93c415fb5419745391c4df217d45e76b3f0 ca5c954cacf21233a35b88fe3e6de2eba0017e4e08b3f51b9d2bac6b01d8a219
@@ -898,6 +901,7 @@ test/extractor-tests/generated/expr/RebindSelfInInitializerExpr/MISSING_SOURCE.t
test/extractor-tests/generated/expr/RegexLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.ql efbfaf798a86c5a7d8053a22f61249208db31edcdaf750f2671057ad2f376806 d3256d2315d5bd5420b40a4be9522752bb57897807ea3853a7a4c61e9a05e478
test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr_getType.ql bfbeb24e57078b1bbaae331a6f3e8d13d0efbdca2228dbbca53b86d5e287efd8 864351b87f7981825e148a479e997936c653a4581e8a893eaed96ddeed891eab
test/extractor-tests/generated/expr/SingleValueStmtExpr/ThenStmt.ql 0bd26223160e846cfa64fad75672eab18b8ce27e24d802bc711f42a540d13ac7 6a5b7760c44ee34c6e33a517a52622cc70dbdee88eb20eaea787be0e1f888996
test/extractor-tests/generated/expr/StringLiteralExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
test/extractor-tests/generated/expr/SubscriptExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7
test/extractor-tests/generated/expr/SuperRefExpr/MISSING_SOURCE.txt 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7 66846d526b0bc4328735c3c4dd9c390a9325da5b5dfd42ec07622f9c7108a7d7

4
swift/ql/.gitattributes generated vendored
View File

@@ -273,6 +273,8 @@
/lib/codeql/swift/elements/stmt/Stmt.qll linguist-generated
/lib/codeql/swift/elements/stmt/StmtConditionConstructor.qll linguist-generated
/lib/codeql/swift/elements/stmt/SwitchStmtConstructor.qll linguist-generated
/lib/codeql/swift/elements/stmt/ThenStmt.qll linguist-generated
/lib/codeql/swift/elements/stmt/ThenStmtConstructor.qll linguist-generated
/lib/codeql/swift/elements/stmt/ThrowStmtConstructor.qll linguist-generated
/lib/codeql/swift/elements/stmt/WhileStmtConstructor.qll linguist-generated
/lib/codeql/swift/elements/stmt/YieldStmtConstructor.qll linguist-generated
@@ -626,6 +628,7 @@
/lib/codeql/swift/generated/stmt/Stmt.qll linguist-generated
/lib/codeql/swift/generated/stmt/StmtCondition.qll linguist-generated
/lib/codeql/swift/generated/stmt/SwitchStmt.qll linguist-generated
/lib/codeql/swift/generated/stmt/ThenStmt.qll linguist-generated
/lib/codeql/swift/generated/stmt/ThrowStmt.qll linguist-generated
/lib/codeql/swift/generated/stmt/WhileStmt.qll linguist-generated
/lib/codeql/swift/generated/stmt/YieldStmt.qll linguist-generated
@@ -900,6 +903,7 @@
/test/extractor-tests/generated/expr/RegexLiteralExpr/MISSING_SOURCE.txt linguist-generated
/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.ql linguist-generated
/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr_getType.ql linguist-generated
/test/extractor-tests/generated/expr/SingleValueStmtExpr/ThenStmt.ql linguist-generated
/test/extractor-tests/generated/expr/StringLiteralExpr/MISSING_SOURCE.txt linguist-generated
/test/extractor-tests/generated/expr/SubscriptExpr/MISSING_SOURCE.txt linguist-generated
/test/extractor-tests/generated/expr/SuperRefExpr/MISSING_SOURCE.txt linguist-generated

4
swift/ql/integration-tests/posix-only/deduplication/Decls.expected
View File

@@ -46,8 +46,8 @@
| Sources/deduplication/def.swift:26:36:26:39 | _ | ParamDecl | A [GenericTypeParamType] |
| Sources/deduplication/def.swift:26:42:26:45 | _ | ParamDecl | B [GenericTypeParamType] |
| Sources/deduplication/def.swift:26:48:26:51 | _ | ParamDecl | C [GenericTypeParamType] |
| Sources/deduplication/def.swift:28:1:28:21 | Protocol1 | ProtocolDecl | Protocol1.Protocol [MetatypeType] |
| Sources/deduplication/def.swift:29:1:31:1 | Protocol2 | ProtocolDecl | Protocol2.Protocol [MetatypeType] |
| Sources/deduplication/def.swift:28:1:28:21 | Protocol1 | ProtocolDecl | Protocol1.Type [MetatypeType] |
| Sources/deduplication/def.swift:29:1:31:1 | Protocol2 | ProtocolDecl | Protocol2.Type [MetatypeType] |
| Sources/deduplication/def.swift:30:5:30:20 | Associated | AssociatedTypeDecl | Self.Associated.Type [MetatypeType] |
| Sources/deduplication/def.swift:32:1:32:14 | Class | ClassDecl | Class.Type [MetatypeType] |
| Sources/deduplication/def.swift:32:7:32:7 | Class.deinit() | Deinitializer | (Class) -> () -> () [FunctionType] |

5
swift/ql/lib/change-notes/2024-03-28-swift-5.10.md Normal file
View File

@@ -0,0 +1,5 @@
---
category: majorAnalysis
---
* Upgraded to Swift 5.10
* New AST node is extracted: `ThenStmt`

9
swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
View File

@@ -255,6 +255,15 @@ module Stmts {
}
}
private class ThenStmtTree extends AstStandardPostOrderTree {
override ThenStmt ast;
final override ControlFlowElement getChildNode(int i) {
i = 0 and
result.asAstNode() = ast.getResult()
}
}
private class FailTree extends AstLeafTree {
override FailStmt ast;
}

1
swift/ql/lib/codeql/swift/elements.qll generated
View File

@@ -227,6 +227,7 @@ import codeql.swift.elements.stmt.ReturnStmt
import codeql.swift.elements.stmt.Stmt
import codeql.swift.elements.stmt.StmtCondition
import codeql.swift.elements.stmt.SwitchStmt
import codeql.swift.elements.stmt.ThenStmt
import codeql.swift.elements.stmt.ThrowStmt
import codeql.swift.elements.stmt.WhileStmt
import codeql.swift.elements.stmt.YieldStmt

19
swift/ql/lib/codeql/swift/elements/stmt/ThenStmt.qll generated Normal file
View File

@@ -0,0 +1,19 @@
// generated by codegen/codegen.py, remove this comment if you wish to edit this file
/**
* This module provides a hand-modifiable wrapper around the generated class `ThenStmt`.
*/
private import codeql.swift.generated.stmt.ThenStmt
/**
* A statement implicitly wrapping values to be used in branches of if/switch expressions. For example in:
* ```
* let rank = switch value {
* case 0..<0x80: 1
* case 0x80..<0x0800: 2
* default: 3
* }
* ```
* the literal expressions `1`, `2` and `3` are wrapped in `ThenStmt`.
*/
class ThenStmt extends Generated::ThenStmt { }

14
swift/ql/lib/codeql/swift/elements/stmt/ThenStmtConstructor.qll generated Normal file
View File

@@ -0,0 +1,14 @@
// generated by codegen/codegen.py, remove this comment if you wish to edit this file
/**
* This module defines the hook used internally to tweak the characteristic predicate of
* `ThenStmt` synthesized instances.
* INTERNAL: Do not use.
*/
private import codeql.swift.generated.Raw
/**
* The characteristic predicate of `ThenStmt` synthesized instances.
* INTERNAL: Do not use.
*/
predicate constructThenStmt(Raw::ThenStmt id) { any() }

18
swift/ql/lib/codeql/swift/generated/ParentChild.qll generated
View File

@@ -3780,6 +3780,22 @@ private module Impl {
)
}
private Element getImmediateChildOfThenStmt(ThenStmt e, int index, string partialPredicateCall) {
exists(int b, int bStmt, int n, int nResult |
b = 0 and
bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
n = bStmt and
nResult = n + 1 and
(
none()
or
result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
or
index = n and result = e.getImmediateResult() and partialPredicateCall = "Result()"
)
)
}
private Element getImmediateChildOfThrowStmt(ThrowStmt e, int index, string partialPredicateCall) {
exists(int b, int bStmt, int n, int nSubExpr |
b = 0 and
@@ -5466,6 +5482,8 @@ private module Impl {
or
result = getImmediateChildOfReturnStmt(e, index, partialAccessor)
or
result = getImmediateChildOfThenStmt(e, index, partialAccessor)
or
result = getImmediateChildOfThrowStmt(e, index, partialAccessor)
or
result = getImmediateChildOfYieldStmt(e, index, partialAccessor)

21
swift/ql/lib/codeql/swift/generated/Raw.qll generated
View File

@@ -2923,6 +2923,27 @@ module Raw {
Expr getResult() { return_stmt_results(this, result) }
}
/**
* INTERNAL: Do not use.
* A statement implicitly wrapping values to be used in branches of if/switch expressions. For example in:
* ```
* let rank = switch value {
* case 0..<0x80: 1
* case 0x80..<0x0800: 2
* default: 3
* }
* ```
* the literal expressions `1`, `2` and `3` are wrapped in `ThenStmt`.
*/
class ThenStmt extends @then_stmt, Stmt {
override string toString() { result = "ThenStmt" }
/**
* Gets the result of this then statement.
*/
Expr getResult() { then_stmts(this, result) }
}
/**
* INTERNAL: Do not use.
*/

24
swift/ql/lib/codeql/swift/generated/Synth.qll generated
View File

@@ -823,6 +823,10 @@ module Synth {
* INTERNAL: Do not use.
*/
TSwitchStmt(Raw::SwitchStmt id) { constructSwitchStmt(id) } or
/**
* INTERNAL: Do not use.
*/
TThenStmt(Raw::ThenStmt id) { constructThenStmt(id) } or
/**
* INTERNAL: Do not use.
*/
@@ -1311,7 +1315,7 @@ module Synth {
class TStmt =
TBraceStmt or TBreakStmt or TCaseStmt or TContinueStmt or TDeferStmt or TDiscardStmt or
TFailStmt or TFallthroughStmt or TLabeledStmt or TPoundAssertStmt or TReturnStmt or
TThrowStmt or TYieldStmt;
TThenStmt or TThrowStmt or TYieldStmt;
/**
* INTERNAL: Do not use.
@@ -2891,6 +2895,13 @@ module Synth {
cached
TSwitchStmt convertSwitchStmtFromRaw(Raw::Element e) { result = TSwitchStmt(e) }
/**
* INTERNAL: Do not use.
* Converts a raw element to a synthesized `TThenStmt`, if possible.
*/
cached
TThenStmt convertThenStmtFromRaw(Raw::Element e) { result = TThenStmt(e) }
/**
* INTERNAL: Do not use.
* Converts a raw element to a synthesized `TThrowStmt`, if possible.
@@ -4116,6 +4127,8 @@ module Synth {
or
result = convertReturnStmtFromRaw(e)
or
result = convertThenStmtFromRaw(e)
or
result = convertThrowStmtFromRaw(e)
or
result = convertYieldStmtFromRaw(e)
@@ -5854,6 +5867,13 @@ module Synth {
cached
Raw::Element convertSwitchStmtToRaw(TSwitchStmt e) { e = TSwitchStmt(result) }
/**
* INTERNAL: Do not use.
* Converts a synthesized `TThenStmt` to a raw DB element, if possible.
*/
cached
Raw::Element convertThenStmtToRaw(TThenStmt e) { e = TThenStmt(result) }
/**
* INTERNAL: Do not use.
* Converts a synthesized `TThrowStmt` to a raw DB element, if possible.
@@ -7079,6 +7099,8 @@ module Synth {
or
result = convertReturnStmtToRaw(e)
or
result = convertThenStmtToRaw(e)
or
result = convertThrowStmtToRaw(e)
or
result = convertYieldStmtToRaw(e)

1
swift/ql/lib/codeql/swift/generated/SynthConstructors.qll generated
View File

@@ -190,6 +190,7 @@ import codeql.swift.elements.stmt.RepeatWhileStmtConstructor
import codeql.swift.elements.stmt.ReturnStmtConstructor
import codeql.swift.elements.stmt.StmtConditionConstructor
import codeql.swift.elements.stmt.SwitchStmtConstructor
import codeql.swift.elements.stmt.ThenStmtConstructor
import codeql.swift.elements.stmt.ThrowStmtConstructor
import codeql.swift.elements.stmt.WhileStmtConstructor
import codeql.swift.elements.stmt.YieldStmtConstructor

54
swift/ql/lib/codeql/swift/generated/stmt/ThenStmt.qll generated Normal file
View File

@@ -0,0 +1,54 @@
// generated by codegen/codegen.py
/**
* This module provides the generated definition of `ThenStmt`.
* INTERNAL: Do not import directly.
*/
private import codeql.swift.generated.Synth
private import codeql.swift.generated.Raw
import codeql.swift.elements.expr.Expr
import codeql.swift.elements.stmt.Stmt
/**
* INTERNAL: This module contains the fully generated definition of `ThenStmt` and should not
* be referenced directly.
*/
module Generated {
/**
* A statement implicitly wrapping values to be used in branches of if/switch expressions. For example in:
* ```
* let rank = switch value {
* case 0..<0x80: 1
* case 0x80..<0x0800: 2
* default: 3
* }
* ```
* the literal expressions `1`, `2` and `3` are wrapped in `ThenStmt`.
* INTERNAL: Do not reference the `Generated::ThenStmt` class directly.
* Use the subclass `ThenStmt`, where the following predicates are available.
*/
class ThenStmt extends Synth::TThenStmt, Stmt {
override string getAPrimaryQlClass() { result = "ThenStmt" }
/**
* Gets the result of this then statement.
*
* This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
* behavior of both the `Immediate` and non-`Immediate` versions.
*/
Expr getImmediateResult() {
result =
Synth::convertExprFromRaw(Synth::convertThenStmtToRaw(this).(Raw::ThenStmt).getResult())
}
/**
* Gets the result of this then statement.
*/
final Expr getResult() {
exists(Expr immediate |
immediate = this.getImmediateResult() and
result = immediate.resolve()
)
}
}
}

6
swift/ql/lib/swift.dbscheme generated
View File

@@ -1846,6 +1846,7 @@ condition_element_availabilities( //dir=stmt
| @labeled_stmt
| @pound_assert_stmt
| @return_stmt
| @then_stmt
| @throw_stmt
| @yield_stmt
;
@@ -1974,6 +1975,11 @@ return_stmt_results( //dir=stmt
int result: @expr_or_none ref
);
then_stmts( //dir=stmt
unique int id: @then_stmt,
int result: @expr_or_none ref
);
throw_stmts( //dir=stmt
unique int id: @throw_stmt,
int sub_expr: @expr_or_none ref

2780
swift/ql/lib/upgrades/60be249ad164f6e4b43c203323f1b3956dc97c2f/old.dbscheme Normal file
View File

File diff suppressed because it is too large Load Diff

2786
swift/ql/lib/upgrades/60be249ad164f6e4b43c203323f1b3956dc97c2f/swift.dbscheme Normal file
View File

File diff suppressed because it is too large Load Diff

2
swift/ql/lib/upgrades/60be249ad164f6e4b43c203323f1b3956dc97c2f/upgrade.properties Normal file
View File

@@ -0,0 +1,2 @@
description: Add `ThenStmt` wrapper nodes.
compatibility: full

2
swift/ql/test/extractor-tests/expressions/all.expected
View File

@@ -31,7 +31,7 @@
| expressions.swift:15:11:15:11 | Int.Type | TypeExpr |
| expressions.swift:15:14:15:14 | 0 | IntegerLiteralExpr |
| expressions.swift:16:11:16:11 | AnError.Type | TypeExpr |
| expressions.swift:16:11:16:19 | (Error) ... | ErasureExpr |
| expressions.swift:16:11:16:19 | (any Error) ... | ErasureExpr |
| expressions.swift:16:11:16:19 | .failed | MethodLookupExpr |
| expressions.swift:16:19:16:19 | failed | DeclRefExpr |
| expressions.swift:20:1:20:16 | try! ... | ForceTryExpr |

2
swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.expected
View File

@@ -1,5 +1,5 @@
| implicit_conversions.swift:2:3:2:3 | (UnsafePointer<CChar>) ... | StringToPointerExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:2:3:2:3 | Hello |
| implicit_conversions.swift:4:16:4:16 | (Int?) ... | InjectIntoOptionalExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:4:16:4:16 | 42 |
| implicit_conversions.swift:5:25:5:25 | (Equatable) ... | ErasureExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:5:25:5:25 | 42 |
| implicit_conversions.swift:5:25:5:25 | (any Equatable) ... | ErasureExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:5:25:5:25 | 42 |
| implicit_conversions.swift:12:3:12:5 | (@lvalue (() -> Void)?) ... | AbiSafeConversionExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:3:12:5 | .b |
| implicit_conversions.swift:12:9:12:10 | ((() -> Void)?) ... | InjectIntoOptionalExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:9:12:10 | { ... } |

2
swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr_getType.expected
View File

@@ -1,5 +1,5 @@
| implicit_conversions.swift:2:3:2:3 | (UnsafePointer<CChar>) ... | UnsafePointer<CChar> |
| implicit_conversions.swift:4:16:4:16 | (Int?) ... | Int? |
| implicit_conversions.swift:5:25:5:25 | (Equatable) ... | Equatable |
| implicit_conversions.swift:5:25:5:25 | (any Equatable) ... | any Equatable |
| implicit_conversions.swift:12:3:12:5 | (@lvalue (() -> Void)?) ... | @lvalue (() -> Void)? |
| implicit_conversions.swift:12:9:12:10 | ((() -> Void)?) ... | (() -> Void)? |

3
swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.expected
View File

@@ -1 +1,2 @@
| test.swift:2:3:5:3 | SingleValueStmtExpr | hasType: | yes | getStmt: | test.swift:2:3:5:3 | switch x { ... } |
| test.swift:2:3:7:3 | SingleValueStmtExpr | hasType: | yes | getStmt: | test.swift:2:3:7:3 | switch x { ... } |
| test.swift:11:3:11:30 | SingleValueStmtExpr | hasType: | yes | getStmt: | test.swift:11:3:11:30 | if ... then { ... } else { ... } |

3
swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr_getType.expected
View File

@@ -1 +1,2 @@
| test.swift:2:3:5:3 | SingleValueStmtExpr | Int |
| test.swift:2:3:7:3 | SingleValueStmtExpr | Int |
| test.swift:11:3:11:30 | SingleValueStmtExpr | Int |

4
swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/ThenStmt.expected Normal file
View File

@@ -0,0 +1,4 @@
| test.swift:4:5:4:5 | ThenStmt | getResult: | test.swift:4:5:4:5 | 1 |
| test.swift:6:5:6:5 | ThenStmt | getResult: | test.swift:6:5:6:5 | 0 |
| test.swift:11:17:11:17 | ThenStmt | getResult: | test.swift:11:17:11:17 | 1 |
| test.swift:11:28:11:28 | ThenStmt | getResult: | test.swift:11:28:11:28 | 0 |

10
swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/ThenStmt.ql generated Normal file
View File

@@ -0,0 +1,10 @@
// generated by codegen/codegen.py
import codeql.swift.elements
import TestUtils
from ThenStmt x, Expr getResult
where
toBeTested(x) and
not x.isUnknown() and
getResult = x.getResult()
select x, "getResult:", getResult

6
swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/test.swift
View File

@@ -1,6 +1,12 @@
func a(_ x: Int) -> Int {
switch x {
case 0:
1
default:
0
}
}
func b(_ x: Int) -> Int {
if (x < 42) { 1 } else { 0 }
}

6
swift/ql/test/extractor-tests/generated/type/ExistentialType/ExistentialType.expected
View File

@@ -1,3 +1,3 @@
| ExplicitExistential | getName: | ExplicitExistential | getCanonicalType: | ExplicitExistential | getConstraint: | ExplicitExistential |
| ImplicitExistential | getName: | ImplicitExistential | getCanonicalType: | ImplicitExistential | getConstraint: | ImplicitExistential |
| P1 & P2 | getName: | P1 & P2 | getCanonicalType: | P1 & P2 | getConstraint: | P1 & P2 |
| any ExplicitExistential | getName: | any ExplicitExistential | getCanonicalType: | any ExplicitExistential | getConstraint: | ExplicitExistential |
| any ImplicitExistential | getName: | any ImplicitExistential | getCanonicalType: | any ImplicitExistential | getConstraint: | ImplicitExistential |
| any P1 & P2 | getName: | any P1 & P2 | getCanonicalType: | any P1 & P2 | getConstraint: | P1 & P2 |

2
swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected
View File

@@ -1 +1 @@
| C & P1 & P2 | getName: | C & P1 & P2 | getCanonicalType: | C & P1 & P2 | getInterfaceType: | \u03c4_0_0 | hasSuperclass: | yes | getNumberOfProtocols: | 2 |
| any C & P1 & P2 | getName: | any C & P1 & P2 | getCanonicalType: | any C & P1 & P2 | getInterfaceType: | \u03c4_0_0 | hasSuperclass: | yes | getNumberOfProtocols: | 2 |

4
swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType_getProtocol.expected
View File

@@ -1,2 +1,2 @@
| C & P1 & P2 | 0 | opened_archetypes.swift:3:1:3:14 | P1 |
| C & P1 & P2 | 1 | opened_archetypes.swift:9:1:9:14 | P2 |
| any C & P1 & P2 | 0 | opened_archetypes.swift:3:1:3:14 | P1 |
| any C & P1 & P2 | 1 | opened_archetypes.swift:9:1:9:14 | P2 |

2
swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType_getSuperclass.expected
View File

@@ -1 +1 @@
| C & P1 & P2 | C |
| any C & P1 & P2 | C |

93
swift/ql/test/library-tests/ast/PrintAst.expected
View File

@@ -88,7 +88,7 @@ cfg.swift:
# 19| getBase(): [TypeExpr] MyError.Type
# 19| getTypeRepr(): [TypeRepr] MyError
# 19| getMethodRef(): [DeclRefExpr] error1
# 19| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
# 19| getSubExpr().getFullyConverted(): [ErasureExpr] (any Error) ...
# 21| getElement(1): [GuardStmt] guard ... else { ... }
# 21| getCondition(): [StmtCondition] StmtCondition
# 21| getElement(0): [ConditionElement] ... .<=(_:_:) ...
@@ -118,7 +118,7 @@ cfg.swift:
# 22| getExpr(): [DeclRefExpr] x
# 22| getArgument(1): [Argument] : 1
# 22| getExpr(): [IntegerLiteralExpr] 1
# 22| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
# 22| getSubExpr().getFullyConverted(): [ErasureExpr] (any Error) ...
# 26| [NamedFunction] tryCatch(x:)
# 26| InterfaceType = (Int) -> Int
# 26| getParam(0): [ParamDecl] x
@@ -205,7 +205,7 @@ cfg.swift:
# 39| getPattern(): [NamedPattern] error
# 39| getPattern().getFullyUnresolved(): [BindingPattern] let ...
# 39| getVariable(0): [ConcreteVarDecl] error
# 39| Type = Error
# 39| Type = any Error
# 39| getBody(): [BraceStmt] { ... }
# 40| getElement(0): [CallExpr] call to print(_:separator:terminator:)
# 40| getFunction(): [DeclRefExpr] print(_:separator:terminator:)
@@ -3412,7 +3412,7 @@ cfg.swift:
# 564| getBody(): [BraceStmt] { ... }
# 564| getElement(0): [ReturnStmt] return
# 568| [NamedFunction] getMyProtocol()
# 568| InterfaceType = () -> MyProtocol
# 568| InterfaceType = () -> any MyProtocol
# 568| getBody(): [BraceStmt] { ... }
# 568| getElement(0): [ReturnStmt] return ...
# 568| getResult(): [CallExpr] call to MyProcotolImpl.init()
@@ -3420,7 +3420,7 @@ cfg.swift:
# 568| getBase(): [TypeExpr] MyProcotolImpl.Type
# 568| getTypeRepr(): [TypeRepr] MyProcotolImpl
# 568| getMethodRef(): [DeclRefExpr] MyProcotolImpl.init()
# 568| getResult().getFullyConverted(): [ErasureExpr] (MyProtocol) ...
# 568| getResult().getFullyConverted(): [ErasureExpr] (any MyProtocol) ...
# 569| [NamedFunction] getMyProtocolImpl()
# 569| InterfaceType = () -> MyProcotolImpl
# 569| getBody(): [BraceStmt] { ... }
@@ -3436,9 +3436,9 @@ cfg.swift:
# 571| Type = Int
# 571| getBody(): [BraceStmt] { ... }
# 573| [NamedFunction] testOpenExistentialExpr(x:y:)
# 573| InterfaceType = (MyProtocol, MyProcotolImpl) -> ()
# 573| InterfaceType = (any MyProtocol, MyProcotolImpl) -> ()
# 573| getParam(0): [ParamDecl] x
# 573| Type = MyProtocol
# 573| Type = any MyProtocol
# 573| getParam(1): [ParamDecl] y
# 573| Type = MyProcotolImpl
# 573| getBody(): [BraceStmt] { ... }
@@ -3476,8 +3476,75 @@ cfg.swift:
# 577| getBase(): [CallExpr] call to getMyProtocolImpl()
# 577| getFunction(): [DeclRefExpr] getMyProtocolImpl()
# 577| getMethodRef(): [DeclRefExpr] source()
# 580| [Comment] // ---
# 580|
# 580| [NamedFunction] singleStmtExpr(_:)
# 580| InterfaceType = (Int) -> ()
# 580| getParam(0): [ParamDecl] x
# 580| Type = Int
# 580| getBody(): [BraceStmt] { ... }
# 581| getVariable(0): [ConcreteVarDecl] a
# 581| Type = Int
# 585| getVariable(1): [ConcreteVarDecl] b
# 585| Type = Int
# 581| getElement(0): [PatternBindingDecl] var ... = ...
# 581| getInit(0): [SingleValueStmtExpr] SingleValueStmtExpr
# 581| getStmt(): [SwitchStmt] switch x { ... }
# 581| getExpr(): [DeclRefExpr] x
# 582| getCase(0): [CaseStmt] case ...
# 582| getLabel(0): [CaseLabelItem] =~ ...
# 582| getPattern(): [ExprPattern] =~ ...
# 582| getSubExpr(): [BinaryExpr] ... .~=(_:_:) ...
# 582| getFunction(): [MethodLookupExpr] .~=(_:_:)
# 582| getBase(): [TypeExpr] Range<Int>.Type
# 582| getTypeRepr(): [TypeRepr] Range<Int>
# 582| getMethodRef(): [DeclRefExpr] ~=(_:_:)
# 582| getArgument(0): [Argument] : ... ...<(_:_:) ...
# 582| getExpr(): [BinaryExpr] ... ...<(_:_:) ...
# 582| getFunction(): [MethodLookupExpr] ...<(_:_:)
# 582| getBase(): [TypeExpr] Int.Type
# 582| getTypeRepr(): [TypeRepr] Int
# 582| getMethodRef(): [DeclRefExpr] ..<(_:_:)
# 582| getArgument(0): [Argument] : 0
# 582| getExpr(): [IntegerLiteralExpr] 0
# 582| getArgument(1): [Argument] : 5
# 582| getExpr(): [IntegerLiteralExpr] 5
# 582| getArgument(1): [Argument] : $match
# 582| getExpr(): [DeclRefExpr] $match
# 582| getBody(): [BraceStmt] { ... }
# 582| getElement(0): [ThenStmt] ThenStmt
# 582| getResult(): [IntegerLiteralExpr] 1
# 583| getCase(1): [CaseStmt] case ...
# 583| getLabel(0): [CaseLabelItem] _
# 583| getPattern(): [AnyPattern] _
# 583| getBody(): [BraceStmt] { ... }
# 583| getElement(0): [ThenStmt] ThenStmt
# 583| getResult(): [IntegerLiteralExpr] 2
# 581| getPattern(0): [NamedPattern] a
# 585| getElement(1): [PatternBindingDecl] var ... = ...
# 585| getInit(0): [SingleValueStmtExpr] SingleValueStmtExpr
# 585| getStmt(): [IfStmt] if ... then { ... } else { ... }
# 585| getCondition(): [StmtCondition] StmtCondition
# 585| getElement(0): [ConditionElement] ... .<(_:_:) ...
# 585| getBoolean(): [BinaryExpr] ... .<(_:_:) ...
# 585| getFunction(): [MethodLookupExpr] .<(_:_:)
# 585| getBase(): [TypeExpr] Int.Type
# 585| getTypeRepr(): [TypeRepr] Int
# 585| getMethodRef(): [DeclRefExpr] <(_:_:)
# 585| getArgument(0): [Argument] : x
# 585| getExpr(): [DeclRefExpr] x
# 585| getArgument(1): [Argument] : 42
# 585| getExpr(): [IntegerLiteralExpr] 42
# 585| getBoolean().getFullyConverted(): [ParenExpr] (...)
# 585| getThen(): [BraceStmt] { ... }
# 585| getElement(0): [ThenStmt] ThenStmt
# 585| getResult(): [IntegerLiteralExpr] 1
# 585| getElse(): [BraceStmt] { ... }
# 585| getElement(0): [ThenStmt] ThenStmt
# 585| getResult(): [IntegerLiteralExpr] 2
# 585| getPattern(0): [NamedPattern] b
# 582| [ConcreteVarDecl] $match
# 582| Type = Int
# 587| [Comment] // ---
# 587|
declarations.swift:
# 1| [StructDecl] Foo
# 2| getMember(0): [PatternBindingDecl] var ... = ...
@@ -4816,7 +4883,7 @@ expressions.swift:
# 16| getBase(): [TypeExpr] AnError.Type
# 16| getTypeRepr(): [TypeRepr] AnError
# 16| getMethodRef(): [DeclRefExpr] failed
# 16| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
# 16| getSubExpr().getFullyConverted(): [ErasureExpr] (any Error) ...
# 20| [TopLevelCodeDecl] { ... }
# 20| getBody(): [BraceStmt] { ... }
# 20| getElement(0): [ForceTryExpr] try! ...
@@ -6976,7 +7043,7 @@ statements.swift:
# 21| getPattern(): [NamedPattern] error
# 21| getPattern().getFullyUnresolved(): [BindingPattern] let ...
# 21| getVariable(0): [ConcreteVarDecl] error
# 21| Type = Error
# 21| Type = any Error
# 21| getBody(): [BraceStmt] { ... }
# 22| getElement(0): [CallExpr] call to print(_:separator:terminator:)
# 22| getFunction(): [DeclRefExpr] print(_:separator:terminator:)
@@ -7017,7 +7084,7 @@ statements.swift:
# 29| getPattern(): [NamedPattern] error
# 29| getPattern().getFullyUnresolved(): [BindingPattern] let ...
# 29| getVariable(0): [ConcreteVarDecl] error
# 29| Type = Error
# 29| Type = any Error
# 29| getBody(): [BraceStmt] { ... }
# 30| getElement(0): [CallExpr] call to print(_:separator:terminator:)
# 30| getFunction(): [DeclRefExpr] print(_:separator:terminator:)
@@ -7144,7 +7211,7 @@ statements.swift:
# 40| getBase(): [TypeExpr] AnError.Type
# 40| getTypeRepr(): [TypeRepr] AnError
# 40| getMethodRef(): [DeclRefExpr] failed
# 40| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
# 40| getSubExpr().getFullyConverted(): [ErasureExpr] (any Error) ...
# 44| [TopLevelCodeDecl] { ... }
# 44| getBody(): [BraceStmt] { ... }
# 44| getElement(0): [DeferStmt] defer { ... }

7
swift/ql/test/library-tests/ast/cfg.swift
View File

@@ -577,4 +577,11 @@ func testOpenExistentialExpr(x: MyProtocol, y: MyProcotolImpl) {
sink(arg: getMyProtocolImpl().source())
}
func singleStmtExpr(_ x: Int) {
let a = switch x {
case 0..<5: 1
default: 2
}
let b = if (x < 42) { 1 } else { 2 }
}
// ---

148
swift/ql/test/library-tests/controlflow/graph/Cfg.expected
View File

@@ -340,9 +340,9 @@ cfg.swift:
#-----| exception -> exit mightThrow(x:) (abnormal)
# 19| MyError.Type
#-----| -> (Error) ...
#-----| -> (any Error) ...
# 19| (Error) ...
# 19| (any Error) ...
#-----| -> throw ...
# 19| .error1
@@ -379,11 +379,11 @@ cfg.swift:
# 22| .error3
#-----| -> MyError.Type
# 22| (Error) ...
# 22| (any Error) ...
#-----| -> throw ...
# 22| call to ...
#-----| -> (Error) ...
#-----| -> (any Error) ...
# 22| x
#-----| -> 1
@@ -6728,11 +6728,11 @@ cfg.swift:
# 568| MyProcotolImpl.init()
#-----| -> MyProcotolImpl.Type
# 568| (MyProtocol) ...
# 568| (any MyProtocol) ...
#-----| -> return ...
# 568| call to MyProcotolImpl.init()
#-----| -> (MyProtocol) ...
#-----| -> (any MyProtocol) ...
# 569| enter getMyProtocolImpl()
#-----| -> getMyProtocolImpl()
@@ -6868,3 +6868,139 @@ cfg.swift:
# 577| call to source()
#-----| -> call to sink(arg:)
# 580| enter singleStmtExpr(_:)
#-----| -> singleStmtExpr(_:)
# 580| exit singleStmtExpr(_:)
# 580| exit singleStmtExpr(_:) (normal)
#-----| -> exit singleStmtExpr(_:)
# 580| singleStmtExpr(_:)
#-----| -> x
# 580| x
#-----| -> a
# 581| var ... = ...
#-----| -> b
# 581| a
#-----| match -> switch x { ... }
# 581| SingleValueStmtExpr
#-----| -> var ... = ...
# 581| switch x { ... }
#-----| -> x
# 581| x
#-----| -> case ...
# 582| case ...
#-----| -> =~ ...
# 582| .~=(_:_:)
#-----| -> Range<Int>.Type
# 582| 0
#-----| -> 5
# 582| Range<Int>.Type
#-----| -> ...<(_:_:)
# 582| ... ...<(_:_:) ...
#-----| -> $match
# 582| ... .~=(_:_:) ...
#-----| -> =~ ...
# 582| =~ ...
#-----| -> .~=(_:_:)
# 582| =~ ...
#-----| match -> 1
#-----| no-match -> case ...
# 582| ...<(_:_:)
#-----| -> Int.Type
# 582| Int.Type
#-----| -> 0
# 582| $match
#-----| -> ... .~=(_:_:) ...
# 582| 5
#-----| -> ... ...<(_:_:) ...
# 582| 1
#-----| -> ThenStmt
# 582| ThenStmt
#-----| -> SingleValueStmtExpr
# 583| _
#-----| match -> 2
# 583| _
#-----| -> _
# 583| case ...
#-----| -> _
# 583| 2
#-----| -> ThenStmt
# 583| ThenStmt
#-----| -> SingleValueStmtExpr
# 585| var ... = ...
#-----| -> exit singleStmtExpr(_:) (normal)
# 585| b
#-----| match -> if ... then { ... } else { ... }
# 585| SingleValueStmtExpr
#-----| -> var ... = ...
# 585| if ... then { ... } else { ... }
#-----| -> StmtCondition
# 585| StmtCondition
#-----| -> .<(_:_:)
# 585| [false] (...)
#-----| false -> 2
# 585| [true] (...)
#-----| true -> 1
# 585| x
#-----| -> 42
# 585| ... .<(_:_:) ...
#-----| false -> [false] (...)
#-----| true -> [true] (...)
# 585| .<(_:_:)
#-----| -> Int.Type
# 585| Int.Type
#-----| -> x
# 585| 42
#-----| -> ... .<(_:_:) ...
# 585| 1
#-----| -> ThenStmt
# 585| ThenStmt
#-----| -> SingleValueStmtExpr
# 585| 2
#-----| -> ThenStmt
# 585| ThenStmt
#-----| -> SingleValueStmtExpr

7
swift/ql/test/library-tests/controlflow/graph/cfg.swift
View File

@@ -577,4 +577,11 @@ func testOpenExistentialExpr(x: MyProtocol, y: MyProcotolImpl) {
sink(arg: getMyProtocolImpl().source())
}
func singleStmtExpr(_ x: Int) {
let a = switch x {
case 0..<5: 1
default: 2
}
let b = if (x < 42) { 1 } else { 2 }
}
// ---

6
swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected
View File

@@ -7,14 +7,14 @@
| nominaltype.swift:90:6:90:6 | b2 | B2 | getABaseType:A, getCanonicalType:B2, getFullName:B2, getName:B2, getUnderlyingType:B2 |
| nominaltype.swift:91:6:91:6 | b1_alias | B1_alias | getAliasedType:B1, getCanonicalType:B1, getFullName:B1_alias, getName:B1_alias, getUnderlyingType:B1 |
| nominaltype.swift:92:6:92:6 | b2_alias | B2_alias | getAliasedType:B2, getCanonicalType:B2, getFullName:B2_alias, getName:B2_alias, getUnderlyingType:B2 |
| nominaltype.swift:93:6:93:6 | p | P | getCanonicalType:P, getFullName:P, getName:P, getUnderlyingType:P |
| nominaltype.swift:94:6:94:6 | p_alias | P_alias | getCanonicalType:P, getFullName:P_alias, getName:P_alias, getUnderlyingType:P_alias |
| nominaltype.swift:93:6:93:6 | p | any P | getCanonicalType:any P, getFullName:any P, getName:any P, getUnderlyingType:any P |
| nominaltype.swift:94:6:94:6 | p_alias | any P_alias | getCanonicalType:any P, getFullName:any P_alias, getName:any P_alias, getUnderlyingType:any P_alias |
| nominaltype.swift:95:6:95:6 | c1 | C1 | getABaseType:P, getCanonicalType:C1, getFullName:C1, getName:C1, getUnderlyingType:C1 |
| nominaltype.swift:96:6:96:6 | c2 | C2 | getABaseType:P, getCanonicalType:C2, getFullName:C2, getName:C2, getUnderlyingType:C2 |
| nominaltype.swift:97:6:97:6 | o | Outer | getCanonicalType:Outer, getFullName:Outer, getName:Outer, getUnderlyingType:Outer |
| nominaltype.swift:98:6:98:6 | oi | Outer.Inner | getCanonicalType:Outer.Inner, getFullName:Outer.Inner, getName:Inner, getUnderlyingType:Outer.Inner |
| nominaltype.swift:99:6:99:6 | oia | Outer.Inner.InnerAlias | getAliasedType:A, getCanonicalType:A, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias, getUnderlyingType:A |
| nominaltype.swift:100:6:100:6 | p1p2 | P1P2 | getCanonicalType:P1 & P2, getFullName:P1P2, getName:P1P2, getUnderlyingType:P1P2 |
| nominaltype.swift:100:6:100:6 | p1p2 | any P1P2 | getCanonicalType:any P1 & P2, getFullName:any P1P2, getName:any P1P2, getUnderlyingType:any P1P2 |
| nominaltype.swift:101:6:101:6 | boxInt | Box<A> | getCanonicalType:Box<A>, getFullName:Box<A>, getName:Box<A>, getUnderlyingType:Box<A> |
| nominaltype.swift:102:6:102:6 | d1 | D1 | getABaseType:P3, getCanonicalType:D1, getFullName:D1, getName:D1, getUnderlyingType:D1 |
| nominaltype.swift:103:6:103:6 | d2 | D2 | getABaseType:P4, getCanonicalType:D2, getFullName:D2, getName:D2, getUnderlyingType:D2 |

14
swift/schema.py
View File

@@ -994,6 +994,20 @@ class ThrowStmt(Stmt):
class YieldStmt(Stmt):
results: list[Expr] | child
@qltest.test_with('SingleValueStmtExpr')
class ThenStmt(Stmt):
""" A statement implicitly wrapping values to be used in branches of if/switch expressions. For example in:
```
let rank = switch value {
case 0..<0x80: 1
case 0x80..<0x0800: 2
default: 3
}
```
the literal expressions `1`, `2` and `3` are wrapped in `ThenStmt`.
"""
result: Expr | child
class DoCatchStmt(LabeledStmt):
body: Stmt | child
catches: list[CaseStmt] | child

20
swift/third_party/load.bzl vendored
View File

@@ -1,11 +1,11 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
_swift_prebuilt_version = "swift-5.9.2-RELEASE.299"
_swift_prebuilt_version = "swift-5.10-RELEASE.316"
_swift_sha_map = {
"Linux-X64": "19e8150251601e7b27e76d1a405a72c459f9a3e2949a1e360fde15ebb4d87409",
"macOS-ARM64": "4aaec59489c1607be0bd9ea522c1772f9368e7e29197167d3db73e0eb4fa605f",
"macOS-X64": "16f3a248269a06b00c6a40567ca06d5494d9a0ce24e7dd7cb8534828639418e8",
"Linux-X64": "8c6769a39ec94517ed56a9bf437ffe391ab8d76268f7ece1464deb6cf414ef40",
"macOS-ARM64": "8541653cd3d78fd14a67150f12c96b9f522b2b51231b5d3085e356ed5f5f0a6b",
"macOS-X64": "69fafb0c93029e1824bc70e9d3b05d6359077da41d61eed014a4c82a35e9b56c",
}
_swift_arch_map = {
@@ -20,13 +20,13 @@ _toolchain_info = {
platform = "ubuntu2004",
suffix = "ubuntu20.04",
extension = "tar.gz",
sha = "93477b80db16f3e5085738ade05478ed435793e39864418e737a10ac306cbd8c",
sha = "935d0b68757d9b1aceb6410fe0b126a28a07e362553ebba0c4bcd1c9a55d0bc5",
),
"macos": struct(
platform = "xcode",
suffix = "osx",
extension = "pkg",
sha = "68951c313b4b559878fc5be27e460c877f98d14e161f755220b063123919e896",
sha = "ef9bb6b38711324e1b1c89de44a27d9519d0711924c57f4df541734b04aaf6cc",
),
}
@@ -124,14 +124,6 @@ def load_dependencies(module_ctx = None, repository_name = "codeql"):
),
build_file = _build(repository_name, "swift-llvm-support"),
sha256 = sha256,
patch_args = ["-p1"],
patches = [
"@%s//swift/third_party/swift-llvm-support:patches/%s.patch" % (repository_name, patch_name)
for patch_name in (
"remove-redundant-operators",
"add-constructor-to-Compilation",
)
],
)
_toolchains(repository_name)

17
swift/third_party/swift-llvm-support/patches/add-constructor-to-Compilation.patch vendored
View File

@@ -1,17 +0,0 @@
In C++20 aggregate initialization on classes with user-declared constructor is not
available, while in C++11-C++17 it was available if they were defaulted or deleted.
diff --git a/include/swift/Driver/Compilation.h b/include/swift/Driver/Compilation.h
index ee76f92e0de..bd987157593 100644
--- a/include/swift/Driver/Compilation.h
+++ b/include/swift/Driver/Compilation.h
@@ -89,6 +89,9 @@ public:
/// This data is used for cross-module module dependencies.
fine_grained_dependencies::ModuleDepGraph depGraph;
+ Result(bool hadAbnormalExit = false, int exitCode = 0, fine_grained_dependencies::ModuleDepGraph depGraph = {})
+ : hadAbnormalExit{hadAbnormalExit}, exitCode{exitCode}, depGraph{std::move(depGraph)} {}
+
Result(const Result &) = delete;
Result &operator=(const Result &) = delete;

24
swift/third_party/swift-llvm-support/patches/remove-redundant-operators.patch vendored
View File

@@ -1,24 +0,0 @@
In C++20 the removed operators are available via operator rewriting and
implicit constructors, providing them leads to ambiguity.
diff --git a/include/swift/SIL/SILValue.h b/include/swift/SIL/SILValue.h
index 378ca039c7e..37c119c50c1 100644
--- a/include/swift/SIL/SILValue.h
+++ b/include/swift/SIL/SILValue.h
@@ -271,16 +271,6 @@ struct ValueOwnershipKind {
explicit operator bool() const { return value != OwnershipKind::Any; }
- bool operator==(ValueOwnershipKind other) const {
- return value == other.value;
- }
- bool operator!=(ValueOwnershipKind other) const {
- return !(value == other.value);
- }
-
- bool operator==(innerty other) const { return value == other; }
- bool operator!=(innerty other) const { return !(value == other); }
-
/// We merge by moving down the lattice.
ValueOwnershipKind merge(ValueOwnershipKind rhs) const {
return value.meet(rhs.value);