Various changes after merging master:

- Adapt tests to changes that have happened in the meantime (e.g.
  `HasVirtualBase` is rightly no longer considered loadable)
- Don't import copy or move constructors (noticed this because
  references are now imported correctly, so copy and move constructors
  suddenly started showing up in the SIL test)
- Don't try to define an implicitly-deleted default constructor (this
  previously broke loadable-types-silgen.swift)

Author: martinboehme

lib/ClangImporter/ImportDecl.cpp

@@ -3482,8 +3482,9 @@ namespace {
 
       result->setHasUnreferenceableStorage(hasUnreferenceableStorage);
 
-      if (auto cxxRecordDecl = dyn_cast<clang::CXXRecordDecl>(decl)) {
-        result->setIsCxxNonTrivial(!cxxRecordDecl->isTriviallyCopyable());
+      if (cxxRecordDecl) {
+        result->setIsCxxNonTrivial(
+            !cxxRecordDecl->isTriviallyCopyable());
 
         for (auto ctor : cxxRecordDecl->ctors()) {
           if (ctor->isCopyConstructor() &&
@@ -3518,8 +3519,9 @@ namespace {
         clang::CXXConstructorDecl *ctor =
             clangSema.DeclareImplicitDefaultConstructor(
                 const_cast<clang::CXXRecordDecl *>(decl));
-        clangSema.DefineImplicitDefaultConstructor(clang::SourceLocation(),
-                                                   ctor);
+        if (!ctor->isDeleted())
+          clangSema.DefineImplicitDefaultConstructor(clang::SourceLocation(),
+                                                     ctor);
       }
 
       return VisitRecordDecl(decl);
@@ -3898,6 +3900,11 @@ namespace {
 
       AbstractFunctionDecl *result = nullptr;
       if (auto *ctordecl = dyn_cast<clang::CXXConstructorDecl>(decl)) {
+        // Don't import copy constructor or move constructor -- these will be
+        // provided through the value witness table.
+        if (ctordecl->isCopyConstructor() || ctordecl->isMoveConstructor())
+          return nullptr;
+
         DeclName ctorName(Impl.SwiftContext, DeclBaseName::createConstructor(),
                           bodyParams);
         result = Impl.createDeclWithClangNode<ConstructorDecl>(

test/Interop/Cxx/class/Inputs/constructors.h

@@ -21,6 +21,11 @@ struct ConstructorWithParam {
   int x;
 };
 
+struct CopyAndMoveConstructor {
+  CopyAndMoveConstructor(const CopyAndMoveConstructor &) = default;
+  CopyAndMoveConstructor(CopyAndMoveConstructor &&) = default;
+};
+
 struct Base {};
 
 struct ArgType {

test/Interop/Cxx/class/constructors-ir.swift

@@ -22,19 +22,19 @@ public func createHasVirtualBase() -> HasVirtualBase {
   //   Swift constructors that return their result indirectly) because the C++
   //   constructor has explicit access to `this` and may capture it.
   //
-  // ITANIUM_X64: define swiftcc { i8*, i32 } @"$ss20createHasVirtualBaseSo0bcD0VyF"()
+  // ITANIUM_X64: define swiftcc void @"$ss20createHasVirtualBaseSo0bcD0VyF"(%TSo14HasVirtualBaseV* noalias nocapture sret %0)
   // ITANIUM_X64-NOT: define
   // ITANIUM_X64: call void @_ZN14HasVirtualBaseC1E7ArgType(%struct.HasVirtualBase* noalias sret %{{[0-9]+}}, i32 %{{[0-9]+}})
   //
-  // ITANIUM_ARM: define protected swiftcc { i8*, i32 } @"$ss20createHasVirtualBaseSo0bcD0VyF"()
+  // ITANIUM_ARM: define protected swiftcc void @"$ss20createHasVirtualBaseSo0bcD0VyF"(%TSo14HasVirtualBaseV* noalias nocapture sret %0)
   // To verify that the thunk is inlined, make sure there's no intervening
   // `define`, i.e. the call to the C++ constructor happens in
   // createHasVirtualBase(), not some later function.
   // ITANIUM_ARM-NOT: define
   // Note `this` return type.
   // ITANIUM_ARM: call %struct.HasVirtualBase* @_ZN14HasVirtualBaseC1E7ArgType(%struct.HasVirtualBase* %{{[0-9]+}}, [1 x i32] %{{[0-9]+}})
   //
-  // MICROSOFT_X64: define dllexport swiftcc { i8*, i32 } @"$ss20createHasVirtualBaseSo0bcD0VyF"()
+  // MICROSOFT_X64: define dllexport swiftcc void @"$ss20createHasVirtualBaseSo0bcD0VyF"(%TSo14HasVirtualBaseV* noalias nocapture sret %0)
   // MICROSOFT_X64-NOT: define
   // Note `this` return type and implicit "most derived" argument.
   // MICROSOFT_X64: call %struct.HasVirtualBase* @"??0HasVirtualBase@@QEAA@UArgType@@@Z"(%struct.HasVirtualBase* %{{[0-9]+}}, i32 %{{[0-9]+}}, i32 1)

test/Interop/Cxx/class/constructors-module-interface.swift

@@ -15,11 +15,14 @@
 // CHECK-NEXT:   init(member: ImplicitDefaultConstructor)
 // CHECK-NEXT: }
 // CHECK-NEXT: struct DefaultConstructorDeleted {
+// CHECK-NEXT:   var a: UnsafeMutablePointer<Int32>
 // CHECK-NEXT: }
 // CHECK-NEXT: struct ConstructorWithParam {
 // CHECK-NEXT:   var x: Int32
 // CHECK-NEXT:   init(_ val: Int32)
 // CHECK-NEXT: }
+// CHECK-NEXT: struct CopyAndMoveConstructor {
+// CHECK-NEXT: }
 // CHECK-NEXT: struct Base {
 // CHECK-NEXT:   init()
 // CHECK-NEXT: }