Merge pull request #60820 from meg-gupta/fixmem2regsbi

Fix SILMem2Reg while marking end_borrow of store_borrow as deinit point

Author: swift-ci

lib/SILOptimizer/Transforms/SILMem2Reg.cpp

@@ -795,14 +795,15 @@ SILInstruction *StackAllocationPromoter::promoteAllocationInBlock(
         continue;
       }
       if (!runningVals.hasValue()) {
-        assert(!deinitializationPoints[blockPromotingWithin]);
-        deinitializationPoints[blockPromotingWithin] = inst;
         continue;
       }
       if (sbi->getSrc() != runningVals->value.stored) {
         continue;
       }
+      // Mark storage as invalid and mark end_borrow as a deinit point.
       runningVals->isStorageValid = false;
+      assert(!deinitializationPoints[blockPromotingWithin]);
+      deinitializationPoints[blockPromotingWithin] = inst;
       if (!canEndLexicalLifetime(runningVals->value)) {
         continue;
       }

test/SILOptimizer/mem2reg_lifetime_borrows.sil

@@ -452,3 +452,35 @@ bb0:
   %r = tuple ()
   return %r : $()
 }
+
+// CHECK-LABEL: sil [ossa] @test_deinit_point :
+// CHECK: alloc_stack 
+// CHECK-NOT: alloc_stack [lexical]
+// CHECK-LABEL: } // end sil function 'test_deinit_point'
+sil [ossa] @test_deinit_point : $@convention(thin) (@guaranteed Klass) -> () {
+bb0(%0 : @guaranteed $Klass):
+  %stk = alloc_stack [lexical] $Klass
+  cond_br undef, bb1, bb2
+
+bb1:
+  %tmp = alloc_stack $Klass
+  %sb = store_borrow %0 to %tmp : $*Klass
+  %f = function_ref @use_inguaranteed : $@convention(thin) (@in_guaranteed Klass) -> ()
+  %c = apply %f(%sb) : $@convention(thin) (@in_guaranteed Klass) -> ()
+  end_borrow %sb : $*Klass
+  dealloc_stack %tmp : $*Klass
+  %copy = copy_value %0 : $Klass
+  store %copy to [init] %stk : $*Klass
+  %l = load [take] %stk : $*Klass
+  destroy_value %l : $Klass
+  br bb3
+
+bb2:
+  br bb3
+
+bb3:
+  dealloc_stack %stk : $*Klass
+  %r = tuple ()
+  return %r : $()
+}
+