[interop] add SWIFT_ prefix to the C++ interop annotations

Author: hyp

include/swift/AST/DiagnosticsClangImporter.def

@@ -165,7 +165,7 @@ NOTE(record_is_dependent, none, "record '%0' is dependent", (StringRef))
 NOTE(record_parent_unimportable, none, "record %0's parent is not importable", (StringRef))
 NOTE(reference_passed_by_value, none, "function uses foreign reference type "
                                       "'%0' as a value in %1 types which breaks "
-                                      "'import_reference' contract (outlined in "
+                                      "'swift_shared_reference' contract (outlined in "
                                       "C++ Interop User Manual).",
      (StringRef, StringRef))
 NOTE(record_not_automatically_importable, none, "record '%0' is not "
@@ -186,10 +186,10 @@ NOTE(projection_reference_not_imported, none, "C++ method '%0' that returns a re
 NOTE(projection_may_return_interior_ptr, none, "C++ method '%0' may return an "
                                     "interior pointer. ",
      (StringRef))
-NOTE(mark_self_contained, none, "Mark type '%0' as 'SELF_CONTAINED' in C++ to "
+NOTE(mark_self_contained, none, "Mark type '%0' as 'SWIFT_SELF_CONTAINED' in C++ to "
                                  "make methods that use it available in Swift. ",
      (StringRef))
-NOTE(mark_safe_to_import, none, "annotate method '%0' with 'RETURNS_INDEPENDENT_VALUE' in C++ to "
+NOTE(mark_safe_to_import, none, "annotate method '%0' with 'SWIFT_RETURNS_INDEPENDENT_VALUE' in C++ to "
                                 "make it available in Swift",
      (StringRef))
 

lib/ClangImporter/ClangImporter.cpp

@@ -4409,7 +4409,7 @@ static void diagnoseForeignReferenceTypeFixit(ClangImporter::Implementation &Imp
   auto importedLoc =
     Impl.SwiftContext.getClangModuleLoader()->importSourceLocation(loc.clangLoc);
   Impl.diagnose(loc, diag).fixItInsert(
-      importedLoc, "SHARED_REFERENCE(<#retain#>, <#release#>) ");
+      importedLoc, "SWIFT_SHARED_REFERENCE(<#retain#>, <#release#>) ");
 }
 
 bool ClangImporter::Implementation::emitDiagnosticsForTarget(

lib/ClangImporter/bridging

@@ -21,12 +21,12 @@
 /// of the objects it references. Such type should not reference any objects whose
 /// lifetime is controlled externally. This annotation allows Swift to import methods
 /// that return a `class` or `struct` type that is annotated with this macro.
-#define SELF_CONTAINED __attribute__((swift_attr("import_owned")))
+#define SWIFT_SELF_CONTAINED __attribute__((swift_attr("import_owned")))
 
 /// Specifies that a C++ method returns a value that is presumed to contain
 /// objects whose lifetime is not dependent on `this` or other parameters passed
 /// to the method.
-#define RETURNS_INDEPENDENT_VALUE __attribute__((swift_attr("import_unsafe")))
+#define SWIFT_RETURNS_INDEPENDENT_VALUE __attribute__((swift_attr("import_unsafe")))
 
 #define _CXX_INTEROP_STRINGIFY(_x) #_x
 
@@ -38,7 +38,7 @@
 /// This example shows how to use this macro to let Swift know that
 /// a non-copyable reference counted C++ class can be imported as a reference counted type in Swift:
 ///  ```c++
-///    class SHARED_REFERENCE(retainSharedObject, releaseSharedObject)
+///    class SWIFT_SHARED_REFERENCE(retainSharedObject, releaseSharedObject)
 ///    SharedObject : NonCopyable, IntrusiveReferenceCounted<SharedObject> {
 ///    public:
 ///      static SharedObject* create();
@@ -56,7 +56,7 @@
 ///    object.doSomething()
 ///    // The Swift compiler will release object here.
 ///  ```
-#define SHARED_REFERENCE(_retain, _release)                                \
+#define SWIFT_SHARED_REFERENCE(_retain, _release)                                \
   __attribute__((swift_attr("import_reference")))                          \
   __attribute__((swift_attr(_CXX_INTEROP_STRINGIFY(retain:_retain))))      \
   __attribute__((swift_attr(_CXX_INTEROP_STRINGIFY(release:_release))))
@@ -69,7 +69,7 @@
 /// This example shows how to use this macro to let Swift know that
 /// a non-copyable singleton C++ class can be imported as a reference type in Swift:
 ///  ```c++
-///    class IMMORTAL_REFERENCE
+///    class SWIFT_IMMORTAL_REFERENCE
 ///    LoggerSingleton : NonCopyable {
 ///    public:
 ///      static LoggerSingleton &getInstance();
@@ -83,15 +83,15 @@
 ///    let logger = LoggerSingleton.getInstance()
 ///    logger.log(123)
 ///  ```
-#define IMMORTAL_REFERENCE                                                \
+#define SWIFT_IMMORTAL_REFERENCE                                                \
   __attribute__((swift_attr("import_reference")))                         \
   __attribute__((swift_attr(_CXX_INTEROP_STRINGIFY(retain:immortal))))    \
   __attribute__((swift_attr(_CXX_INTEROP_STRINGIFY(release:immortal))))
 
 /// Specifies that a C++ `class` or `struct` is a reference type whose lifetime
 /// is not managed automatically. The programmer must validate that any reference
 /// to such object is valid themselves. This annotation lets Swift import such a type as a reference type in Swift.
-#define UNSAFE_REFERENCE                                                  \
+#define SWIFT_UNSAFE_REFERENCE                                                  \
   __attribute__((swift_attr("import_reference")))                         \
   __attribute__((swift_attr(_CXX_INTEROP_STRINGIFY(retain:immortal))))    \
   __attribute__((swift_attr(_CXX_INTEROP_STRINGIFY(release:immortal))))
@@ -105,10 +105,10 @@
 /// This example shows how to use this macro to conform a class template to a Swift protocol:
 ///  ```
 ///    template<class T>
-///    class CONFORMS_TO_PROTOCOL(SwiftModule.ProtocolName)
+///    class SWIFT_CONFORMS_TO_PROTOCOL(SwiftModule.ProtocolName)
 ///    CustomClass {};
 ///  ```
-#define CONFORMS_TO_PROTOCOL(_moduleName_protocolName) \
+#define SWIFT_CONFORMS_TO_PROTOCOL(_moduleName_protocolName) \
   __attribute__((swift_attr(_CXX_INTEROP_STRINGIFY(conforms_to:_moduleName_protocolName))))
 
 #endif // SWIFT_CLANGIMPORTER_SWIFT_INTEROP_SUPPORT_H

lib/Sema/CSDiagnostics.cpp

@@ -3910,7 +3910,7 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
       ctx.Diags
           .diagnose(methodSwiftLoc, diag::mark_safe_to_import,
                     name.getBaseIdentifier().str())
-          .fixItInsert(methodSwiftLoc, " RETURNS_INDEPENDENT_VALUE ");
+          .fixItInsert(methodSwiftLoc, " SWIFT_RETURNS_INDEPENDENT_VALUE ");
     } else if (cxxMethod->getReturnType()->isReferenceType()) {
       // Rewrite a call to .at(42) as a subscript.
       if (name.getBaseIdentifier().is("at") &&
@@ -3940,7 +3940,7 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
         ctx.Diags
             .diagnose(methodSwiftLoc, diag::mark_safe_to_import,
                       name.getBaseIdentifier().str())
-            .fixItInsert(methodSwiftLoc, " RETURNS_INDEPENDENT_VALUE ");
+            .fixItInsert(methodSwiftLoc, " SWIFT_RETURNS_INDEPENDENT_VALUE ");
       }
     } else if (cxxMethod->getReturnType()->isRecordType()) {
       if (auto cxxRecord = dyn_cast<clang::CXXRecordDecl>(
@@ -3965,11 +3965,10 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
           ctx.Diags
               .diagnose(methodSwiftLoc, diag::mark_safe_to_import,
                         name.getBaseIdentifier().str())
-              .fixItInsert(methodSwiftLoc, " RETURNS_INDEPENDENT_VALUE ");
+              .fixItInsert(methodSwiftLoc, " SWIFT_RETURNS_INDEPENDENT_VALUE ");
           ctx.Diags
               .diagnose(baseSwiftLoc, diag::mark_self_contained, returnTypeStr)
-              .fixItInsert(baseSwiftLoc,
-                           "SELF_CONTAINED ");
+              .fixItInsert(baseSwiftLoc, "SWIFT_SELF_CONTAINED ");
         }
       }
     }

test/Interop/Cxx/class/fixit-add-safe-to-import-self-contained.swift

@@ -21,21 +21,21 @@ struct X {
 import Test
 
 public func test(x: X) {
-  // CHECK: note: annotate method 'test' with 'RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
+  // CHECK: note: annotate method 'test' with 'SWIFT_RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
   // CHECK: int *test() { }
   // CHECK: ^
-  // CHECK: RETURNS_INDEPENDENT_VALUE
+  // CHECK: SWIFT_RETURNS_INDEPENDENT_VALUE
 
   x.test()
 
-  // CHECK: note: annotate method 'other' with 'RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
+  // CHECK: note: annotate method 'other' with 'SWIFT_RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
   // CHECK: Ptr other() { }
   // CHECK: ^
-  // CHECK: RETURNS_INDEPENDENT_VALUE
+  // CHECK: SWIFT_RETURNS_INDEPENDENT_VALUE
 
-  // CHECK: note: Mark type 'Ptr' as 'SELF_CONTAINED' in C++ to make methods that use it available in Swift.
+  // CHECK: note: Mark type 'Ptr' as 'SWIFT_SELF_CONTAINED' in C++ to make methods that use it available in Swift.
   // CHECK: struct Ptr {
   // CHECK: ^
-  // CHECK: SELF_CONTAINED
+  // CHECK: SWIFT_SELF_CONTAINED
   x.other()
 }

test/Interop/Cxx/class/invalid-class-errors.swift

@@ -30,15 +30,15 @@ import Test
 // CHECK: note: record 'A' is not automatically available: does not have a copy constructor or destructor. Does this type have reference semantics?
 // CHECK: struct A {
 // CHECK: ^
-// CHECK: SHARED_REFERENCE(<#retain#>, <#release#>)
+// CHECK: SWIFT_SHARED_REFERENCE(<#retain#>, <#release#>)
 public func test(x: A) { }
 // CHECK: note: record 'B' is not automatically available: does not have a copy constructor or destructor. Does this type have reference semantics?
 // CHECK: struct {{.*}}B {
 // CHECK: ^
-// CHECK: SHARED_REFERENCE(<#retain#>, <#release#>)
+// CHECK: SWIFT_SHARED_REFERENCE(<#retain#>, <#release#>)
 public func test(x: B) { }
 // CHECK: note: record 'Nested' is not automatically available: does not have a copy constructor or destructor. Does this type have reference semantics?
 // CHECK: struct Nested {
 // CHECK: ^
-// CHECK: SHARED_REFERENCE(<#retain#>, <#release#>)
+// CHECK: SWIFT_SHARED_REFERENCE(<#retain#>, <#release#>)
 public func test(x: Namespace.Nested) { }

test/Interop/Cxx/class/invalid-unsafe-projection-errors.swift

@@ -29,16 +29,16 @@ import Test
 public func test(x: M) {
   // CHECK: note: C++ method 'test1' that returns a pointer of type 'UnsafeMutablePointer' is unavailable.
   // CHECK: note: C++ method 'test1' may return an interior pointer.
-  // CHECK: note: annotate method 'test1' with 'RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
+  // CHECK: note: annotate method 'test1' with 'SWIFT_RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
   x.test1()
   // CHECK: note: C++ method 'test2' that returns a reference of type 'UnsafeMutablePointer' is unavailable.
   // CHECK: note: C++ method 'test2' may return an interior pointer.
-  // CHECK: note: annotate method 'test2' with 'RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
+  // CHECK: note: annotate method 'test2' with 'SWIFT_RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
   x.test2()
   // CHECK: note: C++ method 'test3' that returns a value of type 'Ptr' is unavailable.
   // CHECK: note: C++ method 'test3' may return an interior pointer.
-  // CHECK: note: annotate method 'test3' with 'RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
-  // CHECK: note: Mark type 'Ptr' as 'SELF_CONTAINED' in C++ to make methods that use it available in Swift.
+  // CHECK: note: annotate method 'test3' with 'SWIFT_RETURNS_INDEPENDENT_VALUE' in C++ to make it available in Swift
+  // CHECK: note: Mark type 'Ptr' as 'SWIFT_SELF_CONTAINED' in C++ to make methods that use it available in Swift.
   x.test3()
   // CHECK: note: C++ method 'begin' that returns an iterator is unavailable
   // CHECK: note: C++ methods that return iterators are potentially unsafe. Try re-writing to use Swift iterator APIs.

test/Interop/Cxx/ergonomics/swift-bridging-annotations.swift

@@ -29,16 +29,16 @@ module CxxModule {
 #pragma clang module import SwiftBridging
 #endif
 
-class SELF_CONTAINED SelfContained {
+class SWIFT_SELF_CONTAINED SelfContained {
 public:
     int *pointer;
 
     SelfContained();
 
-    const int *returnsIndependent() const RETURNS_INDEPENDENT_VALUE;
+    const int *returnsIndependent() const SWIFT_RETURNS_INDEPENDENT_VALUE;
 };
 
-class SHARED_REFERENCE(retainSharedObject, releaseSharedObject)
+class SWIFT_SHARED_REFERENCE(retainSharedObject, releaseSharedObject)
 SharedObject {
 public:
     static SharedObject *create();
@@ -47,21 +47,21 @@ public:
 void retainSharedObject(SharedObject *);
 void releaseSharedObject(SharedObject *);
 
-class IMMORTAL_REFERENCE LoggerSingleton {
+class SWIFT_IMMORTAL_REFERENCE LoggerSingleton {
 public:
     LoggerSingleton(const LoggerSingleton &) = delete;
     static LoggerSingleton *getInstance();
 };
 
-class UNSAFE_REFERENCE UnsafeNonCopyable {
+class SWIFT_UNSAFE_REFERENCE UnsafeNonCopyable {
 public:
     UnsafeNonCopyable(UnsafeNonCopyable &) = delete;
 };
 
 UnsafeNonCopyable *returnsPointerToUnsafeReference();
 void takesPointerToUnsafeNonCopyable(UnsafeNonCopyable *);
 
-class CONFORMS_TO_PROTOCOL(SwiftMod.Proto) ConformsTo {
+class SWIFT_CONFORMS_TO_PROTOCOL(SwiftMod.Proto) ConformsTo {
 public:
 };
 

test/Interop/Cxx/foreign-reference/value-type-errors.swift

@@ -19,8 +19,8 @@ void takesRef(Ref r);
 import Test
 
 public func test(x: Ref) {
-    // CHECK: note: function uses foreign reference type 'Ref' as a value in the return types which breaks 'import_reference' contract (outlined in C++ Interop User Manual).
+    // CHECK: note: function uses foreign reference type 'Ref' as a value in the return types which breaks 'swift_shared_reference' contract (outlined in C++ Interop User Manual).
     returnsRef()
-    // CHECK: note: function uses foreign reference type 'Ref' as a value in a parameter types which breaks 'import_reference' contract (outlined in C++ Interop User Manual).
+    // CHECK: note: function uses foreign reference type 'Ref' as a value in a parameter types which breaks 'swift_shared_reference' contract (outlined in C++ Interop User Manual).
     takesRef(x)
-}
+}