Move OME lower for non-transparent functions

Move it just before outliner which has not yet been migrated

Author: meg-gupta

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -518,6 +518,18 @@ static void addPerfEarlyModulePassPipeline(SILPassPipelinePlan &P) {
   // not blocked by any other passes' optimizations, so do it early.
   P.addDifferentiabilityWitnessDevirtualizer();
 
+  // Start by linking in referenced functions from other modules.
+  P.addPerformanceSILLinker();
+
+  // Cleanup after SILGen: remove trivial copies to temporaries. This version of
+  // temp-rvalue opt is here so that we can hit copies from non-ossa code that
+  // is linked in from the stdlib.
+  P.addTempRValueOpt();
+
+  // Needed to serialize static initializers of globals for cross-module
+  // optimization.
+  P.addGlobalOpt();
+
   // Strip ownership from non-transparent functions when we are not compiling
   // the stdlib module. When compiling the stdlib, we eliminate ownership on
   // these functions later with a nromal call to
@@ -531,18 +543,6 @@ static void addPerfEarlyModulePassPipeline(SILPassPipelinePlan &P) {
   if (!P.getOptions().EnableOSSAModules)
     P.addNonTransparentFunctionOwnershipModelEliminator();
 
-  // Start by linking in referenced functions from other modules.
-  P.addPerformanceSILLinker();
-
-  // Cleanup after SILGen: remove trivial copies to temporaries. This version of
-  // temp-rvalue opt is here so that we can hit copies from non-ossa code that
-  // is linked in from the stdlib.
-  P.addTempRValueOpt();
-
-  // Needed to serialize static initializers of globals for cross-module
-  // optimization.
-  P.addGlobalOpt();
-
   // Add the outliner pass (Osize).
   P.addOutliner();
 

test/SILOptimizer/OSLogFullOptTest.swift

@@ -133,15 +133,13 @@ func testNSObjectInterpolation(nsArray: NSArray) {
     // TODO: check why the ARC optimizer cannot eliminate the many retain/release pairs here.
     // CHECK: entry:
     // CHECK-NEXT: bitcast %TSo7NSArrayC* %0 to i8*
-    // CHECK-NEXT: tail call i8* @llvm.objc.retain
     // CHECK-NEXT: [[NSARRAY_ARG:%.+]] = tail call i8* @llvm.objc.retain
     // CHECK: tail call swiftcc i1 @"${{.*}}isLoggingEnabled{{.*}}"()
     // CHECK-NEXT: br i1 {{%.*}}, label %[[ENABLED:[0-9]+]], label %[[NOT_ENABLED:[0-9]+]]
 
     // CHECK: [[NOT_ENABLED]]:
     // CHECK-NEXT: tail call void @swift_release
     // CHECK-NEXT: tail call void @llvm.objc.release
-    // CHECK-NEXT: tail call void @llvm.objc.release
     // CHECK-NEXT: br label %[[EXIT:[0-9]+]]
 
     // CHECK: [[ENABLED]]:
@@ -172,7 +170,6 @@ func testNSObjectInterpolation(nsArray: NSArray) {
     // CHECK-NEXT: [[BITCASTED_SRC2:%.+]] = bitcast i8* [[NSARRAY_ARG]] to %TSo7NSArrayC*
     // CHECK-64-NEXT: store %TSo7NSArrayC* [[BITCASTED_SRC2]], %TSo7NSArrayC** [[BITCASTED_DEST2]], align 8
     // CHECK-32-NEXT: store %TSo7NSArrayC* [[BITCASTED_SRC2]], %TSo7NSArrayC** [[BITCASTED_DEST2]], align 4
-    // CHECK-NEXT: tail call void @llvm.objc.release
     // CHECK-64-NEXT: tail call swiftcc void @"${{.*}}_os_log_impl_test{{.*}}"({{.*}}, {{.*}}, {{.*}}, {{.*}}, i8* getelementptr inbounds ([20 x i8], [20 x i8]* @{{.*}}, i64 0, i64 0), i8* {{(nonnull )?}}[[BUFFER]], i32 12)
     // CHECK-32-NEXT: tail call swiftcc void @"${{.*}}_os_log_impl_test{{.*}}"({{.*}}, {{.*}}, {{.*}}, {{.*}}, i8* getelementptr inbounds ([20 x i8], [20 x i8]* @{{.*}}, i32 0, i32 0), i8* {{(nonnull )?}}[[BUFFER]], i32 8)
     // CHECK-NEXT: [[BITCASTED_OBJ_STORAGE:%.+]] = bitcast i8* [[OBJ_STORAGE]] to %swift.opaque*