Merge pull request #76286 from hyp/eng/bodyParamsimport

[cxx-interop] do not rely on bodyParams being always non-null when im…

Author: hyp

lib/ClangImporter/ImportDecl.cpp

@@ -3645,20 +3645,20 @@ namespace {
         }
       }
 
-      if (name && name.isSimpleName()) {
-        assert(importedName.hasCustomName() &&
-               "imported function with simple name?");
-        // Just fill in empty argument labels.
-        name = DeclName(Impl.SwiftContext, name.getBaseName(), bodyParams);
-      }
-
       if (!bodyParams) {
         Impl.addImportDiagnostic(
             decl, Diagnostic(diag::invoked_func_not_imported, decl),
             decl->getSourceRange().getBegin());
         return nullptr;
       }
 
+      if (name && name.isSimpleName()) {
+        assert(importedName.hasCustomName() &&
+               "imported function with simple name?");
+        // Just fill in empty argument labels.
+        name = DeclName(Impl.SwiftContext, name.getBaseName(), bodyParams);
+      }
+
       if (name && name.getArgumentNames().size() != bodyParams->size()) {
         // We synthesized additional parameters so rebuild the DeclName.
         name = DeclName(Impl.SwiftContext, name.getBaseName(), bodyParams);

test/Interop/Cxx/operators/Inputs/member-inline.h

@@ -501,6 +501,23 @@ class HasStaticOperatorCallWithConstOperator {
    }
 };
 
+
+// This type is intentionally unimportable,
+// to ensure that the function that uses in a parameter
+// cannot import its parameter list.
+struct UnimportableCxxTypeByDefault {
+private:
+  UnimportableCxxTypeByDefault(const UnimportableCxxTypeByDefault &) = delete;
+  UnimportableCxxTypeByDefault(UnimportableCxxTypeByDefault &&) = delete;
+};
+
+struct HasStaticOperatorCallWithUnimportableCxxType {
+  // This operator won't be imported.
+  static int operator()(const UnimportableCxxTypeByDefault &) noexcept {
+      return 0;
+  }
+};
+
 struct ClassWithOperatorStarAvailable {
   int value;
 

test/Interop/Cxx/operators/member-inline-module-interface.swift

@@ -307,3 +307,7 @@
 // CHECK:   func callAsFunction(_ x: Int32, _ y: Int32) -> Int32
 // CHECK:   func callAsFunction(_ x: Int32) -> Int32
 // CHECK: }
+
+// CHECK: struct HasStaticOperatorCallWithUnimportableCxxType {
+// CHECK-NEXT:  init()
+// CHECK-NEXT: }