Merge pull request #59164 from meg-gupta/addressloweringminorfixes

[SIL Opaque Value] Minor fixes in AddressLowering

Author: meg-gupta

lib/SILOptimizer/Mandatory/AddressLowering.cpp

@@ -339,7 +339,7 @@ static bool isStoreCopy(SILValue value) {
     return false;
 
   auto *user = value->getSingleUse()->getUser();
-  return isa<StoreInst>(user) || isa<AssignInst>(user);
+  return isa<StoreInst>(user);
 }
 
 void ValueStorageMap::insertValue(SILValue value, SILValue storageAddress) {
@@ -1784,14 +1784,12 @@ void CallArgRewriter::rewriteIndirectArgument(Operand *operand) {
     });
   } else {
     auto borrow = argBuilder.emitBeginBorrowOperation(callLoc, argValue);
-    auto *storeInst =
-        argBuilder.emitStoreBorrowOperation(callLoc, borrow, allocInst);
+    argBuilder.emitStoreBorrowOperation(callLoc, borrow, allocInst);
 
     apply.insertAfterFullEvaluation([&](SILBuilder &callBuilder) {
-      if (auto *storeBorrow = dyn_cast<StoreBorrowInst>(storeInst)) {
-        callBuilder.emitEndBorrowOperation(callLoc, storeBorrow);
+      if (borrow != argValue) {
+        callBuilder.emitEndBorrowOperation(callLoc, borrow);
       }
-      callBuilder.emitEndBorrowOperation(callLoc, borrow);
       callBuilder.createDeallocStack(callLoc, allocInst);
     });
   }
@@ -2369,8 +2367,11 @@ class CheckedCastBrRewriter {
   /// Return the storageAddress if \p value is opaque, otherwise create and
   /// return a stack temporary.
   SILValue getAddressForCastEntity(SILValue value, bool needsInit) {
-    if (value->getType().isAddressOnly(*func))
-      return pass.valueStorageMap.getStorage(value).storageAddress;
+    if (value->getType().isAddressOnly(*func)) {
+      auto builder = pass.getBuilder(ccb->getIterator());
+      AddressMaterialization addrMat(pass, builder);
+      return addrMat.materializeAddress(value);
+    }
 
     // Create a stack temporary for a loadable value
     auto *addr = termBuilder.createAllocStack(castLoc, value->getType());
@@ -2595,12 +2596,14 @@ class UseRewriter : SILInstructionVisitor<UseRewriter> {
   }
 
   void visitYieldInst(YieldInst *yield) {
-    SILValue addr =
-        pass.valueStorageMap.getStorage(yield->getOperand(0)).storageAddress;
+    SILValue addr = addrMat.materializeAddress(use->get());
     yield->setOperand(0, addr);
   }
 
-  void visitAssignInst(AssignInst *assignInst);
+  void visitValueMetatypeInst(ValueMetatypeInst *vmi) {
+    SILValue opAddr = addrMat.materializeAddress(use->get());
+    vmi->setOperand(opAddr);
+  }
 
   void visitBeginBorrowInst(BeginBorrowInst *borrow);
 
@@ -2832,11 +2835,6 @@ void UseRewriter::visitStoreInst(StoreInst *storeInst) {
   rewriteStore(storeInst->getSrc(), storeInst->getDest(), isInit);
 }
 
-void UseRewriter::visitAssignInst(AssignInst *assignInst) {
-  rewriteStore(assignInst->getSrc(), assignInst->getDest(),
-               IsNotInitialization);
-}
-
 /// Emit end_borrows for a an incomplete BorrowedValue with only nonlifetime
 /// ending uses. This function inserts end_borrows on the lifetime boundary.
 void UseRewriter::emitEndBorrows(SILValue value) {

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -116,7 +116,6 @@ static void addDefiniteInitialization(SILPassPipelinePlan &P) {
 static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
   P.startPipeline("Mandatory Diagnostic Passes + Enabling Optimization Passes");
   P.addSILGenCleanup();
-  P.addAddressLowering();
   P.addDiagnoseInvalidEscapingCaptures();
   P.addDiagnoseStaticExclusivity();
   P.addNestedSemanticFunctionCheck();
@@ -129,6 +128,7 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
   P.addAllocBoxToStack();
   P.addNoReturnFolding();
   addDefiniteInitialization(P);
+  P.addAddressLowering();
 
   P.addFlowIsolation();