Merge pull request #64708 from meg-gupta/fixinfinite

Fix infinite loop in the new hasPointerEscape(SILValue) api

Author: swift-ci

Diff for: lib/SIL/Utils/OwnershipUtils.cpp

@@ -82,7 +82,7 @@ bool swift::hasPointerEscape(SILValue original) {
       return true;
     });
   }
-  while (auto value = worklist.popAndForget()) {
+  while (auto value = worklist.pop()) {
     for (auto use : value->getUses()) {
       switch (use->getOperandOwnership()) {
       case OperandOwnership::PointerEscape:

Diff for: test/SILOptimizer/ownership-utils-unit.sil

@@ -6,6 +6,11 @@ import Builtin
 
 class C {}
 
+enum FakeOptional<T> {
+case none
+case some(T)
+}
+
 sil @getOwned : $@convention(thin) () -> (@owned C)
 
 sil @borrow : $@convention(thin) (@guaranteed C) -> ()
@@ -42,3 +47,27 @@ exit(%instance : @owned $C):
   %retval = tuple ()
   return %retval : $()
 }
+
+sil [ossa] @test_loop_phi : $@convention(thin) () -> () {
+entry:
+  %instance_1 = enum $FakeOptional<C>, #FakeOptional.none!enumelt
+  br loop_entry(%instance_1 : $FakeOptional<C>)
+
+loop_entry(%18 : @owned $FakeOptional<C>):
+  test_specification "has-pointer-escape @block.argument"
+  br loop_body
+
+loop_body:
+  cond_br undef, loop_back, loop_exit
+
+loop_back:
+  br loop_entry(%18 : $FakeOptional<C>)
+
+loop_exit:
+  destroy_value %18 : $FakeOptional<C>
+  br exit
+
+exit:
+  %retval = tuple ()
+  return %retval : $()
+}