Merge pull request #62021 from gottesmm/pr-88e3b82d31a08823ec6704d7d190b78b233ac27e

[move-only] Two more small fixes

Author: gottesmm

lib/SILGen/SILGen.cpp

@@ -1590,9 +1590,12 @@ void SILGenModule::emitMoveOnlyDestructor(NominalTypeDecl *cd,
 
   emitAbstractFuncDecl(dd);
 
-  // Emit the deallocating destructor.
-  SILDeclRef deallocator(dd, SILDeclRef::Kind::Deallocator);
-  emitFunctionDefinition(deallocator, getFunction(deallocator, ForDefinition));
+  // Emit the deallocating destructor if we have a body.
+  if (dd->hasBody()) {
+    SILDeclRef deallocator(dd, SILDeclRef::Kind::Deallocator);
+    emitFunctionDefinition(deallocator,
+                           getFunction(deallocator, ForDefinition));
+  }
 }
 
 void SILGenModule::emitDefaultArgGenerator(SILDeclRef constant,

lib/Serialization/Deserialization.cpp

@@ -4491,7 +4491,7 @@ class DeclDeserializer {
 
     dtor->setGenericSignature(MF.getGenericSignature(genericSigID));
 
-    dtor->setAccess(std::max(cast<ClassDecl>(DC)->getFormalAccess(),
+    dtor->setAccess(std::max(cast<NominalTypeDecl>(DC)->getFormalAccess(),
                              AccessLevel::Internal));
 
     if (isImplicit)

test/SILGen/moveonly_deinit_module_no_body.swift

@@ -0,0 +1,15 @@
+// RUN: %target-swift-frontend -emit-module -g -enable-experimental-move-only -experimental-skip-non-inlinable-function-bodies-without-types %s 
+
+// Just make sure we don't crash.
+
+@_moveOnly
+public struct S {
+  private let desc: Int
+
+  internal init(desc: Int) {
+    self.desc = desc
+  }
+
+  deinit {
+  }
+}

test/Serialization/Inputs/moveonly_deinit.swift

@@ -0,0 +1,19 @@
+
+@_moveOnly
+public struct MoveOnlyStruct {
+  private let desc: Int
+
+  public init(desc: Int) {
+    self.desc = desc
+  }
+
+  deinit { }
+}
+
+@_moveOnly
+public enum MoveOnlyEnum {
+    case lhs(Int)
+    case rhs(Int)
+
+    deinit { }
+}

test/Serialization/moveonly_deinit.swift

@@ -0,0 +1,10 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -enable-experimental-move-only -g -emit-module  -module-name OtherModule %S/Inputs/moveonly_deinit.swift -emit-module-path %t/OtherModule.swiftmodule
+// RUN: %target-swift-frontend -enable-experimental-move-only -g -I %t %s -emit-silgen
+
+// Make sure we can deserialize deinits of both enums and structs.
+
+import OtherModule
+
+let s = MoveOnlyStruct(desc: 5)
+let e = MoveOnlyEnum.lhs(5)