stash

Author: zoecarver

lib/ClangImporter/ClangImporter.cpp

@@ -6585,6 +6585,12 @@ CxxRecordSemantics::evaluate(Evaluator &evaluator,
   if (hasIteratorAPIAttr(cxxDecl) || isIterator(cxxDecl)) {
     return CxxRecordSemanticsKind::Iterator;
   }
+  
+  if (!cxxDecl->hasUserDeclaredCopyConstructor() &&
+      !cxxDecl->hasUserDeclaredMoveConstructor() &&
+      hasPointerInSubobjects(cxxDecl)) {
+    return CxxRecordSemanticsKind::UnsafePointerMember;
+  }
 
   if (hasCopyTypeOperations(cxxDecl)) {
     return CxxRecordSemanticsKind::Owned;
@@ -6594,16 +6600,11 @@ CxxRecordSemantics::evaluate(Evaluator &evaluator,
     return CxxRecordSemanticsKind::MoveOnly;
   }
 
-  if (hasPointerInSubobjects(cxxDecl)) {
-    return CxxRecordSemanticsKind::UnsafePointerMember;
-  }
-
   if (isSufficientlyTrivial(cxxDecl)) {
     return CxxRecordSemanticsKind::Trivial;
   }
 
-  // How did we get here?
-  return CxxRecordSemanticsKind::Owned;
+  llvm_unreachable("Could not classify C++ type.");
 }
 
 ValueDecl *

lib/ClangImporter/ImportDecl.cpp

@@ -2605,6 +2605,11 @@ namespace {
                                                        ctor);
         }
         clang::CXXConstructorDecl *copyCtor = nullptr;
+        clang::CXXConstructorDecl *moveCtor = nullptr;
+        if (decl->needsImplicitMoveConstructor()) {
+          moveCtor = clangSema.DeclareImplicitMoveConstructor(
+              const_cast<clang::CXXRecordDecl *>(decl));
+        }
         if (decl->needsImplicitCopyConstructor()) {
           copyCtor = clangSema.DeclareImplicitCopyConstructor(
               const_cast<clang::CXXRecordDecl *>(decl));
@@ -2613,14 +2618,19 @@ namespace {
           // Try to find it.
           for (auto methods : decl->methods()) {
             if (auto declCtor = dyn_cast<clang::CXXConstructorDecl>(methods)) {
-              if (declCtor->isCopyConstructor() && declCtor->isDefaulted() &&
+              if (declCtor->isDefaulted() &&
                   declCtor->getAccess() == clang::AS_public &&
                   !declCtor->isDeleted() &&
                   // Note: we use "doesThisDeclarationHaveABody" here because
                   // that's what "DefineImplicitCopyConstructor" checks.
                   !declCtor->doesThisDeclarationHaveABody()) {
-                copyCtor = declCtor;
-                break;
+                if (declCtor->isCopyConstructor()) {
+                  copyCtor = declCtor;
+                  break;
+                } else if (declCtor->isMoveConstructor()) {
+                  moveCtor = declCtor;
+                  break;
+                }
               }
             }
           }
@@ -2629,6 +2639,10 @@ namespace {
           clangSema.DefineImplicitCopyConstructor(clang::SourceLocation(),
                                                   copyCtor);
         }
+        if (moveCtor) {
+          clangSema.DefineImplicitMoveConstructor(clang::SourceLocation(),
+                                                  moveCtor);
+        }
 
         if (decl->needsImplicitDestructor()) {
           auto dtor = clangSema.DeclareImplicitDestructor(