[move-only] Ensure that resilient deinits take their self argument as an address argument instead of an object.

The signature was already correct, just the logic in the deinit code assumed
that we would always have an object.

rdar://109170069
(cherry picked from commit 12e1db4)

Author: gottesmm

lib/SILGen/SILGenProlog.cpp

@@ -39,8 +39,12 @@ static void diagnose(ASTContext &Context, SourceLoc loc, Diag<T...> diag,
 }
 
 SILValue SILGenFunction::emitSelfDeclForDestructor(VarDecl *selfDecl) {
+  SILFunctionConventions conventions = F.getConventionsInContext();
+
   // Emit the implicit 'self' argument.
-  SILType selfType = getLoweredType(selfDecl->getType());
+  SILType selfType = conventions.getSILArgumentType(
+      conventions.getNumSILArguments() - 1, F.getTypeExpansionContext());
+  selfType = F.mapTypeIntoContext(selfType);
   SILValue selfValue = F.begin()->createFunctionArgument(selfType, selfDecl);
 
   // If we have a move only type, then mark it with mark_must_check so we can't

test/SILGen/moveonly_library_evolution.swift

@@ -0,0 +1,14 @@
+// RUN: %target-swift-emit-silgen -enable-experimental-feature NoImplicitCopy -enable-library-evolution %s | %FileCheck %s
+
+//////////////////////
+// MARK: DeinitTest //
+//////////////////////
+
+// CHECK-LABEL: sil [ossa] @$s26moveonly_library_evolution10DeinitTestVfD : $@convention(method) (@in DeinitTest) -> () {
+// CHECK: bb0([[ARG:%.*]] : $*DeinitTest):
+// CHECK:   drop_deinit [[ARG]]
+// CHECK: } // end sil function '$s26moveonly_library_evolution10DeinitTestVfD'
+public struct DeinitTest : ~Copyable {
+    deinit {
+    }
+}

test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift

@@ -0,0 +1,23 @@
+// RUN: %target-swift-emit-sil -sil-verify-all -verify -enable-library-evolution %s
+
+// This test is used to validate that we properly handle library evolution code
+// until we can get all of the normal moveonly_addresschecker_diagnostics test
+// case to pass.
+
+////////////////////////
+// MARK: Deinit Tests //
+////////////////////////
+
+public struct DeinitTest : ~Copyable {
+    deinit {}
+}
+
+public protocol P {}
+
+// Once rdar://109170600 is fixed (which tracks us being unable to do this), we
+// should be able to use the : ~Copyable syntax.
+@_moveOnly
+public struct GenericDeinitTest<T : P> {
+    deinit {}
+}
+