Merge pull request #35982 from DougGregor/clang-importer-concurrency-tweaks

Author: DougGregor

lib/ClangImporter/ImportDecl.cpp

@@ -8133,9 +8133,10 @@ void ClangImporter::Implementation::importAttributes(
     // __attribute__((swift_attr("attribute")))
     //
     if (auto swiftAttr = dyn_cast<clang::SwiftAttrAttr>(*AI)) {
-      // FIXME: Hard-core @MainActor, because we don't have a point at which to
-      // do name lookup for imported entities.
-      if (swiftAttr->getAttribute() == "@MainActor") {
+      // FIXME: Hard-core @MainActor and @UIActor, because we don't have a
+      // point at which to do name lookup for imported entities.
+      if (swiftAttr->getAttribute() == "@MainActor" ||
+          swiftAttr->getAttribute() == "@UIActor") {
         if (Type mainActorType = getMainActorType()) {
           auto typeExpr = TypeExpr::createImplicit(mainActorType, SwiftContext);
           auto attr = CustomAttr::create(SwiftContext, SourceLoc(), typeExpr);
@@ -9067,8 +9068,8 @@ ClangImporter::Implementation::createConstant(Identifier name, DeclContext *dc,
   func->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
   // If we're in concurrency mode, mark the constant as @actorIndependent
   if (SwiftContext.LangOpts.EnableExperimentalConcurrency) {
-    auto actorIndependentAttr = new (C) ActorIndependentAttr(SourceLoc(),
-        SourceRange(), ActorIndependentKind::Safe);
+    auto actorIndependentAttr = new (C) ActorIndependentAttr(
+        ActorIndependentKind::Unsafe, /*IsImplicit=*/true);
     var->getAttrs().add(actorIndependentAttr);
   }
   // Set the function up as the getter.

test/ClangImporter/objc_async.swift

@@ -90,4 +90,6 @@ actor MySubclassCheckingSwiftAttributes : ProtocolWithSwiftAttributes {
   func mainActorMethod() {
     syncMethod() // expected-error{{actor-isolated instance method 'syncMethod()' can not be referenced from context of global actor 'MainActor'}}
   }
+
+  func uiActorMethod() { }
 }

test/IDE/print_clang_objc_async.swift

@@ -40,7 +40,8 @@ import _Concurrency
 // CHECK-NEXT: @actorIndependent func independentMethod()
 // CHECK-NEXT: @asyncHandler func asyncHandlerMethod()
 // CHECK-NEXT: @MainActor func mainActorMethod()
+// CHECK-NEXT: @MainActor func uiActorMethod()
 // CHECK-NEXT: {{^}}  optional func missingAtAttributeMethod()
 // CHECK-NEXT: {{^[}]$}}
 
-// CHECK: @actorIndependent var MAGIC_NUMBER: Int32 { get }
+// CHECK: {{^}}var MAGIC_NUMBER: Int32 { get }

test/Inputs/clang-importer-sdk/usr/include/ObjCConcurrency.h

@@ -82,6 +82,7 @@ typedef void (^CompletionHandler)(NSString * _Nullable, NSString * _Nullable_res
 -(void)independentMethod __attribute__((__swift_attr__("@actorIndependent")));
 -(void)asyncHandlerMethod __attribute__((__swift_attr__("@asyncHandler")));
 -(void)mainActorMethod __attribute__((__swift_attr__("@MainActor")));
+-(void)uiActorMethod __attribute__((__swift_attr__("@UIActor")));
 
 @optional
 -(void)missingAtAttributeMethod __attribute__((__swift_attr__("asyncHandler")));