Merge pull request #65298 from nate-chandler/fc/20230419/1/ownership-utils-visitors-handle-undef

[OwnershipUtils] Undef isn't introduced/enclosed.

Author: nate-chandler

lib/SIL/Utils/OwnershipUtils.cpp

@@ -2230,12 +2230,16 @@ class FindEnclosingDefs {
 
 bool swift::visitEnclosingDefs(SILValue value,
                                function_ref<bool(SILValue)> visitor) {
+  if (isa<SILUndef>(value))
+    return true;
   return FindEnclosingDefs(value->getFunction())
     .visitEnclosingDefs(value, visitor);
 }
 
 bool swift::visitBorrowIntroducers(SILValue value,
                                    function_ref<bool(SILValue)> visitor) {
+  if (isa<SILUndef>(value))
+    return true;
   return FindEnclosingDefs(value->getFunction())
     .visitBorrowIntroducers(value, visitor);
 }

test/SILOptimizer/canonicalize_ossa_lifetime_unit.sil

@@ -3,6 +3,7 @@
 class C {}
 sil @getOwned : $@convention(thin) () -> @owned C
 sil @barrier : $@convention(thin) () -> ()
+struct S {}
 
 // When access scopes are respected, the lifetime which previously extended
 // beyond the access scope still extends beyond it.
@@ -115,3 +116,21 @@ bb0(%0 : $*C, %instance : @owned $C):
   %retval = tuple ()
   return %retval : $()
 }
+
+// Don't crash on an adjacent phi with an incoming undef.
+sil [ossa] @adjacent_phi_with_incoming_undef : $@convention(thin) () -> () {
+entry:
+  %getC = function_ref @getOwned : $@convention(thin) () -> @owned C
+  %c2 = apply %getC() : $@convention(thin) () -> @owned C
+  br right2(%c2 : $C)
+
+right2(%c2p : @owned $C):
+  br exit(%c2p : $C, undef : $S)
+
+exit(%phi : @owned $C, %typhi : $S):
+  debug_value [trace] %phi : $C
+  test_specification "canonicalize-ossa-lifetime true false true @trace"
+  destroy_value %phi : $C
+  %retval = tuple ()
+  return %retval : $()
+}