Merge pull request #84208 from egorzhdan/egorzhdan/6.2-std-optional-noncopyable

🍒[cxx-interop] Avoid trying to instantiate copy constructor of `std::optional<NonCopyable>`

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -2982,8 +2982,17 @@ namespace {
           decl->getIdentifier() &&
           (decl->getName() == "tzdb" || decl->getName() == "time_zone_link" ||
            decl->getName() == "__compressed_pair" ||
+           decl->getName() == "__optional_copy_assign_base" || // libc++
+           decl->getName() == "__optional_move_assign_base" || // libc++
            decl->getName() == "time_zone"))
         return nullptr;
+      // Bail if this is one of the base types of std::optional. Those types are
+      // mixins that are not designed to be used directly.
+      if (decl->getDeclContext()->isNamespace() && decl->isInStdNamespace() &&
+          decl->getIdentifier() &&
+          (decl->getName() == "_Optional_payload_base" ||
+           decl->getName() == "_Optional_payload"))
+        return nullptr;
 
       auto &clangSema = Impl.getClangSema();
       // Make Clang define any implicit constructors it may need (copy,

test/Interop/Cxx/stdlib/Inputs/std-optional.h

@@ -7,11 +7,24 @@
 using StdOptionalInt = std::optional<int>;
 using StdOptionalString = std::optional<std::string>;
 
+struct HasDeletedCopyCtor {
+  int value;
+  HasDeletedCopyCtor(int value) : value(value) {}
+  HasDeletedCopyCtor(const HasDeletedCopyCtor &other) = delete;
+  HasDeletedCopyCtor(HasDeletedCopyCtor &&other) = default;
+};
+using StdOptionalHasDeletedCopyCtor = std::optional<HasDeletedCopyCtor>;
+
 inline StdOptionalInt getNonNilOptional() { return {123}; }
 
 inline StdOptionalInt getNilOptional() { return {std::nullopt}; }
 
+inline StdOptionalHasDeletedCopyCtor getNonNilOptionalHasDeletedCopyCtor() {
+  return StdOptionalHasDeletedCopyCtor(HasDeletedCopyCtor(654));
+}
+
 inline bool takesOptionalInt(std::optional<int> arg) { return (bool)arg; }
 inline bool takesOptionalString(std::optional<std::string> arg) { return (bool)arg; }
+inline bool takesOptionalHasDeletedCopyCtor(std::optional<HasDeletedCopyCtor> arg) { return (bool)arg; }
 
 #endif // TEST_INTEROP_CXX_STDLIB_INPUTS_STD_OPTIONAL_H

test/Interop/Cxx/stdlib/use-std-optional.swift

@@ -21,6 +21,9 @@ StdOptionalTestSuite.test("pointee") {
   modifiedOpt.pointee = 777
   expectEqual(777, modifiedOpt.pointee)
 #endif
+
+  let nonNilOptNonCopyable = getNonNilOptionalHasDeletedCopyCtor()
+  expectEqual(654, nonNilOptNonCopyable.pointee.value)
 }
 
 StdOptionalTestSuite.test("std::optional => Swift.Optional") {