Merge pull request #38179 from nate-chandler/ossa/test/SILOptimizer/opaque_values_mandatory.sil/enable-copy-propagation

[Test] Run copy-propagation on SILOptimizer/opaque_values_mandatory.sil.

Author: nate-chandler

test/SILOptimizer/opaque_values_mandatory.sil

@@ -1,12 +1,9 @@
 // RUN: %target-sil-opt -diagnostics -enable-sil-opaque-values %s | \
-// RUN:     %target-sil-opt -Onone-performance -enable-sil-opaque-values -emit-sorted-sil -sil-disable-pass=mandatory-copy-propagation | \
+// RUN:     %target-sil-opt -Onone-performance -enable-sil-verify-all \
+// RUN:                     -enable-sil-opaque-values -emit-sorted-sil \
+// RUN:                     -enable-ossa-modules -enable-copy-propagation | \
 // RUN:     %FileCheck %s
 
-// Using -sil-disable-pass=mandatory-copy-propagation to pattern match
-// against older SIL output. At least until -enable-copy-propagation
-// has been around long enough in the same form to be worth rewriting
-// CHECK lines.
-
 import Builtin
 
 sil_stage raw

tools/sil-opt/SILOpt.cpp

@@ -122,6 +122,14 @@ static llvm::cl::opt<bool> EnableOSSAModules(
                    "this is disabled we do not serialize in OSSA "
                    "form when optimizing."));
 
+static llvm::cl::opt<bool> EnableCopyPropagation(
+    "enable-copy-propagation",
+    llvm::cl::desc("Enable the copy propagation pass."));
+
+static llvm::cl::opt<bool> DisableCopyPropagation(
+    "disable-copy-propagation",
+    llvm::cl::desc("Disable the copy propagation pass."));
+
 namespace {
 enum class EnforceExclusivityMode {
   Unchecked, // static only
@@ -470,6 +478,8 @@ int main(int argc, char **argv) {
   SILOpts.EnableSpeculativeDevirtualization = EnableSpeculativeDevirtualization;
   SILOpts.IgnoreAlwaysInline = IgnoreAlwaysInline;
   SILOpts.EnableOSSAModules = EnableOSSAModules;
+  SILOpts.EnableCopyPropagation = EnableCopyPropagation;
+  SILOpts.DisableCopyPropagation = DisableCopyPropagation;
 
   serialization::ExtendedValidationInfo extendedInfo;
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =