Merge pull request swiftlang#36560 from DougGregor/show-imported-main-actor

Author: swift-ci

lib/AST/Attr.cpp

@@ -1020,7 +1020,7 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
       type.print(Printer, Options);
     else
       attr->getTypeRepr()->print(Printer, Options);
-    if (attr->isArgUnsafe())
+    if (attr->isArgUnsafe() && Options.IsForSwiftInterface)
       Printer << "(unsafe)";
     Printer.printNamePost(PrintNameContext::Attribute);
     break;

lib/ClangImporter/ImportDecl.cpp

@@ -8189,8 +8189,6 @@ void ClangImporter::Implementation::importAttributes(
           auto typeExpr = TypeExpr::createImplicit(mainActorType, SwiftContext);
           auto attr = CustomAttr::create(SwiftContext, SourceLoc(), typeExpr);
           attr->setArgIsUnsafe(isUnsafe);
-          if (isUnsafe)
-            attr->setImplicit();
           MappedDecl->getAttrs().add(attr);
         }
 

test/IDE/print_clang_objc_async.swift

@@ -39,8 +39,8 @@ import _Concurrency
 // CHECK-LABEL: protocol ProtocolWithSwiftAttributes {
 // CHECK-NEXT: @actorIndependent func independentMethod()
 // CHECK-NEXT: @asyncHandler func asyncHandlerMethod()
-// CHECK-NEXT: {{^}}  func mainActorMethod()
-// CHECK-NEXT: {{^}}  func uiActorMethod()
+// CHECK-NEXT: {{^}}  @MainActor func mainActorMethod()
+// CHECK-NEXT: {{^}}  @MainActor func uiActorMethod()
 // CHECK-NEXT: {{^}}  optional func missingAtAttributeMethod()
 // CHECK-NEXT: {{^[}]$}}