Add a round of ossa arc opts before lowering to non-ossa

Author: meg-gupta

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -422,6 +422,12 @@ void addFunctionPasses(SILPassPipelinePlan &P,
   P.addPerformanceConstantPropagation();
 
   if (!P.getOptions().EnableOSSAModules) {
+    // Last chance to run ossa opts, run them here before lowering to non-ossa.
+    if (P.getOptions().CopyPropagation == CopyPropagationOption::On) {
+      P.addComputeSideEffects();
+      P.addCopyPropagation();
+    }
+    P.addSemanticARCOpts();
     if (P.getOptions().StopOptimizationBeforeLoweringOwnership)
       return;
 

test/SILOptimizer/consuming_parameter.swift

@@ -18,12 +18,11 @@ public func async_dead_arg_call(o: consuming AnyObject) async {
 
 // CHECK-LABEL: sil [ossa] @async_dead_arg_call_lexical : {{.*}} {
 // CHECK:       {{bb[0-9]+}}([[INSTANCE:%[^,]+]] : @noImplicitCopy @_lexical @owned
-// CHECK:         [[MOVE:%[^,]+]] = move_value [lexical] [[INSTANCE]]
 // CHECK:         [[EXECUTOR:%[^,]+]] = enum $Optional<Builtin.Executor>, #Optional.none!enumelt 
 // CHECK:         [[CALLEE:%[^,]+]] = function_ref @async_callee
 // CHECK:         apply [[CALLEE]]()
 // CHECK:         hop_to_executor [[EXECUTOR]]
-// CHECK:         destroy_value [[MOVE]]
+// CHECK:         destroy_value [[INSTANCE]]
 // CHECK-LABEL: } // end sil function 'async_dead_arg_call_lexical'
 @_silgen_name("async_dead_arg_call_lexical")
 public func async_dead_arg_call_lexical(@_noEagerMove o: consuming AnyObject) async {

test/stdlib/move_function.swift

@@ -91,7 +91,6 @@ tests.test("simpleVarTest") {
     expectTrue(_isUnique_native(&x))
 
     var y = x
-    expectFalse(_isUnique_native(&x))
     let _ = consume y
     expectTrue(_isUnique_native(&x))
     y = Klass()
@@ -101,7 +100,6 @@ tests.test("simpleVarTest") {
 tests.test("simpleInoutVarTest") {
     func inOutTest(_ x: inout Klass) {
         var y = x
-        expectFalse(_isUnique_native(&x))
         let _ = consume y
         expectTrue(_isUnique_native(&x))
         y = Klass()