@@ -28,6 +28,202 @@ index 9a0f5b43e2d..5c7d1320a2d 100644
28
28
29
29
toolchain_path = product.native_toolchain_path(args.host_target)
30
30
cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
31
+ diff --git a/swift/validation-test/IDE/crashers/10b243ac3f1f8d7b.swift b/swift/validation-test/IDE/crashers/10b243ac3f1f8d7b.swift
32
+ index 11a0aaa5dad..d80c3cef4f9 100644
33
+ --- a/swift/validation-test/IDE/crashers/10b243ac3f1f8d7b.swift
34
+ +++ b/swift/validation-test/IDE/crashers/10b243ac3f1f8d7b.swift
35
+ @@ -1,5 +1,6 @@
36
+ // {"kind":"complete","signature":"swift::TypeChecker::resolveDeclRefExpr(swift::UnresolvedDeclRefExpr*, swift::DeclContext*)"}
37
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -code-completion-diagnostics -source-filename %s
38
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
39
+ extension <#type#> {
40
+ var
41
+ a = "title \( init String * 0).General\(String#^COMPLETE^#0))"
42
+ diff --git a/swift/validation-test/IDE/crashers/1118c1956154924d.swift b/swift/validation-test/IDE/crashers/1118c1956154924d.swift
43
+ index 8bca91081a4..2432c883613 100644
44
+ --- a/swift/validation-test/IDE/crashers/1118c1956154924d.swift
45
+ +++ b/swift/validation-test/IDE/crashers/1118c1956154924d.swift
46
+ @@ -1,3 +1,4 @@
47
+ // {"kind":"complete","signature":"swift::constraints::ConstraintSystem::assignFixedType(swift::TypeVariableType*, swift::Type, bool, bool)"}
48
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
49
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
50
+ [ _""#^COMPLETE^#
51
+ diff --git a/swift/validation-test/IDE/crashers/1ac322cbf02c111.swift b/swift/validation-test/IDE/crashers/1ac322cbf02c111.swift
52
+ index 461d8ef8ed8..fa95a9a5690 100644
53
+ --- a/swift/validation-test/IDE/crashers/1ac322cbf02c111.swift
54
+ +++ b/swift/validation-test/IDE/crashers/1ac322cbf02c111.swift
55
+ @@ -1,5 +1,6 @@
56
+ // {"kind":"complete","signature":"swift::IterableDeclContext::addMemberSilently(swift::Decl*, swift::Decl*, bool) const::$_0::operator()(swift::Decl*, swift::Decl*) const"}
57
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
58
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
59
+ class a {b { { [ } ] in
60
+ #^COMPLETE^#
61
+ }
62
+ diff --git a/swift/validation-test/IDE/crashers/23da5344b07b939.swift b/swift/validation-test/IDE/crashers/23da5344b07b939.swift
63
+ index 59ade97a449..3fd504b2325 100644
64
+ --- a/swift/validation-test/IDE/crashers/23da5344b07b939.swift
65
+ +++ b/swift/validation-test/IDE/crashers/23da5344b07b939.swift
66
+ @@ -1,3 +1,4 @@
67
+ // {"kind":"complete","signature":"swift::AnyFunctionType::getExtInfo() const"}
68
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
69
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
70
+ func a(b) a#^COMPLETE^#
71
+ diff --git a/swift/validation-test/IDE/crashers/3d85becf2d330a5.swift b/swift/validation-test/IDE/crashers/3d85becf2d330a5.swift
72
+ index 9fbc5cb938b..01bf3d90e44 100644
73
+ --- a/swift/validation-test/IDE/crashers/3d85becf2d330a5.swift
74
+ +++ b/swift/validation-test/IDE/crashers/3d85becf2d330a5.swift
75
+ @@ -1,3 +1,4 @@
76
+ // {"kind":"complete","signature":"swift::Parser::consumeIdentifier(swift::Identifier&, bool)"}
77
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
78
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
79
+ switch { case borrowing #^COMPLETE^#
80
+ diff --git a/swift/validation-test/IDE/crashers/488be7ca295930f4.swift b/swift/validation-test/IDE/crashers/488be7ca295930f4.swift
81
+ index ced89073a1d..fa8945a8063 100644
82
+ --- a/swift/validation-test/IDE/crashers/488be7ca295930f4.swift
83
+ +++ b/swift/validation-test/IDE/crashers/488be7ca295930f4.swift
84
+ @@ -1,5 +1,6 @@
85
+ // {"kind":"complete","signature":"doPrintTypeInterface(swift::CompilerInvocation const&, llvm::StringRef, llvm::StringRef)"}
86
+ // Actual signature: checkSingleOverride
87
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
88
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
89
+ class a { subscript(a) a { set } class b : a { override subscript(a) a {
90
+ #^COMPLETE^#
91
+ diff --git a/swift/validation-test/IDE/crashers/4c8b451fbe19cd6.swift b/swift/validation-test/IDE/crashers/4c8b451fbe19cd6.swift
92
+ index 121d9a50ede..aeb82ac532a 100644
93
+ --- a/swift/validation-test/IDE/crashers/4c8b451fbe19cd6.swift
94
+ +++ b/swift/validation-test/IDE/crashers/4c8b451fbe19cd6.swift
95
+ @@ -1,3 +1,4 @@
96
+ // {"kind":"complete","signature":"(anonymous namespace)::PreCheckTarget::simplifyTypeExpr(swift::Expr*)"}
97
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
98
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
99
+ macro a = { #^COMPLETE^#
100
+ diff --git a/swift/validation-test/IDE/crashers/524ea7a5cd78074.swift b/swift/validation-test/IDE/crashers/524ea7a5cd78074.swift
101
+ index b05a97a06bc..3550ef2dc00 100644
102
+ --- a/swift/validation-test/IDE/crashers/524ea7a5cd78074.swift
103
+ +++ b/swift/validation-test/IDE/crashers/524ea7a5cd78074.swift
104
+ @@ -1,3 +1,4 @@
105
+ // {"kind":"complete","signature":"swift::Mangle::Mangler::finalize(llvm::raw_ostream&)"}
106
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
107
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
108
+ struct a { extension b { struct c { struct d<e{ f { d#^COMPLETE^#
109
+ diff --git a/swift/validation-test/IDE/crashers/700c7172dd0e486.swift b/swift/validation-test/IDE/crashers/700c7172dd0e486.swift
110
+ index a067c69afd8..383d4b43bfa 100644
111
+ --- a/swift/validation-test/IDE/crashers/700c7172dd0e486.swift
112
+ +++ b/swift/validation-test/IDE/crashers/700c7172dd0e486.swift
113
+ @@ -1,3 +1,4 @@
114
+ // {"kind":"complete","signature":"swift::ide::PostfixCompletionCallback::Result::tryMerge(swift::ide::PostfixCompletionCallback::Result const&, swift::DeclContext*)"}
115
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -code-completion-diagnostics -source-filename %s
116
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
117
+ Int { switch { case Optional.some()#^COMPLETE^#
118
+ diff --git a/swift/validation-test/IDE/crashers/8447838e019fde.swift b/swift/validation-test/IDE/crashers/8447838e019fde.swift
119
+ index 6a75c362b55..515b83ad63a 100644
120
+ --- a/swift/validation-test/IDE/crashers/8447838e019fde.swift
121
+ +++ b/swift/validation-test/IDE/crashers/8447838e019fde.swift
122
+ @@ -1,4 +1,5 @@
123
+ // {"kind":"complete","signature":"swift::ParserStatus llvm::function_ref<swift::ParserStatus ()>::callback_fn<swift::Parser::parseParameterClause(swift::SourceLoc&, llvm::SmallVectorImpl<swift::Parser::ParsedParameter>&, swift::SourceLoc&, swift::Parser::DefaultArgumentInfo*, swift::Parser::ParameterContextKind)::$_0>(long)"}
124
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
125
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
126
+ func 丏(=1 as
127
+ #^COMPLETE^#
128
+ diff --git a/swift/validation-test/IDE/crashers/8681205caefae96e.swift b/swift/validation-test/IDE/crashers/8681205caefae96e.swift
129
+ index 0ad1af306a4..cc83910adce 100644
130
+ --- a/swift/validation-test/IDE/crashers/8681205caefae96e.swift
131
+ +++ b/swift/validation-test/IDE/crashers/8681205caefae96e.swift
132
+ @@ -1,4 +1,5 @@
133
+ // {"kind":"complete","signature":"swift::ide::CompletionLookup::getPostfixKeywordCompletions(swift::Type, swift::Expr*)"}
134
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -code-completion-diagnostics -source-filename %s
135
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
136
+ func a(b: (() -> Float)!) {
137
+ b()#^COMPLETE^#
138
+ diff --git a/swift/validation-test/IDE/crashers/88724bf42982b346.swift b/swift/validation-test/IDE/crashers/88724bf42982b346.swift
139
+ index adc808185ae..cd1d747a55c 100644
140
+ --- a/swift/validation-test/IDE/crashers/88724bf42982b346.swift
141
+ +++ b/swift/validation-test/IDE/crashers/88724bf42982b346.swift
142
+ @@ -1,4 +1,5 @@
143
+ // {"kind":"complete","signature":"swift::ide::printTypeUSR(swift::Type, llvm::raw_ostream&)"}
144
+ // Actual signature: getContextSubstitutions
145
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
146
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
147
+ protocol a extension a where Self == { extension a#^COMPLETE^# protocol b
148
+ diff --git a/swift/validation-test/IDE/crashers/96faa1ddefcb57f.swift b/swift/validation-test/IDE/crashers/96faa1ddefcb57f.swift
149
+ index 91e3e74e9e2..664fda78165 100644
150
+ --- a/swift/validation-test/IDE/crashers/96faa1ddefcb57f.swift
151
+ +++ b/swift/validation-test/IDE/crashers/96faa1ddefcb57f.swift
152
+ @@ -1,4 +1,5 @@
153
+ // {"kind":"complete","signature":"swift::Demangle::ASTBuilder::findTypeDecl(swift::DeclContext*, swift::Identifier, swift::Identifier, swift::Demangle::Node::Kind)"}
154
+ // Actual signature: openTypeParameter
155
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
156
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
157
+ struct a<b:RangeReplaceableCollection where b ={ c: b.Element? { #^COMPLETE^#
158
+ diff --git a/swift/validation-test/IDE/crashers/a41cd43f2f603f31.swift b/swift/validation-test/IDE/crashers/a41cd43f2f603f31.swift
159
+ index 1290840d2f1..125c2b3be54 100644
160
+ --- a/swift/validation-test/IDE/crashers/a41cd43f2f603f31.swift
161
+ +++ b/swift/validation-test/IDE/crashers/a41cd43f2f603f31.swift
162
+ @@ -1,3 +1,4 @@
163
+ // {"kind":"complete","signature":"(anonymous namespace)::CodeCompletionCallbacksImpl::completeAccessorBeginning(swift::CodeCompletionExpr*)"}
164
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -code-completion-diagnostics -source-filename %s
165
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
166
+ case <#expression#>= { protocol a { #^COMPLETE^#
167
+ diff --git a/swift/validation-test/IDE/crashers/b72ab48c2f29a3a.swift b/swift/validation-test/IDE/crashers/b72ab48c2f29a3a.swift
168
+ index 9465ed5fe55..3558a2742d3 100644
169
+ --- a/swift/validation-test/IDE/crashers/b72ab48c2f29a3a.swift
170
+ +++ b/swift/validation-test/IDE/crashers/b72ab48c2f29a3a.swift
171
+ @@ -1,3 +1,4 @@
172
+ // {"kind":"complete","signature":"swift::rewriting::RequirementMachine::getReducedShape(swift::Type, llvm::ArrayRef<swift::GenericTypeParamType*>) const"}
173
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
174
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
175
+ class a<b{ c { struct d<f where f.e#^COMPLETE^#
176
+ diff --git a/swift/validation-test/IDE/crashers/c65ac26afb25b40.swift b/swift/validation-test/IDE/crashers/c65ac26afb25b40.swift
177
+ index 8aabf510098..65bc38d8091 100644
178
+ --- a/swift/validation-test/IDE/crashers/c65ac26afb25b40.swift
179
+ +++ b/swift/validation-test/IDE/crashers/c65ac26afb25b40.swift
180
+ @@ -1,3 +1,4 @@
181
+ // {"kind":"complete","signature":"swift::DeclRefTypeRepr::DeclRefTypeRepr(swift::TypeReprKind, swift::DeclNameRef, swift::DeclNameLoc, unsigned int, bool)"}
182
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -code-completion-diagnostics -source-filename %s
183
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
184
+ { #^COMPLETE^#@storageRestrictions(
185
+ diff --git a/swift/validation-test/IDE/crashers/d3a218e4a4e3b8e.swift b/swift/validation-test/IDE/crashers/d3a218e4a4e3b8e.swift
186
+ index 693f0a39461..dcdcc20175a 100644
187
+ --- a/swift/validation-test/IDE/crashers/d3a218e4a4e3b8e.swift
188
+ +++ b/swift/validation-test/IDE/crashers/d3a218e4a4e3b8e.swift
189
+ @@ -1,3 +1,4 @@
190
+ // {"kind":"complete","signature":"swift::ParseAbstractFunctionBodyRequest::evaluate(swift::Evaluator&, swift::AbstractFunctionDecl*) const"}
191
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
192
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
193
+ defer{ var #^COMPLETE^#
194
+ diff --git a/swift/validation-test/IDE/crashers/f03bb3278d3341d9.swift b/swift/validation-test/IDE/crashers/f03bb3278d3341d9.swift
195
+ index c13b46bb0a0..0d5262805f9 100644
196
+ --- a/swift/validation-test/IDE/crashers/f03bb3278d3341d9.swift
197
+ +++ b/swift/validation-test/IDE/crashers/f03bb3278d3341d9.swift
198
+ @@ -1,5 +1,6 @@
199
+ // {"kind":"complete","signature":"swift::PersistentParserState::restoreIDEInspectionDelayedDeclState(swift::IDEInspectionDelayedDeclState const&)"}
200
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
201
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
202
+ guard {
203
+ #if #^COMPLETE^#
204
+ 0
205
+ diff --git a/swift/validation-test/IDE/crashers/f13530ddd8d62d26.swift b/swift/validation-test/IDE/crashers/f13530ddd8d62d26.swift
206
+ index a6fdc345c16..2783bae7add 100644
207
+ --- a/swift/validation-test/IDE/crashers/f13530ddd8d62d26.swift
208
+ +++ b/swift/validation-test/IDE/crashers/f13530ddd8d62d26.swift
209
+ @@ -1,5 +1,6 @@
210
+ // {"kind":"complete","signature":"swift::NominalTypeDecl::prepareConformanceTable() const"}
211
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
212
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
213
+ protocol a< b {
214
+ associatedtype b
215
+ func c<d>: a<d>#^COMPLETE^#
216
+ diff --git a/swift/validation-test/IDE/crashers/fd1bd523c6eba84d.swift b/swift/validation-test/IDE/crashers/fd1bd523c6eba84d.swift
217
+ index ad4e60f35a0..dec7f89605e 100644
218
+ --- a/swift/validation-test/IDE/crashers/fd1bd523c6eba84d.swift
219
+ +++ b/swift/validation-test/IDE/crashers/fd1bd523c6eba84d.swift
220
+ @@ -1,5 +1,6 @@
221
+ // {"kind":"complete","signature":"swift::Parser::parseLineDirective(bool)"}
222
+ // RUN: not --crash %target-swift-ide-test -code-completion --code-completion-token=COMPLETE -source-filename %s
223
+ + // XFAIL: OS=linux-android, OS=linux-androideabi
224
+ {
225
+ #sourceLocation(file: "", line: 800)
226
+ #^COMPLETE^#
31
227
diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
32
228
index 3da519e..e2dd8ed 100644
33
229
--- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
0 commit comments