[interop][SwiftToCxx] print availability attributes for Swift decls i…

lib/PrintAsClang/DeclAndTypePrinter.h

@@ -81,6 +81,8 @@ class DeclAndTypePrinter {
   void print(const Decl *D);
   void print(Type ty);
 
+  void printAvailability(raw_ostream &os, const Decl *D);
+
   /// Is \p ED empty of members and protocol conformances to include?
   bool isEmptyExtensionDecl(const ExtensionDecl *ED);
 

lib/PrintAsClang/ModuleContentsWriter.cpp

@@ -289,12 +289,14 @@ class ModuleWriter {
       return;
     auto it = seenClangTypes.insert(clangType.getTypePtr());
     if (it.second)
-      ClangValueTypePrinter::printClangTypeSwiftGenericTraits(os, typeDecl, &M);
+      ClangValueTypePrinter::printClangTypeSwiftGenericTraits(os, typeDecl, &M,
+                                                              printer);
   }
 
   void forwardDeclareCxxValueTypeIfNeeded(const NominalTypeDecl *NTD) {
-    forwardDeclare(NTD,
-                   [&]() { ClangValueTypePrinter::forwardDeclType(os, NTD); });
+    forwardDeclare(NTD, [&]() {
+      ClangValueTypePrinter::forwardDeclType(os, NTD, printer);
+    });
   }
 
   void forwardDeclareType(const TypeDecl *TD) {

lib/PrintAsClang/PrintClangClassType.cpp

@@ -12,14 +12,16 @@
 
 #include "PrintClangClassType.h"
 #include "ClangSyntaxPrinter.h"
+#include "DeclAndTypePrinter.h"
 #include "PrintClangValueType.h"
 #include "swift/AST/Decl.h"
 #include "swift/IRGen/Linking.h"
 
 using namespace swift;
 
 void ClangClassTypePrinter::printClassTypeDecl(
-    const ClassDecl *typeDecl, llvm::function_ref<void(void)> bodyPrinter) {
+    const ClassDecl *typeDecl, llvm::function_ref<void(void)> bodyPrinter,
+    DeclAndTypePrinter &declAndTypePrinter) {
   auto printCxxImplClassName = ClangValueTypePrinter::printCxxImplClassName;
 
   ClangSyntaxPrinter printer(os);
@@ -31,7 +33,9 @@ void ClangClassTypePrinter::printClassTypeDecl(
   // Print out a forward declaration of the "hidden" _impl class.
   printer.printNamespace(cxx_synthesis::getCxxImplNamespaceName(),
                          [&](raw_ostream &os) {
-                           os << "class ";
+                           os << "class";
+                           declAndTypePrinter.printAvailability(os, typeDecl);
+                           os << ' ';
                            printCxxImplClassName(os, typeDecl);
                            os << ";\n";
                            // Print out special functions, like functions that
@@ -57,6 +61,7 @@ void ClangClassTypePrinter::printClassTypeDecl(
   }
 
   os << "class";
+  declAndTypePrinter.printAvailability(os, typeDecl);
   ClangSyntaxPrinter(os).printSymbolUSRAttribute(typeDecl);
   os << ' ';
   printer.printBaseName(typeDecl);
@@ -83,7 +88,9 @@ void ClangClassTypePrinter::printClassTypeDecl(
   // Print out the "hidden" _impl class.
   printer.printNamespace(
       cxx_synthesis::getCxxImplNamespaceName(), [&](raw_ostream &os) {
-        os << "class ";
+        os << "class";
+        declAndTypePrinter.printAvailability(os, typeDecl);
+        os << ' ';
         printCxxImplClassName(os, typeDecl);
         os << " {\n";
         os << "public:\n";
@@ -98,7 +105,7 @@ void ClangClassTypePrinter::printClassTypeDecl(
 
   ClangValueTypePrinter::printTypeGenericTraits(
       os, typeDecl, typeMetadataFuncName, /*genericRequirements=*/{},
-      typeDecl->getModuleContext());
+      typeDecl->getModuleContext(), declAndTypePrinter);
 }
 
 void ClangClassTypePrinter::printClassTypeReturnScaffold(

lib/PrintAsClang/PrintClangClassType.h

@@ -21,6 +21,7 @@ namespace swift {
 
 class ClassDecl;
 class ModuleDecl;
+class DeclAndTypePrinter;
 
 /// Responsible for printing a Swift class decl or in C or C++ mode, to
 /// be included in a Swift module's generated clang header.
@@ -30,7 +31,8 @@ class ClangClassTypePrinter {
 
   /// Print the C++ class definition that corresponds to the given Swift class.
   void printClassTypeDecl(const ClassDecl *typeDecl,
-                          llvm::function_ref<void(void)> bodyPrinter);
+                          llvm::function_ref<void(void)> bodyPrinter,
+                          DeclAndTypePrinter &declAndTypePrinter);
 
   static void
   printClassTypeReturnScaffold(raw_ostream &os, const ClassDecl *type,

lib/PrintAsClang/PrintClangFunction.cpp

@@ -1377,6 +1377,7 @@ static StringRef getConstructorName(const AbstractFunctionDecl *FD) {
 }
 
 void DeclAndTypeClangFunctionPrinter::printCxxMethod(
+    DeclAndTypePrinter &declAndTypePrinter,
     const NominalTypeDecl *typeDeclContext, const AbstractFunctionDecl *FD,
     const LoweredFunctionSignature &signature, StringRef swiftSymbolName,
     Type resultTy, bool isStatic, bool isDefinition,
@@ -1401,6 +1402,7 @@ void DeclAndTypeClangFunctionPrinter::printCxxMethod(
       resultTy, FunctionSignatureKind::CxxInlineThunk, modifiers);
   assert(!result.isUnsupported() && "C signature should be unsupported too");
 
+  declAndTypePrinter.printAvailability(os, FD);
   if (!isDefinition) {
     os << ";\n";
     return;
@@ -1446,6 +1448,7 @@ static std::string remapPropertyName(const AccessorDecl *accessor,
 }
 
 void DeclAndTypeClangFunctionPrinter::printCxxPropertyAccessorMethod(
+    DeclAndTypePrinter &declAndTypePrinter,
     const NominalTypeDecl *typeDeclContext, const AccessorDecl *accessor,
     const LoweredFunctionSignature &signature, StringRef swiftSymbolName,
     Type resultTy, bool isStatic, bool isDefinition,
@@ -1466,6 +1469,7 @@ void DeclAndTypeClangFunctionPrinter::printCxxPropertyAccessorMethod(
       accessor, signature, remapPropertyName(accessor, resultTy), resultTy,
       FunctionSignatureKind::CxxInlineThunk, modifiers);
   assert(!result.isUnsupported() && "C signature should be unsupported too!");
+  declAndTypePrinter.printAvailability(os, accessor->getStorage());
   if (!isDefinition) {
     os << ";\n";
     return;
@@ -1480,6 +1484,7 @@ void DeclAndTypeClangFunctionPrinter::printCxxPropertyAccessorMethod(
 }
 
 void DeclAndTypeClangFunctionPrinter::printCxxSubscriptAccessorMethod(
+    DeclAndTypePrinter &declAndTypePrinter,
     const NominalTypeDecl *typeDeclContext, const AccessorDecl *accessor,
     const LoweredFunctionSignature &signature, StringRef swiftSymbolName,
     Type resultTy, bool isDefinition,
@@ -1494,6 +1499,7 @@ void DeclAndTypeClangFunctionPrinter::printCxxSubscriptAccessorMethod(
       printFunctionSignature(accessor, signature, "operator []", resultTy,
                              FunctionSignatureKind::CxxInlineThunk, modifiers);
   assert(!result.isUnsupported() && "C signature should be unsupported too!");
+  declAndTypePrinter.printAvailability(os, accessor->getStorage());
   if (!isDefinition) {
     os << ";\n";
     return;

lib/PrintAsClang/PrintClangFunction.h

@@ -119,20 +119,23 @@ class DeclAndTypeClangFunctionPrinter {
   /// Print the Swift method as C++ method declaration/definition, including
   /// constructors.
   void printCxxMethod(
+      DeclAndTypePrinter &declAndTypePrinter,
       const NominalTypeDecl *typeDeclContext, const AbstractFunctionDecl *FD,
       const LoweredFunctionSignature &signature, StringRef swiftSymbolName,
       Type resultTy, bool isStatic, bool isDefinition,
       Optional<IRABIDetailsProvider::MethodDispatchInfo> dispatchInfo);
 
   /// Print the C++ getter/setter method signature.
   void printCxxPropertyAccessorMethod(
+      DeclAndTypePrinter &declAndTypePrinter,
       const NominalTypeDecl *typeDeclContext, const AccessorDecl *accessor,
       const LoweredFunctionSignature &signature, StringRef swiftSymbolName,
       Type resultTy, bool isStatic, bool isDefinition,
       Optional<IRABIDetailsProvider::MethodDispatchInfo> dispatchInfo);
 
   /// Print the C++ subscript method.
   void printCxxSubscriptAccessorMethod(
+      DeclAndTypePrinter &declAndTypePrinter,
       const NominalTypeDecl *typeDeclContext, const AccessorDecl *accessor,
       const LoweredFunctionSignature &signature, StringRef swiftSymbolName,
       Type resultTy, bool isDefinition,

lib/PrintAsClang/PrintClangValueType.cpp

@@ -12,6 +12,7 @@
 
 #include "PrintClangValueType.h"
 #include "ClangSyntaxPrinter.h"
+#include "DeclAndTypePrinter.h"
 #include "OutputLanguageMode.h"
 #include "PrimitiveTypeMapping.h"
 #include "SwiftToClangInteropContext.h"
@@ -81,14 +82,16 @@ printCValueTypeStorageStruct(raw_ostream &os, const NominalTypeDecl *typeDecl,
   os << "};\n\n";
 }
 
-void ClangValueTypePrinter::forwardDeclType(raw_ostream &os,
-                                            const NominalTypeDecl *typeDecl) {
+void ClangValueTypePrinter::forwardDeclType(
+    raw_ostream &os, const NominalTypeDecl *typeDecl,
+    DeclAndTypePrinter &declAndTypePrinter) {
   if (typeDecl->isGeneric()) {
     auto genericSignature =
         typeDecl->getGenericSignature().getCanonicalSignature();
     ClangSyntaxPrinter(os).printGenericSignature(genericSignature);
   }
   os << "class";
+  declAndTypePrinter.printAvailability(os, typeDecl);
   ClangSyntaxPrinter(os).printSymbolUSRAttribute(typeDecl);
   os << ' ';
   ClangSyntaxPrinter(os).printBaseName(typeDecl);
@@ -173,8 +176,8 @@ static void addCppExtensionsToStdlibType(const NominalTypeDecl *typeDecl,
 }
 
 void ClangValueTypePrinter::printValueTypeDecl(
-    const NominalTypeDecl *typeDecl,
-    llvm::function_ref<void(void)> bodyPrinter) {
+    const NominalTypeDecl *typeDecl, llvm::function_ref<void(void)> bodyPrinter,
+    DeclAndTypePrinter &declAndTypePrinter) {
   // FIXME: Add support for generic structs.
   llvm::Optional<IRABIDetailsProvider::SizeAndAlignment> typeSizeAlign;
   Optional<CanGenericSignature> genericSignature;
@@ -221,7 +224,9 @@ void ClangValueTypePrinter::printValueTypeDecl(
   printer.printNamespace(cxx_synthesis::getCxxImplNamespaceName(),
                          [&](raw_ostream &os) {
                            printGenericSignature(os);
-                           os << "class ";
+                           os << "class";
+                           declAndTypePrinter.printAvailability(os, typeDecl);
+                           os << ' ';
                            printCxxImplClassName(os, typeDecl);
                            os << ";\n\n";
 
@@ -263,6 +268,7 @@ void ClangValueTypePrinter::printValueTypeDecl(
   // Print out the C++ class itself.
   printGenericSignature(os);
   os << "class";
+  declAndTypePrinter.printAvailability(os, typeDecl);
   ClangSyntaxPrinter(os).printSymbolUSRAttribute(typeDecl);
   os << ' ';
   ClangSyntaxPrinter(os).printBaseName(typeDecl);
@@ -408,7 +414,9 @@ void ClangValueTypePrinter::printValueTypeDecl(
   printer.printNamespace(
       cxx_synthesis::getCxxImplNamespaceName(), [&](raw_ostream &os) {
         printGenericSignature(os);
-        os << "class ";
+        os << "class";
+        declAndTypePrinter.printAvailability(os, typeDecl);
+        os << ' ';
         printCxxImplClassName(os, typeDecl);
         os << " {\n";
         os << "public:\n";
@@ -461,7 +469,7 @@ void ClangValueTypePrinter::printValueTypeDecl(
 
   printTypeGenericTraits(os, typeDecl, typeMetadataFuncName,
                          typeMetadataFuncGenericParams,
-                         typeDecl->getModuleContext());
+                         typeDecl->getModuleContext(), declAndTypePrinter);
 }
 
 void ClangValueTypePrinter::printParameterCxxToCUseScaffold(
@@ -512,8 +520,8 @@ void ClangValueTypePrinter::printValueTypeReturnScaffold(
 }
 
 void ClangValueTypePrinter::printClangTypeSwiftGenericTraits(
-    raw_ostream &os, const TypeDecl *typeDecl,
-    const ModuleDecl *moduleContext) {
+    raw_ostream &os, const TypeDecl *typeDecl, const ModuleDecl *moduleContext,
+    DeclAndTypePrinter &declAndTypePrinter) {
   assert(typeDecl->hasClangNode());
   // Do not reference unspecialized templates.
   if (isa<clang::ClassTemplateDecl>(typeDecl->getClangDecl()))
@@ -522,7 +530,8 @@ void ClangValueTypePrinter::printClangTypeSwiftGenericTraits(
       typeDecl->getDeclaredInterfaceType()->getCanonicalType());
   std::string typeMetadataFuncName = typeMetadataFunc.mangleAsString();
   printTypeGenericTraits(os, typeDecl, typeMetadataFuncName,
-                         /*typeMetadataFuncRequirements=*/{}, moduleContext);
+                         /*typeMetadataFuncRequirements=*/{}, moduleContext,
+                         declAndTypePrinter);
 }
 
 void ClangValueTypePrinter::printTypePrecedingGenericTraits(
@@ -553,7 +562,7 @@ void ClangValueTypePrinter::printTypePrecedingGenericTraits(
 void ClangValueTypePrinter::printTypeGenericTraits(
     raw_ostream &os, const TypeDecl *typeDecl, StringRef typeMetadataFuncName,
     ArrayRef<GenericRequirement> typeMetadataFuncRequirements,
-    const ModuleDecl *moduleContext) {
+    const ModuleDecl *moduleContext, DeclAndTypePrinter &declAndTypePrinter) {
   auto *NTD = dyn_cast<NominalTypeDecl>(typeDecl);
   ClangSyntaxPrinter printer(os);
   // FIXME: avoid popping out of the module's namespace here.
@@ -580,7 +589,9 @@ void ClangValueTypePrinter::printTypeGenericTraits(
   }
   if (!NTD || printer.printNominalTypeOutsideMemberDeclTemplateSpecifiers(NTD))
     os << "template<>\n";
-  os << "struct TypeMetadataTrait<";
+  os << "struct";
+  declAndTypePrinter.printAvailability(os, typeDecl);
+  os << " TypeMetadataTrait<";
   if (typeDecl->hasClangNode()) {
     printer.printClangTypeReference(typeDecl->getClangDecl());
   } else {
@@ -635,7 +646,9 @@ void ClangValueTypePrinter::printTypeGenericTraits(
   if (!typeDecl->hasClangNode() && typeMetadataFuncRequirements.empty()) {
     assert(NTD);
     os << "template<>\n";
-    os << "struct implClassFor<";
+    os << "struct";
+    declAndTypePrinter.printAvailability(os, typeDecl);
+    os << " implClassFor<";
     printer.printBaseName(typeDecl->getModuleContext());
     os << "::";
     printer.printBaseName(typeDecl);

lib/PrintAsClang/PrintClangValueType.h

@@ -22,6 +22,7 @@
 
 namespace swift {
 
+class DeclAndTypePrinter;
 class ModuleDecl;
 class NominalTypeDecl;
 class PrimitiveTypeMapping;
@@ -39,7 +40,9 @@ class ClangValueTypePrinter {
   /// Print the C++ class definition that
   /// corresponds to the given structure or enum declaration.
   void printValueTypeDecl(const NominalTypeDecl *typeDecl,
-                          llvm::function_ref<void(void)> bodyPrinter);
+                          llvm::function_ref<void(void)> bodyPrinter,
+
+                          DeclAndTypePrinter &declAndTypePrinter);
 
   /// Print the use of a C++ struct/enum parameter value as it's passed to the
   /// underlying C function that represents the native Swift function.
@@ -93,19 +96,21 @@ class ClangValueTypePrinter {
   static void printTypeGenericTraits(
       raw_ostream &os, const TypeDecl *typeDecl, StringRef typeMetadataFuncName,
       ArrayRef<GenericRequirement> typeMetadataFuncRequirements,
-      const ModuleDecl *moduleContext);
+      const ModuleDecl *moduleContext, DeclAndTypePrinter &declAndTypePrinter);
 
   static void printTypePrecedingGenericTraits(raw_ostream &os,
                                               const NominalTypeDecl *typeDecl,
                                               const ModuleDecl *moduleContext);
 
-  static void forwardDeclType(raw_ostream &os, const NominalTypeDecl *typeDecl);
+  static void forwardDeclType(raw_ostream &os, const NominalTypeDecl *typeDecl,
+                              DeclAndTypePrinter &declAndTypePrinter);
 
   /// Print out the type traits that allow a C++ type be used a Swift generic
   /// context.
-  static void printClangTypeSwiftGenericTraits(raw_ostream &os,
-                                               const TypeDecl *typeDecl,
-                                               const ModuleDecl *moduleContext);
+  static void
+  printClangTypeSwiftGenericTraits(raw_ostream &os, const TypeDecl *typeDecl,
+                                   const ModuleDecl *moduleContext,
+                                   DeclAndTypePrinter &declAndTypePrinter);
 
 private:
   raw_ostream &os;

test/Interop/SwiftToCxx/class/swift-class-availability-in-cxx.swift

@@ -0,0 +1,35 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend %s -typecheck -module-name Class -clang-header-expose-decls=all-public -emit-clang-header-path %t/class.h
+// RUN: %FileCheck %s < %t/class.h
+
+// RUN: %check-interop-cxx-header-in-clang(%t/class.h)
+
+@available(macOS 11, *)
+public final class ClassWithMacAvailability {
+  var field: Int64
+
+  init() {
+    field = 0
+  }
+}
+
+// CHECK: class SWIFT_AVAILABILITY(macos,introduced=11) _impl_ClassWithMacAvailability;
+// CHECK: class SWIFT_AVAILABILITY(macos,introduced=11) SWIFT_SYMBOL("s:5Class0A19WithMacAvailabilityC") ClassWithMacAvailability final
+// CHECK: class SWIFT_AVAILABILITY(macos,introduced=11) _impl_ClassWithMacAvailability {
+// CHECK: struct SWIFT_AVAILABILITY(macos,introduced=11) TypeMetadataTrait<Class::ClassWithMacAvailability> {
+// CHECK: struct SWIFT_AVAILABILITY(macos,introduced=11) implClassFor<Class::ClassWithMacAvailability>
+
+@available(*, unavailable, message: "stuff happened")
+public final class ClassWithUnavailable {
+  var field: Int64
+
+  init() {
+    field = 0
+  }
+}
+
+// CHECK: class SWIFT_UNAVAILABLE_MSG("stuff happened") _impl_ClassWithUnavailable;
+// CHECK: class SWIFT_UNAVAILABLE_MSG("stuff happened") SWIFT_SYMBOL("s:5Class0A15WithUnavailableC") ClassWithUnavailable final
+// CHECK: class SWIFT_UNAVAILABLE_MSG("stuff happened") _impl_ClassWithUnavailable {
+// CHECK: struct SWIFT_UNAVAILABLE_MSG("stuff happened") TypeMetadataTrait<Class::ClassWithUnavailable> {
+// CHECK: struct SWIFT_UNAVAILABLE_MSG("stuff happened") implClassFor<Class::ClassWithUnavailable>