[cxx-interop] Add fix-its to apply 'safe_to_import' and 'self_contained'.

Author: zoecarver

include/swift/AST/ClangModuleLoader.h

@@ -27,6 +27,7 @@ class Preprocessor;
 class Sema;
 class TargetInfo;
 class Type;
+class SourceLocation;
 } // namespace clang
 
 namespace swift {
@@ -294,6 +295,8 @@ class ClangModuleLoader : public ModuleLoader {
 
   virtual const clang::TypedefType *
   getTypeDefForCXXCFOptionsDefinition(const clang::Decl *candidateDecl) = 0;
+
+  virtual SourceLoc importSourceLocation(clang::SourceLocation loc) = 0;
 };
 
 /// Describes a C++ template instantiation error.

include/swift/ClangImporter/ClangImporter.h

@@ -565,6 +565,8 @@ class ClangImporter final : public ClangModuleLoader {
 
   const clang::TypedefType *getTypeDefForCXXCFOptionsDefinition(
       const clang::Decl *candidateDecl) override;
+
+  SourceLoc importSourceLocation(clang::SourceLocation loc) override;
 };
 
 ImportDecl *createImportDecl(ASTContext &Ctx, DeclContext *DC, ClangNode ClangN,

lib/ClangImporter/ClangImporter.cpp

@@ -6316,6 +6316,12 @@ void ClangImporter::diagnoseMemberValue(const DeclName &name,
   }
 }
 
+SourceLoc ClangImporter::importSourceLocation(clang::SourceLocation loc) {
+  auto &bufferImporter = Impl.getBufferImporterForDiagnostics();
+  return bufferImporter.resolveSourceLocation(
+      getClangASTContext().getSourceManager(), loc);
+}
+
 static bool hasImportAsRefAttr(const clang::RecordDecl *decl) {
   return decl->hasAttrs() && llvm::any_of(decl->getAttrs(), [](auto *attr) {
            if (auto swiftAttr = dyn_cast<clang::SwiftAttrAttr>(attr))

lib/Sema/CSDiagnostics.cpp

@@ -3968,6 +3968,14 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
                              ->getName()
                              .str();
 
+    auto baseClangLoc = cxxMethod->getParent()->getLocation();
+    auto baseSwiftLoc =
+        ctx.getClangModuleLoader()->importSourceLocation(baseClangLoc);
+
+    auto methodClangLoc = cxxMethod->getLocation();
+    auto methodSwiftLoc =
+        ctx.getClangModuleLoader()->importSourceLocation(methodClangLoc);
+
     // Rewrite front() and back() as first and last.
     if ((name.getBaseIdentifier().is("front") ||
          name.getBaseIdentifier().is("back")) &&
@@ -4024,8 +4032,11 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
                          name.getBaseIdentifier().str(), returnTypeStr);
       ctx.Diags.diagnose(loc, diag::projection_may_return_interior_ptr,
                          name.getBaseIdentifier().str());
-      ctx.Diags.diagnose(loc, diag::mark_safe_to_import,
-                         name.getBaseIdentifier().str());
+      ctx.Diags
+          .diagnose(methodSwiftLoc, diag::mark_safe_to_import,
+                    name.getBaseIdentifier().str())
+          .fixItInsert(methodSwiftLoc,
+                       " __attribute__((swift_attr(\"safe_to_import\"))) ");
     } else if (cxxMethod->getReturnType()->isReferenceType()) {
       // Rewrite a call to .at(42) as a subscript.
       if (name.getBaseIdentifier().is("at") &&
@@ -4052,8 +4063,11 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
                            name.getBaseIdentifier().str(), returnTypeStr);
         ctx.Diags.diagnose(loc, diag::projection_may_return_interior_ptr,
                            name.getBaseIdentifier().str());
-        ctx.Diags.diagnose(loc, diag::mark_safe_to_import,
-                           name.getBaseIdentifier().str());
+        ctx.Diags
+            .diagnose(methodSwiftLoc, diag::mark_safe_to_import,
+                      name.getBaseIdentifier().str())
+            .fixItInsert(methodSwiftLoc,
+                         " __attribute__((swift_attr(\"safe_to_import\"))) ");
       }
     } else if (cxxMethod->getReturnType()->isRecordType()) {
       if (auto cxxRecord = dyn_cast<clang::CXXRecordDecl>(
@@ -4071,9 +4085,15 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
                              name.getBaseIdentifier().str(), returnTypeStr);
           ctx.Diags.diagnose(loc, diag::projection_may_return_interior_ptr,
                              name.getBaseIdentifier().str());
-          ctx.Diags.diagnose(loc, diag::mark_safe_to_import,
-                             name.getBaseIdentifier().str());
-          ctx.Diags.diagnose(loc, diag::mark_self_contained, returnTypeStr);
+          ctx.Diags
+              .diagnose(methodSwiftLoc, diag::mark_safe_to_import,
+                        name.getBaseIdentifier().str())
+              .fixItInsert(methodSwiftLoc,
+                           " __attribute__((swift_attr(\"safe_to_import\"))) ");
+          ctx.Diags
+              .diagnose(baseSwiftLoc, diag::mark_self_contained, returnTypeStr)
+              .fixItInsert(baseSwiftLoc,
+                           "__attribute__((swift_attr(\"self_contained\"))) ");
         }
       }
     }