Merge pull request #7387 from apple/egorzhdan/apinotes-importas-20221013

egorzhdan · web-flow · commit 75786f3388b6 · 2023-09-05T13:42:05.000+01:00
🍒[APINotes] Support `SwiftImportAs` for C++ structs
diff --git a/clang/include/clang/APINotes/Types.h b/clang/include/clang/APINotes/Types.h
@@ -657,6 +657,10 @@ class TagInfo : public CommonTypeInfo {
   unsigned IsFlagEnum : 1;
 
 public:
+  llvm::Optional<std::string> SwiftImportAs;
+  llvm::Optional<std::string> SwiftRetainOp;
+  llvm::Optional<std::string> SwiftReleaseOp;
+
   llvm::Optional<EnumExtensibilityKind> EnumExtensibility;
 
   TagInfo() : HasFlagEnum(0), IsFlagEnum(0) {}
@@ -674,6 +678,13 @@ class TagInfo : public CommonTypeInfo {
   TagInfo &operator|=(const TagInfo &RHS) {
     static_cast<CommonTypeInfo &>(*this) |= RHS;
 
+    if (!SwiftImportAs)
+      SwiftImportAs = RHS.SwiftImportAs;
+    if (!SwiftRetainOp)
+      SwiftRetainOp = RHS.SwiftRetainOp;
+    if (!SwiftReleaseOp)
+      SwiftReleaseOp = RHS.SwiftReleaseOp;
+
     if (!HasFlagEnum)
       setFlagEnum(RHS.isFlagEnum());
 
@@ -690,6 +701,9 @@ class TagInfo : public CommonTypeInfo {
 
 inline bool operator==(const TagInfo &LHS, const TagInfo &RHS) {
   return static_cast<const CommonTypeInfo &>(LHS) == RHS &&
+         LHS.SwiftImportAs == RHS.SwiftImportAs &&
+         LHS.SwiftRetainOp == RHS.SwiftRetainOp &&
+         LHS.SwiftReleaseOp == RHS.SwiftReleaseOp &&
          LHS.isFlagEnum() == RHS.isFlagEnum() &&
          LHS.EnumExtensibility == RHS.EnumExtensibility;
 }
diff --git a/clang/lib/APINotes/APINotesFormat.h b/clang/lib/APINotes/APINotesFormat.h
@@ -23,7 +23,7 @@ const uint16_t VERSION_MAJOR = 0;
 /// API notes file minor version number.
 ///
 /// When the format changes IN ANY WAY, this number should be incremented.
-const uint16_t VERSION_MINOR = 24; // EnumExtensibility + FlagEnum
+const uint16_t VERSION_MINOR = 25; // SwiftImportAs
 
 using IdentifierID = llvm::PointerEmbeddedInt<unsigned, 31>;
 using IdentifierIDField = llvm::BCVBR<16>;
diff --git a/clang/lib/APINotes/APINotesReader.cpp b/clang/lib/APINotes/APINotesReader.cpp
@@ -536,6 +536,28 @@ namespace {
             static_cast<EnumExtensibilityKind>((payload & 0x3) - 1);
       }
 
+      unsigned ImportAsLength =
+          endian::readNext<uint16_t, little, unaligned>(data);
+      if (ImportAsLength > 0) {
+        info.SwiftImportAs = (std::string(reinterpret_cast<const char *>(data),
+                                          ImportAsLength - 1));
+        data += ImportAsLength - 1;
+      }
+      unsigned RetainOpLength =
+          endian::readNext<uint16_t, little, unaligned>(data);
+      if (RetainOpLength > 0) {
+        info.SwiftRetainOp = (std::string(reinterpret_cast<const char *>(data),
+                                          RetainOpLength - 1));
+        data += RetainOpLength - 1;
+      }
+      unsigned ReleaseOpLength =
+          endian::readNext<uint16_t, little, unaligned>(data);
+      if (ReleaseOpLength > 0) {
+        info.SwiftReleaseOp = (std::string(reinterpret_cast<const char *>(data),
+                                           ReleaseOpLength - 1));
+        data += ReleaseOpLength - 1;
+      }
+
       readCommonTypeInfo(data, info);
       return info;
     }
diff --git a/clang/lib/APINotes/APINotesWriter.cpp b/clang/lib/APINotes/APINotesWriter.cpp
@@ -1109,12 +1109,15 @@ namespace {
     }
   };
 
-  /// Used to serialize the on-disk tag table.
-  class TagTableInfo : public CommonTypeTableInfo<TagTableInfo, TagInfo> {
-  public:
-    unsigned getUnversionedInfoSize(const TagInfo &info) {
-      return 1 + getCommonTypeInfoSize(info);
-    }
+/// Used to serialize the on-disk tag table.
+class TagTableInfo : public CommonTypeTableInfo<TagTableInfo, TagInfo> {
+public:
+  unsigned getUnversionedInfoSize(const TagInfo &TI) {
+    return 2 + (TI.SwiftImportAs ? TI.SwiftImportAs->size() : 0) +
+           2 + (TI.SwiftRetainOp ? TI.SwiftRetainOp->size() : 0) +
+           2 + (TI.SwiftReleaseOp ? TI.SwiftReleaseOp->size() : 0) +
+           1 + getCommonTypeInfoSize(TI);
+  }
 
     void emitUnversionedInfo(raw_ostream &out, const TagInfo &info) {
       endian::Writer writer(out, little);
@@ -1133,11 +1136,29 @@ namespace {
 
       writer.write<uint8_t>(payload);
 
-      emitCommonTypeInfo(out, info);
+    if (auto ImportAs = info.SwiftImportAs) {
+      writer.write<uint16_t>(ImportAs->size() + 1);
+      out.write(ImportAs->c_str(), ImportAs->size());
+    } else {
+      writer.write<uint16_t>(0);
+    }
+    if (auto RetainOp = info.SwiftRetainOp) {
+      writer.write<uint16_t>(RetainOp->size() + 1);
+      out.write(RetainOp->c_str(), RetainOp->size());
+    } else {
+      writer.write<uint16_t>(0);
+    }
+    if (auto ReleaseOp = info.SwiftReleaseOp) {
+      writer.write<uint16_t>(ReleaseOp->size() + 1);
+      out.write(ReleaseOp->c_str(), ReleaseOp->size());
+    } else {
+      writer.write<uint16_t>(0);
     }
-  };
 
-} // end anonymous namespace
+    emitCommonTypeInfo(out, info);
+  }
+};
+} // namespace
 
 void APINotesWriter::Implementation::writeTagBlock(
        llvm::BitstreamWriter &writer) {
diff --git a/clang/lib/APINotes/APINotesYAMLCompiler.cpp b/clang/lib/APINotes/APINotesYAMLCompiler.cpp
@@ -527,6 +527,9 @@ struct Tag {
   Optional<bool> SwiftPrivate;
   Optional<StringRef> SwiftBridge;
   Optional<StringRef> NSErrorDomain;
+  Optional<std::string> SwiftImportAs;
+  Optional<std::string> SwiftRetainOp;
+  Optional<std::string> SwiftReleaseOp;
   Optional<EnumExtensibilityKind> EnumExtensibility;
   Optional<bool> FlagEnum;
   Optional<EnumConvenienceAliasKind> EnumConvenienceKind;
@@ -557,6 +560,9 @@ template <> struct MappingTraits<Tag> {
     IO.mapOptional("SwiftName", T.SwiftName, StringRef(""));
     IO.mapOptional("SwiftBridge", T.SwiftBridge);
     IO.mapOptional("NSErrorDomain", T.NSErrorDomain);
+    IO.mapOptional("SwiftImportAs", T.SwiftImportAs);
+    IO.mapOptional("SwiftReleaseOp", T.SwiftReleaseOp);
+    IO.mapOptional("SwiftRetainOp", T.SwiftRetainOp);
     IO.mapOptional("EnumExtensibility", T.EnumExtensibility);
     IO.mapOptional("FlagEnum", T.FlagEnum);
     IO.mapOptional("EnumKind", T.EnumConvenienceKind);
@@ -1130,6 +1136,27 @@ namespace {
         if (convertCommonType(t, tagInfo, t.Name))
           continue;
 
+        if ((t.SwiftRetainOp.has_value() || t.SwiftReleaseOp.has_value()) &&
+            !t.SwiftImportAs) {
+          emitError(llvm::Twine("should declare SwiftImportAs to use "
+                                "SwiftRetainOp and SwiftReleaseOp (for ") +
+                    t.Name + ")");
+          continue;
+        }
+        if (t.SwiftReleaseOp.has_value() != t.SwiftRetainOp.has_value()) {
+          emitError(llvm::Twine("should declare both SwiftReleaseOp and "
+                                "SwiftRetainOp (for ") +
+                    t.Name + ")");
+          continue;
+        }
+
+        if (t.SwiftImportAs)
+          tagInfo.SwiftImportAs = t.SwiftImportAs;
+        if (t.SwiftRetainOp)
+          tagInfo.SwiftRetainOp = t.SwiftRetainOp;
+        if (t.SwiftReleaseOp)
+          tagInfo.SwiftReleaseOp = t.SwiftReleaseOp;
+
         if (t.EnumConvenienceKind) {
           if (t.EnumExtensibility) {
             emitError(llvm::Twine(
diff --git a/clang/lib/Sema/SemaAPINotes.cpp b/clang/lib/Sema/SemaAPINotes.cpp
@@ -627,6 +627,22 @@ static void ProcessAPINotes(Sema &S, ObjCMethodDecl *D,
 static void ProcessAPINotes(Sema &S, TagDecl *D,
                             const api_notes::TagInfo &info,
                             VersionedInfoMetadata metadata) {
+  if (auto ImportAs = info.SwiftImportAs) {
+    auto str = "import_" + ImportAs.value();
+    auto attr = SwiftAttrAttr::Create(S.Context, str, AttributeCommonInfo(clang::SourceRange()));
+    D->addAttr(attr);
+  }
+  if (auto RetainOp = info.SwiftRetainOp) {
+    auto str = "retain:" + RetainOp.value();
+    auto attr = SwiftAttrAttr::Create(S.Context, str, AttributeCommonInfo(clang::SourceRange()));
+    D->addAttr(attr);
+  }
+  if (auto ReleaseOp = info.SwiftReleaseOp) {
+    auto str = "release:" + ReleaseOp.value();
+    auto attr = SwiftAttrAttr::Create(S.Context, str, AttributeCommonInfo(clang::SourceRange()));
+    D->addAttr(attr);
+  }
+
   if (auto extensibility = info.EnumExtensibility) {
     using api_notes::EnumExtensibilityKind;
     bool shouldAddAttribute = (*extensibility != EnumExtensibilityKind::None);
diff --git a/clang/test/APINotes/Inputs/Headers/SwiftImportAs.apinotes b/clang/test/APINotes/Inputs/Headers/SwiftImportAs.apinotes
@@ -0,0 +1,9 @@
+---
+Name: SwiftImportAs
+Tags:
+- Name: ImmortalRefType
+  SwiftImportAs: reference
+- Name: RefCountedType
+  SwiftImportAs: reference
+  SwiftReleaseOp: RCRelease
+  SwiftRetainOp: RCRetain
diff --git a/clang/test/APINotes/Inputs/Headers/SwiftImportAs.h b/clang/test/APINotes/Inputs/Headers/SwiftImportAs.h
@@ -0,0 +1,6 @@
+struct ImmortalRefType {};
+
+struct RefCountedType { int value; };
+
+inline void RCRetain(RefCountedType *x) { x->value++; }
+inline void RCRelease(RefCountedType *x) { x->value--; }
diff --git a/clang/test/APINotes/Inputs/Headers/module.modulemap b/clang/test/APINotes/Inputs/Headers/module.modulemap
@@ -25,3 +25,7 @@ module ModuleWithWrongCasePrivate {
 module Namespaces {
   header "Namespaces.h"
 }
+
+module SwiftImportAs {
+  header "SwiftImportAs.h"
+}
diff --git a/clang/test/APINotes/swift-import-as.cpp b/clang/test/APINotes/swift-import-as.cpp
@@ -0,0 +1,16 @@
+// RUN: rm -rf %t && mkdir -p %t
+// RUN: %clang_cc1 -fmodules -fblocks -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache -fdisable-module-hash -fapinotes-modules -fsyntax-only -I %S/Inputs/Headers %s -x c++
+// RUN: %clang_cc1 -fmodules -fblocks -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache -fdisable-module-hash -fapinotes-modules -fsyntax-only -I %S/Inputs/Headers %s -x c++ -ast-dump -ast-dump-filter ImmortalRefType | FileCheck -check-prefix=CHECK-IMMORTAL %s
+// RUN: %clang_cc1 -fmodules -fblocks -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache -fdisable-module-hash -fapinotes-modules -fsyntax-only -I %S/Inputs/Headers %s -x c++ -ast-dump -ast-dump-filter RefCountedType | FileCheck -check-prefix=CHECK-REF-COUNTED %s
+
+#include <SwiftImportAs.h>
+
+// CHECK-IMMORTAL: Dumping ImmortalRefType:
+// CHECK-IMMORTAL-NEXT: CXXRecordDecl {{.+}} imported in SwiftImportAs {{.+}} struct ImmortalRefType
+// CHECK-IMMORTAL: SwiftAttrAttr {{.+}} <<invalid sloc>> "import_reference"
+
+// CHECK-REF-COUNTED: Dumping RefCountedType:
+// CHECK-REF-COUNTED-NEXT: CXXRecordDecl {{.+}} imported in SwiftImportAs {{.+}} struct RefCountedType
+// CHECK-REF-COUNTED: SwiftAttrAttr {{.+}} <<invalid sloc>> "import_reference"
+// CHECK-REF-COUNTED: SwiftAttrAttr {{.+}} <<invalid sloc>> "retain:RCRetain"
+// CHECK-REF-COUNTED: SwiftAttrAttr {{.+}} <<invalid sloc>> "release:RCRelease"

Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,7 @@ module ModuleWithWrongCasePrivate {`
`25`	`25`	`module Namespaces {`
`26`	`26`	`header "Namespaces.h"`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+module SwiftImportAs {`
	`30`	`+ header "SwiftImportAs.h"`
	`31`	`+}`