Skip to content

Swift: extract nextCall from ForEachStmt #14023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Swift: extract nextCall from ForEachStmt #14023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9fdbfa
Swift: extract nextCall from ForEachStmt
AlexDenisov Aug 22, 2023
b657301
Swift: update test expectations
AlexDenisov Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions swift/extractor/translators/StmtTranslator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ codeql::ForEachStmt StmtTranslator::translateForEachStmt(const swift::ForEachStm
entry.sequence = dispatcher.fetchLabel(stmt.getTypeCheckedSequence());
entry.pattern = dispatcher.fetchLabel(stmt.getPattern());
entry.where = dispatcher.fetchOptionalLabel(stmt.getWhere());
entry.nextCall = dispatcher.fetchOptionalLabel(stmt.getNextCall());
return entry;
}

Expand Down
6 changes: 3 additions & 3 deletions swift/ql/.generated.list
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions swift/ql/lib/codeql/swift/generated/ParentChild.qll
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions swift/ql/lib/codeql/swift/generated/Raw.qll
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions swift/ql/lib/codeql/swift/generated/stmt/ForEachStmt.qll
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions swift/ql/lib/swift.dbscheme
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
| var_decls.swift:2:12:2:12 | $i$generator | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | IndexingIterator<ClosedRange<Int>> | getNumberOfAccessors: | 0 | getName: | $i$generator | getType: | IndexingIterator<ClosedRange<Int>> | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 |
| var_decls.swift:4:7:4:7 | i | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | i | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 |
| var_decls.swift:7:5:7:5 | numbers | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | [Int] | getNumberOfAccessors: | 0 | getName: | numbers | getType: | [Int] | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 |
| var_decls.swift:10:12:10:12 | numbers | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | [Int] | getNumberOfAccessors: | 1 | getName: | numbers | getType: | [Int] | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 0 |
Expand Down
1 change: 1 addition & 0 deletions ...ractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentInitializer.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
| var_decls.swift:2:12:2:12 | $i$generator | var_decls.swift:2:12:2:16 | call to makeIterator() |
| var_decls.swift:4:7:4:7 | i | var_decls.swift:4:11:4:11 | 0 |
| var_decls.swift:7:5:7:5 | numbers | var_decls.swift:7:15:7:18 | [...] |
| var_decls.swift:10:12:10:12 | numbers | var_decls.swift:10:22:10:35 | [...] |
Expand Down
1 change: 1 addition & 0 deletions .../extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentPattern.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
| var_decls.swift:2:12:2:12 | $i$generator | var_decls.swift:2:12:2:12 | $i$generator |
| var_decls.swift:4:7:4:7 | i | var_decls.swift:4:7:4:7 | i |
| var_decls.swift:7:5:7:5 | numbers | var_decls.swift:7:5:7:5 | numbers |
| var_decls.swift:10:12:10:12 | numbers | var_decls.swift:10:12:10:12 | numbers |
Expand Down
41 changes: 41 additions & 0 deletions swift/ql/test/library-tests/ast/PrintAst.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,11 @@ cfg.swift:
# 138| getArgument(1): [Argument] : 10
# 138| getExpr(): [IntegerLiteralExpr] 10
#-----| getMethodRef(): [DeclRefExpr] makeIterator()
# 138| getNextCall(): [CallExpr] call to next()
# 138| getFunction(): [MethodLookupExpr] .next()
# 138| getBase(): [DeclRefExpr] $generator
# 138| getBase().getFullyConverted(): [InOutExpr] &...
#-----| getMethodRef(): [DeclRefExpr] next()
# 138| getBody(): [BraceStmt] { ... }
# 140| getElement(1): [SwitchStmt] switch x { ... }
# 140| getExpr(): [DeclRefExpr] x
Expand Down Expand Up @@ -837,6 +842,9 @@ cfg.swift:
# 158| getElse(): [BraceStmt] { ... }
# 159| getElement(0): [ReturnStmt] return ...
# 159| getResult(): [BooleanLiteralExpr] false
# 138| [NamedPattern] $generator
# 138| [ConcreteVarDecl] $generator
# 138| Type = IndexingIterator<ClosedRange<Int>>
# 141| [ConcreteVarDecl] $match
# 141| Type = Int
# 141| [ConcreteVarDecl] $match
Expand Down Expand Up @@ -3262,6 +3270,11 @@ cfg.swift:
# 526| getArgument(1): [Argument] : 100
# 526| getExpr(): [IntegerLiteralExpr] 100
#-----| getMethodRef(): [DeclRefExpr] makeIterator()
# 526| getNextCall(): [CallExpr] call to next()
# 526| getFunction(): [MethodLookupExpr] .next()
# 526| getBase(): [DeclRefExpr] $i$generator
# 526| getBase().getFullyConverted(): [InOutExpr] &...
#-----| getMethodRef(): [DeclRefExpr] next()
# 526| getBody(): [BraceStmt] { ... }
# 527| getElement(0): [CallExpr] call to yield(_:)
# 527| getFunction(): [MethodLookupExpr] .yield(_:)
Expand All @@ -3283,6 +3296,12 @@ cfg.swift:
# 533| getBase(): [DeclRefExpr] stream
# 533| getBase().getFullyConverted(): [LoadExpr] (AsyncStream<Int>) ...
#-----| getMethodRef(): [DeclRefExpr] makeAsyncIterator()
# 533| getNextCall(): [CallExpr] call to next()
# 533| getFunction(): [MethodLookupExpr] .next()
# 533| getBase(): [DeclRefExpr] $i$generator
# 533| getBase().getFullyConverted(): [InOutExpr] &...
#-----| getMethodRef(): [DeclRefExpr] next()
#-----| getNextCall().getFullyConverted(): [AwaitExpr] await ...
# 533| getBody(): [BraceStmt] { ... }
# 534| getElement(0): [CallExpr] call to print(_:separator:terminator:)
# 534| getFunction(): [DeclRefExpr] print(_:separator:terminator:)
Expand All @@ -3298,8 +3317,14 @@ cfg.swift:
# 525| [NilLiteralExpr] nil
# 526| [ConcreteVarDecl] i
# 526| Type = Int
# 526| [NamedPattern] $i$generator
# 526| [ConcreteVarDecl] $i$generator
# 526| Type = IndexingIterator<ClosedRange<Int>>
# 533| [ConcreteVarDecl] i
# 533| Type = Int
# 533| [NamedPattern] $i$generator
# 533| [ConcreteVarDecl] $i$generator
# 533| Type = AsyncStream<Int>.Iterator
declarations.swift:
# 1| [StructDecl] Foo
# 2| getMember(0): [PatternBindingDecl] var ... = ...
Expand Down Expand Up @@ -6599,6 +6624,11 @@ statements.swift:
# 2| getArgument(1): [Argument] : 5
# 2| getExpr(): [IntegerLiteralExpr] 5
#-----| getMethodRef(): [DeclRefExpr] makeIterator()
# 2| getNextCall(): [CallExpr] call to next()
# 2| getFunction(): [MethodLookupExpr] .next()
# 2| getBase(): [DeclRefExpr] $i$generator
# 2| getBase().getFullyConverted(): [InOutExpr] &...
#-----| getMethodRef(): [DeclRefExpr] next()
# 2| getBody(): [BraceStmt] { ... }
# 3| getElement(0): [IfStmt] if ... then { ... } else { ... }
# 3| getCondition(): [StmtCondition] StmtCondition
Expand Down Expand Up @@ -6738,6 +6768,9 @@ statements.swift:
# 29| getPattern().getFullyUnresolved(): [BindingPattern] let ...
# 2| [ConcreteVarDecl] i
# 2| Type = Int
# 2| [NamedPattern] $i$generator
# 2| [ConcreteVarDecl] $i$generator
# 2| Type = IndexingIterator<ClosedRange<Int>>
# 21| [ConcreteVarDecl] error
# 21| Type = Error
# 29| [ConcreteVarDecl] error
Expand Down Expand Up @@ -7032,9 +7065,17 @@ statements.swift:
# 71| getExpr(): [IntegerLiteralExpr] 2
# 71| getArgument(1): [Argument] : 0
# 71| getExpr(): [IntegerLiteralExpr] 0
# 71| getNextCall(): [CallExpr] call to next()
# 71| getFunction(): [MethodLookupExpr] .next()
# 71| getBase(): [DeclRefExpr] $number$generator
# 71| getBase().getFullyConverted(): [InOutExpr] &...
#-----| getMethodRef(): [DeclRefExpr] next()
# 71| getBody(): [BraceStmt] { ... }
# 71| [ConcreteVarDecl] number
# 71| Type = Int
# 71| [NamedPattern] $number$generator
# 71| [ConcreteVarDecl] $number$generator
# 71| Type = IndexingIterator<[Int]>
# 74| [StructDecl] HasModifyAccessorDecl
# 75| getMember(0): [PatternBindingDecl] var ... = ...
# 75| getPattern(0): [TypedPattern] ... as ...
Expand Down
1 change: 1 addition & 0 deletions swift/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,7 @@ class ForEachStmt(LabeledStmt):
pattern: Pattern | child
sequence: Expr | child
where: optional[Expr] | child
nextCall: optional[Expr] | child
body: BraceStmt | child

class LabeledConditionalStmt(LabeledStmt):
Expand Down