Merge pull request #78496 from meg-gupta/cpremoveossaflag

[6.1] Fix build option for Synchronization and Distributed

Author: meg-gupta

lib/SILOptimizer/Mandatory/PredictableMemOpt.cpp

@@ -3169,9 +3169,12 @@ static AllocationInst *getOptimizableAllocation(SILInstruction *i) {
 }
 
 bool swift::optimizeMemoryAccesses(SILFunction *fn) {
+  if (!fn->hasOwnership()) {
+    return false;
+  }
+
   bool changed = false;
   DeadEndBlocks deadEndBlocks(fn);
-
   InstructionDeleter deleter;
   for (auto &bb : *fn) {
     for (SILInstruction &inst : bb.deletableInstructions()) {
@@ -3209,6 +3212,9 @@ bool swift::optimizeMemoryAccesses(SILFunction *fn) {
 }
 
 bool swift::eliminateDeadAllocations(SILFunction *fn, DominanceInfo *domInfo) {
+  if (!fn->hasOwnership()) {
+    return false;
+  }
   bool changed = false;
   DeadEndBlocks deadEndBlocks(fn);
 

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -2064,7 +2064,7 @@ function(add_swift_target_library name)
     list(APPEND SWIFTLIB_SWIFT_COMPILE_FLAGS "-Xfrontend;-enable-lexical-lifetimes=false")
   endif()
 
-  if (NOT DEFINED IMPORTS_NON_OSSA)
+  if (NOT SWIFTLIB_IMPORTS_NON_OSSA)
     list(APPEND SWIFTLIB_SWIFT_COMPILE_FLAGS "-Xfrontend;-enable-ossa-modules")
   endif()
 

test/SILOptimizer/stdlib/Atomics.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-ossa-modules -O -emit-sil -disable-availability-checking %s | %IRGenFileCheck %s
+// RUN: %target-swift-frontend -O -emit-sil -disable-availability-checking %s | %IRGenFileCheck %s
 
 // REQUIRES: synchronization