ManualOwnership: imply MandatoryCopyPropagation

The usability of the feature depends on running
MandatoryCopyProp, which is in development.

Author: kavon

lib/Frontend/CompilerInvocation.cpp

@@ -2892,6 +2892,17 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
                        A->getAsString(Args));
     }
   }
+  // Have ManualOwnership imply MandatoryCopyPropagation.
+  // Once that pass becomes enabled by default, we don't need this.
+  if (LangOpts.hasFeature(ManualOwnership)) {
+    specifiedCopyPropagationOption = CopyPropagationOption::Always;
+
+    if (auto *Flag = Args.getLastArg(OPT_copy_propagation_state_EQ)) {
+      Diags.diagnose(SourceLoc(), diag::error_invalid_arg_combination,
+                       Flag->getAsString(Args),
+                       "-enable-experimental-feature ManualOwnership");
+    }
+  }
   if (Args.hasArg(OPT_enable_copy_propagation)) {
     specifiedCopyPropagationOption = CopyPropagationOption::Always;
   }

test/SIL/manual_ownership.swift

@@ -1,6 +1,5 @@
 // RUN: %target-swift-frontend %s -emit-sil -verify \
-// RUN:   -enable-experimental-feature ManualOwnership \
-// RUN:   -enable-copy-propagation=always
+// RUN:   -enable-experimental-feature ManualOwnership
 
 // REQUIRES: swift_feature_ManualOwnership