Merge pull request #67097 from hyp/eng/revert-8e0c17b27470de49fecf19d5a222ab247984d677

 Revert "[interop] do not import functions whose return type is not imported"

Author: hyp

include/swift/AST/DiagnosticsClangImporter.def

@@ -256,7 +256,6 @@ NOTE(record_field_not_imported, none, "field %0 unavailable (cannot import)", (c
 NOTE(invoked_func_not_imported, none, "function %0 unavailable (cannot import)", (const clang::NamedDecl*))
 NOTE(record_method_not_imported, none, "method %0 unavailable (cannot import)", (const clang::NamedDecl*))
 NOTE(objc_property_not_imported, none, "property %0 unavailable (cannot import)", (const clang::NamedDecl*))
-NOTE(unsupported_return_type, none, "C++ function %0 is unavailable: return type is unavailable in Swift", (const clang::NamedDecl*))
 
 NOTE(placeholder_for_forward_declared_interface_member_access_failure, none,
      "class '%0' will be imported as an opaque placeholder class and may be "

lib/ClangImporter/ClangDerivedConformances.cpp

@@ -565,6 +565,23 @@ void swift::conformToCxxSequenceIfNeeded(
   }
 }
 
+static bool isStdSetType(const clang::CXXRecordDecl *clangDecl) {
+  return isStdDecl(clangDecl, {"set", "unordered_set", "multiset"});
+}
+
+bool swift::isUnsafeStdMethod(const clang::CXXMethodDecl *methodDecl) {
+  auto parentDecl =
+      dyn_cast<clang::CXXRecordDecl>(methodDecl->getDeclContext());
+  if (!parentDecl)
+    return false;
+  if (!isStdSetType(parentDecl))
+    return false;
+  if (methodDecl->getDeclName().isIdentifier() &&
+      methodDecl->getName() == "insert")
+    return true;
+  return false;
+}
+
 void swift::conformToCxxSetIfNeeded(ClangImporter::Implementation &impl,
                                     NominalTypeDecl *decl,
                                     const clang::CXXRecordDecl *clangDecl) {
@@ -576,7 +593,7 @@ void swift::conformToCxxSetIfNeeded(ClangImporter::Implementation &impl,
 
   // Only auto-conform types from the C++ standard library. Custom user types
   // might have a similar interface but different semantics.
-  if (!isStdDecl(clangDecl, {"set", "unordered_set", "multiset"}))
+  if (!isStdSetType(clangDecl))
     return;
 
   auto valueType = lookupDirectSingleWithoutExtensions<TypeAliasDecl>(

lib/ClangImporter/ClangDerivedConformances.h

@@ -20,6 +20,8 @@ namespace swift {
 
 bool isIterator(const clang::CXXRecordDecl *clangDecl);
 
+bool isUnsafeStdMethod(const clang::CXXMethodDecl *methodDecl);
+
 /// If the decl is a C++ input iterator, synthesize a conformance to the
 /// UnsafeCxxInputIterator protocol, which is defined in the Cxx module.
 void conformToCxxIteratorIfNeeded(ClangImporter::Implementation &impl,

lib/ClangImporter/ClangImporter.cpp

@@ -5711,7 +5711,13 @@ importName(const clang::NamedDecl *D,
 
 Type ClangImporter::importFunctionReturnType(
     const clang::FunctionDecl *clangDecl, DeclContext *dc) {
-  if (auto imported = Impl.importFunctionReturnType(clangDecl, dc).getType())
+  bool isInSystemModule =
+      cast<ClangModuleUnit>(dc->getModuleScopeContext())->isSystemModule();
+  bool allowNSUIntegerAsInt =
+      Impl.shouldAllowNSUIntegerAsInt(isInSystemModule, clangDecl);
+  if (auto imported =
+          Impl.importFunctionReturnType(dc, clangDecl, allowNSUIntegerAsInt)
+              .getType())
     return imported;
   return dc->getASTContext().getNeverType();
 }
@@ -6794,6 +6800,11 @@ bool IsSafeUseOfCxxDecl::evaluate(Evaluator &evaluator,
         method->getReturnType()->isReferenceType())
       return false;
 
+    // Check if it's one of the known unsafe methods we currently
+    // mark as safe by default.
+    if (isUnsafeStdMethod(method))
+      return false;
+
     // Try to figure out the semantics of the return type. If it's a
     // pointer/iterator, it's unsafe.
     if (auto returnType = dyn_cast<clang::RecordType>(

lib/ClangImporter/ImportDecl.cpp

@@ -3162,16 +3162,13 @@ namespace {
 
       if (auto recordType = dyn_cast<clang::RecordType>(
               decl->getReturnType().getCanonicalType())) {
-        if (recordHasReferenceSemantics(recordType->getDecl())) {
-          Impl.addImportDiagnostic(
-              decl,
-              Diagnostic(diag::reference_passed_by_value,
-                         Impl.SwiftContext.AllocateCopy(
-                             recordType->getDecl()->getNameAsString()),
-                         "the return"),
-              decl->getLocation());
-          return true;
-        }
+        Impl.addImportDiagnostic(
+            decl, Diagnostic(diag::reference_passed_by_value,
+                             Impl.SwiftContext.AllocateCopy(
+                                 recordType->getDecl()->getNameAsString()),
+                             "the return"),
+            decl->getLocation());
+        return recordHasReferenceSemantics(recordType->getDecl());
       }
 
       return false;
@@ -3557,14 +3554,6 @@ namespace {
         func->setAccess(AccessLevel::Public);
       }
 
-      if (!isa<clang::CXXConstructorDecl>(decl) && !importedType) {
-        if (!Impl.importFunctionReturnType(decl, result->getDeclContext())) {
-          Impl.addImportDiagnostic(
-              decl, Diagnostic(diag::unsupported_return_type, decl),
-              decl->getSourceRange().getBegin());
-          return nullptr;
-        }
-      }
       result->setIsObjC(false);
       result->setIsDynamic(false);
 

lib/ClangImporter/ImportType.cpp

@@ -2075,15 +2075,6 @@ applyImportTypeAttrs(ImportTypeAttrs attrs, Type type,
   return type;
 }
 
-ImportedType ClangImporter::Implementation::importFunctionReturnType(
-    const clang::FunctionDecl *clangDecl, DeclContext *dc) {
-  bool isInSystemModule =
-      cast<ClangModuleUnit>(dc->getModuleScopeContext())->isSystemModule();
-  bool allowNSUIntegerAsInt =
-      shouldAllowNSUIntegerAsInt(isInSystemModule, clangDecl);
-  return importFunctionReturnType(dc, clangDecl, allowNSUIntegerAsInt);
-}
-
 ImportedType ClangImporter::Implementation::importFunctionReturnType(
     DeclContext *dc, const clang::FunctionDecl *clangDecl,
     bool allowNSUIntegerAsInt) {

lib/ClangImporter/ImporterImpl.h

@@ -1372,9 +1372,6 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
                                         const clang::FunctionDecl *clangDecl,
                                         bool allowNSUIntegerAsInt);
 
-  ImportedType importFunctionReturnType(const clang::FunctionDecl *clangDecl,
-                                        DeclContext *dc);
-
   /// Import the parameter list for a function
   ///
   /// \param clangDecl The underlying declaration, if any; should only be