Merge pull request #35267 from gottesmm/pr-e1470269b54edc7167090234bac8d03e102208c8

Revert "[sil-combine] Update switch_enum_addr -> switch_enum for loadable types for ownership."

Author: shahmishal

lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp

@@ -147,6 +147,9 @@ static EnumElementDecl *getInjectEnumCaseTo(SILValue Addr) {
 }
 
 SILInstruction *SILCombiner::visitSwitchEnumAddrInst(SwitchEnumAddrInst *SEAI) {
+  if (SEAI->getFunction()->hasOwnership())
+    return nullptr;
+
   // Convert switch_enum_addr -> br
   // if the only thing which writes to the address is an inject_enum_addr.
   SILValue Addr = SEAI->getOperand();
@@ -169,44 +172,15 @@ SILInstruction *SILCombiner::visitSwitchEnumAddrInst(SwitchEnumAddrInst *SEAI) {
   //     ->
   //   %value = load %ptr
   //   switch_enum %value
-  //
-  // If we are using ownership, we perform a load_borrow right before the new
-  // switch_enum and end the borrow scope right afterwards.
-  Builder.setCurrentDebugScope(SEAI->getDebugScope());
-  SmallVector<std::pair<EnumElementDecl *, SILBasicBlock *>, 8> Cases;
-  for (int i : range(SEAI->getNumCases())) {
+  SmallVector<std::pair<EnumElementDecl*, SILBasicBlock*>, 8> Cases;
+  for (int i = 0, e = SEAI->getNumCases(); i < e; ++i)
     Cases.push_back(SEAI->getCase(i));
-  }
 
+  Builder.setCurrentDebugScope(SEAI->getDebugScope());
   SILBasicBlock *Default = SEAI->hasDefault() ? SEAI->getDefaultBB() : nullptr;
-  SILValue EnumVal = Builder.emitLoadBorrowOperation(SEAI->getLoc(), Addr);
-  auto *sei = Builder.createSwitchEnum(SEAI->getLoc(), EnumVal, Default, Cases);
-
-  if (Builder.hasOwnership()) {
-    for (int i : range(sei->getNumCases())) {
-      auto c = sei->getCase(i);
-      if (c.first->hasAssociatedValues()) {
-        auto eltType = Addr->getType().getEnumElementType(
-            c.first, Builder.getModule(), Builder.getTypeExpansionContext());
-        eltType = eltType.getObjectType();
-        if (eltType.isTrivial(Builder.getFunction())) {
-          c.second->createPhiArgument(eltType, OwnershipKind::None);
-        } else {
-          c.second->createPhiArgument(eltType, OwnershipKind::Guaranteed);
-        }
-      }
-      Builder.setInsertionPoint(c.second->front().getIterator());
-      Builder.emitEndBorrowOperation(SEAI->getLoc(), EnumVal);
-    }
-
-    if (auto defaultBlock = sei->getDefaultBBOrNull()) {
-      defaultBlock.get()->createPhiArgument(EnumVal->getType(),
-                                            OwnershipKind::Guaranteed);
-      Builder.setInsertionPoint(defaultBlock.get()->front().getIterator());
-      Builder.emitEndBorrowOperation(SEAI->getLoc(), EnumVal);
-    }
-  }
-
+  LoadInst *EnumVal = Builder.createLoad(SEAI->getLoc(), Addr,
+                                         LoadOwnershipQualifier::Unqualified);
+  Builder.createSwitchEnum(SEAI->getLoc(), EnumVal, Default, Cases);
   return eraseInstFromFunction(*SEAI);
 }
 

test/SILOptimizer/sil_combine_ossa.sil

@@ -1329,9 +1329,6 @@ bb0(%0 : @owned $E):
   return %2 : $Builtin.NativeObject
 }
 
-// NOTE: We currently promote the switch_enum, but we do not handle the
-// unchecked_take_enum_data_addr yet.
-//
 // CHECK-LABEL: sil [ossa] @unchecked_take_enum_data_addr_promotion : $@convention(thin) (@inout FakeOptional<B>) -> @owned B {
 // XHECK: bb0(%0 : $*FakeOptional<B>):
 // XHECK-NEXT: [[BORROW:%.*]] = load_borrow
@@ -2257,13 +2254,12 @@ struct FakeInt32 {
   var val : Builtin.Int32
 }
 
