Skip to content

Commit 1304f81

Browse files
Fixed CI builds
1 parent 816d62c commit 1304f81

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

lib/Sema/TypeCheckConcurrency.cpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4722,20 +4722,24 @@ getIsolationFromAttributes(const Decl *decl, bool shouldDiagnose = true,
47224722
struct NameAndRange {
47234723
StringRef name;
47244724
SourceRange range;
4725+
4726+
NameAndRange(StringRef _name, SourceRange _range)
4727+
: name(_name), range(_range) {}
47254728
};
47264729

47274730
llvm::SmallVector<NameAndRange, 3> attributes;
47284731
if (isolatedAttr) {
4729-
attributes.push_back({.name = isolatedAttr->getAttrName(),
4730-
.range = isolatedAttr->getRangeWithAt()});
4732+
attributes.push_back(NameAndRange(isolatedAttr->getAttrName(),
4733+
isolatedAttr->getRangeWithAt()));
47314734
}
47324735
if (nonisolatedAttr) {
4733-
attributes.push_back({.name = nonisolatedAttr->getAttrName(),
4734-
.range = nonisolatedAttr->getRangeWithAt()});
4736+
attributes.push_back(NameAndRange(nonisolatedAttr->getAttrName(),
4737+
nonisolatedAttr->getRangeWithAt()));
47354738
}
47364739
if (globalActorAttr) {
4737-
attributes.push_back({.name = globalActorAttr->second->getName().str(),
4738-
.range = globalActorAttr->first->getRangeWithAt()});
4740+
attributes.push_back(
4741+
NameAndRange(globalActorAttr->second->getName().str(),
4742+
globalActorAttr->first->getRangeWithAt()));
47394743
}
47404744
if (attributes.size() == 3) {
47414745
decl->diagnose(diag::actor_isolation_multiple_attr_3, decl,

test/Concurrency/Runtime/actor_deinit_escaping_self.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library)
1+
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library)
22

33
// REQUIRES: executable_test
44
// REQUIRES: libdispatch

test/Distributed/Runtime/distributed_actor_deinit.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-build-swift -Xfrontend -disable-availability-checking -parse-stdlib -parse-as-library -module-name=main %s -o %t/a.out
2+
// RUN: %target-build-swift -Xfrontend -disable-availability-checking %import-libdispatch -parse-stdlib -parse-as-library -module-name=main %s -o %t/a.out
33
// RUN: %target-codesign %t/a.out
44
// RUN: %env-SWIFT_IS_CURRENT_EXECUTOR_LEGACY_MODE_OVERRIDE=legacy %target-run %t/a.out | %FileCheck %s
55

test/ModuleInterface/isolated-deinit-compatibility.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %target-swift-frontend -emit-silgen -verify %s
2-
// RUN: %target-swift-emit-module-interface(%t.swiftinterface) -DEMIT_IFACE %s -module-name IsolatedDeinitCompatibility
3-
// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name IsolatedDeinitCompatibility
1+
// RUN: %target-swift-frontend -disable-availability-checking -emit-silgen -verify %s
2+
// RUN: %target-swift-emit-module-interface(%t.swiftinterface) -DEMIT_IFACE %s -disable-availability-checking -module-name IsolatedDeinitCompatibility
3+
// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -disable-availability-checking -module-name IsolatedDeinitCompatibility
44
// RUN: %FileCheck %s < %t.swiftinterface
55

66
// MARK: Sync deinit in class

0 commit comments

Comments
 (0)