Disable lexical-lifetimes with copy-propagation.

If -disable-copy-propagation is passed, just emit lexical diagnostic
markers but do not enable lexical lifetimes.

Author: nate-chandler

lib/Frontend/CompilerInvocation.cpp

@@ -1519,6 +1519,10 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_enable_copy_propagation))
     Opts.LexicalLifetimes = LexicalLifetimesOption::On;
 
+  // -disable-copy-propagation implies -enable-lexical-lifetimes=false
+  if (Args.hasArg(OPT_disable_copy_propagation))
+    Opts.LexicalLifetimes = LexicalLifetimesOption::DiagnosticMarkersOnly;
+
   // If move-only is enabled, always enable lexical lifetime as well.  Move-only
   // depends on lexical lifetimes.
   if (Args.hasArg(OPT_enable_experimental_move_only))

tools/sil-opt/SILOpt.cpp

@@ -529,6 +529,8 @@ int main(int argc, char **argv) {
 
   if (EnableCopyPropagation)
     SILOpts.LexicalLifetimes = LexicalLifetimesOption::On;
+  if (DisableCopyPropagation)
+    SILOpts.LexicalLifetimes = LexicalLifetimesOption::DiagnosticMarkersOnly;
 
   // Enable lexical lifetimes if it is set or if experimental move only is
   // enabled. This is because move only depends on lexical lifetimes being