Skip to content

Commit b2c7c57

Browse files
committed
Swift: Fix expected files after a semantic merge conflict.
1 parent 66d13dc commit b2c7c57

File tree

2 files changed

+35
-13
lines changed

2 files changed

+35
-13
lines changed

swift/ql/test/library-tests/ast/PrintAst.expected

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3250,15 +3250,18 @@ cfg.swift:
32503250
# 525| getBody(): [BraceStmt] { ... }
32513251
# 526| getElement(0): [ForEachStmt] for ... in ... { ... }
32523252
# 526| getPattern(): [NamedPattern] i
3253-
# 526| getSequence(): [BinaryExpr] ... ....(_:_:) ...
3254-
# 526| getFunction(): [MethodLookupExpr] ....(_:_:)
3255-
# 526| getBase(): [TypeExpr] Int.Type
3256-
# 526| getTypeRepr(): [TypeRepr] Int
3257-
# 526| getMethodRef(): [DeclRefExpr] ...(_:_:)
3258-
# 526| getArgument(0): [Argument] : 1
3259-
# 526| getExpr(): [IntegerLiteralExpr] 1
3260-
# 526| getArgument(1): [Argument] : 100
3261-
# 526| getExpr(): [IntegerLiteralExpr] 100
3253+
# 526| getSequence(): [CallExpr] call to makeIterator()
3254+
# 526| getFunction(): [MethodLookupExpr] .makeIterator()
3255+
# 526| getBase(): [BinaryExpr] ... ....(_:_:) ...
3256+
# 526| getFunction(): [MethodLookupExpr] ....(_:_:)
3257+
# 526| getBase(): [TypeExpr] Int.Type
3258+
# 526| getTypeRepr(): [TypeRepr] Int
3259+
# 526| getMethodRef(): [DeclRefExpr] ...(_:_:)
3260+
# 526| getArgument(0): [Argument] : 1
3261+
# 526| getExpr(): [IntegerLiteralExpr] 1
3262+
# 526| getArgument(1): [Argument] : 100
3263+
# 526| getExpr(): [IntegerLiteralExpr] 100
3264+
#-----| getMethodRef(): [DeclRefExpr] makeIterator()
32623265
# 526| getBody(): [BraceStmt] { ... }
32633266
# 527| getElement(0): [CallExpr] call to yield(_:)
32643267
# 527| getFunction(): [MethodLookupExpr] .yield(_:)
@@ -3275,7 +3278,11 @@ cfg.swift:
32753278
# 523| getPattern(0): [NamedPattern] stream
32763279
# 533| getElement(1): [ForEachStmt] for ... in ... { ... }
32773280
# 533| getPattern(): [NamedPattern] i
3278-
# 533| getSequence(): [DeclRefExpr] stream
3281+
# 533| getSequence(): [CallExpr] call to makeAsyncIterator()
3282+
# 533| getFunction(): [MethodLookupExpr] .makeAsyncIterator()
3283+
# 533| getBase(): [DeclRefExpr] stream
3284+
# 533| getBase().getFullyConverted(): [LoadExpr] (AsyncStream<Int>) ...
3285+
#-----| getMethodRef(): [DeclRefExpr] makeAsyncIterator()
32793286
# 533| getBody(): [BraceStmt] { ... }
32803287
# 534| getElement(0): [CallExpr] call to print(_:separator:terminator:)
32813288
# 534| getFunction(): [DeclRefExpr] print(_:separator:terminator:)

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6011,7 +6011,7 @@ cfg.swift:
60116011
#-----| -> stream
60126012

60136013
# 523| var ... = ...
6014-
#-----| -> stream
6014+
#-----| -> .makeAsyncIterator()
60156015

60166016
# 523| stream
60176017
#-----| match -> AsyncStream<Element>.init(_:bufferingPolicy:_:)
@@ -6084,7 +6084,7 @@ cfg.swift:
60846084
#-----| -> exit { ... }
60856085

60866086
# 525| { ... }
6087-
#-----| -> ....(_:_:)
6087+
#-----| -> .makeIterator()
60886088

60896089
# 525| { ... }
60906090
#-----| -> call to detached(priority:operation:)
@@ -6100,6 +6100,12 @@ cfg.swift:
61006100
#-----| -> 100
61016101

61026102
# 526| ... ....(_:_:) ...
6103+
#-----| -> call to makeIterator()
6104+
6105+
# 526| .makeIterator()
6106+
#-----| -> ....(_:_:)
6107+
6108+
# 526| call to makeIterator()
61036109
#-----| -> for ... in ... { ... }
61046110

61056111
# 526| ....(_:_:)
@@ -6139,9 +6145,18 @@ cfg.swift:
61396145
# 533| i
61406146
#-----| match -> print(_:separator:terminator:)
61416147

6142-
# 533| stream
6148+
# 533| (AsyncStream<Int>) ...
6149+
#-----| -> call to makeAsyncIterator()
6150+
6151+
# 533| .makeAsyncIterator()
6152+
#-----| -> stream
6153+
6154+
# 533| call to makeAsyncIterator()
61436155
#-----| -> for ... in ... { ... }
61446156

6157+
# 533| stream
6158+
#-----| -> (AsyncStream<Int>) ...
6159+
61456160
# 534| print(_:separator:terminator:)
61466161
#-----| -> i
61476162

0 commit comments

Comments
 (0)