-// CHECK-LABEL: sil [ossa] @loadable_switchenumaddr_promotion_trivial : $@convention(thin) (@in FakeOptional<Builtin.RawPointer>) -> () {
-// CHECK-NOT: switch_enum_addr
-// CHECK: load [trivial]
-// CHECK-NEXT: switch_enum
-// CHECK-NOT: switch_enum_addr
-// CHECK: } // end sil function 'loadable_switchenumaddr_promotion_trivial'
-sil [ossa] @loadable_switchenumaddr_promotion_trivial : $@convention(thin) (@in FakeOptional<Builtin.RawPointer>) -> () {
+// CHECK-LABEL: sil [ossa] @loadable_switchenumaddr_promotion : $@convention(thin) (@in FakeOptional<Builtin.RawPointer>) -> () {
+// XHECK-NOT: switch_enum_addr
+// XHECK: load
+// XHECK-NEXT: switch_enum
+// XHECK-NOT: switch_enum_addr
+sil [ossa] @loadable_switchenumaddr_promotion : $@convention(thin) (@in FakeOptional<Builtin.RawPointer>) -> () {
 bb0(%0 : $*FakeOptional<Builtin.RawPointer>):
   switch_enum_addr %0 : $*FakeOptional<Builtin.RawPointer>, case #FakeOptional.some!enumelt: bb1, case #FakeOptional.none!enumelt: bb2
 
@@ -2278,75 +2274,11 @@ bb3:
   return %2 : $()
 }
 
-// CHECK-LABEL: sil [ossa] @loadable_switchenumaddr_promotion_nontrivial : $@convention(thin) (@in_guaranteed FakeOptional<Builtin.NativeObject>) -> () {
-// CHECK-NOT: switch_enum_addr
-// CHECK: load_borrow
-// CHECK-NEXT: switch_enum
-// CHECK-NOT: switch_enum_addr
-// CHECK: } // end sil function 'loadable_switchenumaddr_promotion_nontrivial'
-sil [ossa] @loadable_switchenumaddr_promotion_nontrivial : $@convention(thin) (@in_guaranteed FakeOptional<Builtin.NativeObject>) -> () {
-bb0(%0 : $*FakeOptional<Builtin.NativeObject>):
-  switch_enum_addr %0 : $*FakeOptional<Builtin.NativeObject>, case #FakeOptional.some!enumelt: bb1, case #FakeOptional.none!enumelt: bb2
-
-bb1:
-  br bb3
-
-bb2:
-  br bb3
-
-bb3:
-  %2 = tuple()
-  return %2 : $()
-}
-
-// CHECK-LABEL: sil [ossa] @loadable_switchenumaddr_promotion_trivial_default : $@convention(thin) (@in FakeOptional<Builtin.RawPointer>) -> () {
-// CHECK-NOT: switch_enum_addr
-// CHECK: load [trivial]
-// CHECK-NEXT: switch_enum
-// CHECK-NOT: switch_enum_addr
-// CHECK: } // end sil function 'loadable_switchenumaddr_promotion_trivial_default'
-sil [ossa] @loadable_switchenumaddr_promotion_trivial_default : $@convention(thin) (@in FakeOptional<Builtin.RawPointer>) -> () {
-bb0(%0 : $*FakeOptional<Builtin.RawPointer>):
-  switch_enum_addr %0 : $*FakeOptional<Builtin.RawPointer>, case #FakeOptional.some!enumelt: bb1, default bb2
-
-bb1:
-  br bb3
-
-bb2:
-  br bb3
-
-bb3:
-  %2 = tuple()
-  return %2 : $()
-}
-
-// CHECK-LABEL: sil [ossa] @loadable_switchenumaddr_promotion_nontrivial_default : $@convention(thin) (@in_guaranteed FakeOptional<Builtin.NativeObject>) -> () {
-// CHECK-NOT: switch_enum_addr
-// CHECK: load_borrow
-// CHECK-NEXT: switch_enum
-// CHECK-NOT: switch_enum_addr
-// CHECK: } // end sil function 'loadable_switchenumaddr_promotion_nontrivial_default'
-sil [ossa] @loadable_switchenumaddr_promotion_nontrivial_default : $@convention(thin) (@in_guaranteed FakeOptional<Builtin.NativeObject>) -> () {
-bb0(%0 : $*FakeOptional<Builtin.NativeObject>):
-  switch_enum_addr %0 : $*FakeOptional<Builtin.NativeObject>, case #FakeOptional.some!enumelt: bb1, default bb2
-
-bb1:
-  br bb3
-
-bb2:
-  br bb3
-
-bb3:
-  %2 = tuple()
-  return %2 : $()
-}
-
-// CHECK-LABEL: sil [ossa] @resilient_enum_case_propagation :
-// CHECK: bb0:
-// CHECK:   br bb2
-// CHECK: bb1:
-// CHECK:   return
-// CHECK: } // end sil function 'resilient_enum_case_propagation'
+// CHECK-LABEL: sil [ossa] @resilient_enum_case_propagation
+// XHECK: bb0:
+// XHECK:   br bb2
+// XHECK: bb1:
+// XHECK:   return
 sil [ossa] @resilient_enum_case_propagation : $@convention(thin) () -> Builtin.Int64 {
 bb0:
   %0 = alloc_stack $FloatingPointRoundingRule