Merge pull request #73022 from meg-gupta/disablesilcombine

[6.0] Disable SILCombine::visitInjectEnumAddrInst for empty tuple types

Author: meg-gupta

lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp

@@ -948,6 +948,16 @@ SILCombiner::visitInjectEnumAddrInst(InjectEnumAddrInst *IEAI) {
   if (IEAI->getFunction()->hasOwnership())
     return nullptr;
 
+  // Disable this for empty typle type because empty tuple stack locations maybe
+  // uninitialized. And converting to value form loses tag information.
+  if (IEAI->getElement()->hasAssociatedValues()) {
+    SILType elemType = IEAI->getOperand()->getType().getEnumElementType(
+        IEAI->getElement(), IEAI->getFunction());
+    if (elemType.isEmpty(*IEAI->getFunction())) {
+      return nullptr;
+    }
+  }
+
   // Given an inject_enum_addr of a concrete type without payload, promote it to
   // a store of an enum. Mem2reg/load forwarding will clean things up for us. We
   // can't handle the payload case here due to the flow problems caused by the

test/SILOptimizer/sil_combine_enum_addr.sil

@@ -260,7 +260,7 @@ bb22:
 sil @no_init : $@convention(thin) () -> (@out ())
 
 // CHECK-LABEL: sil @test_empty_tuple_uninintialized : $@convention(thin) () -> () {
-// CHECK-NOT: inject_enum_addr
+// TODO-NOT: inject_enum_addr
 // CHECK-LABEL: } // end sil function 'test_empty_tuple_uninintialized'
 sil @test_empty_tuple_uninintialized : $@convention(thin) () -> () {
 bb0:
@@ -287,7 +287,7 @@ bb3:
 sil @no_init_nested_tuple : $@convention(thin) () -> (@out ((), ()))
 
 // CHECK-LABEL: sil @test_empty_nested_tuple_uninintialized : $@convention(thin) () -> () {
-// CHECK-NOT: inject_enum_addr
+// TODO-NOT: inject_enum_addr
 // CHECK-LABEL: } // end sil function 'test_empty_nested_tuple_uninintialized'
 sil @test_empty_nested_tuple_uninintialized : $@convention(thin) () -> () {
 bb0:
@@ -314,7 +314,7 @@ bb3:
 sil @no_init_struct : $@convention(thin) () -> (@out ResilientEmptyStruct)
 
 // CHECK-LABEL: sil @test_empty_struct_uninitialized : $@convention(thin) () -> () {
-// CHECK-NOT: switch_enum_addr
+// TODO-NOT: switch_enum_addr
 // CHECK-LABEL: } // end sil function 'test_empty_struct_uninitialized'
 sil @test_empty_struct_uninitialized : $@convention(thin) () -> () {
 bb0:
@@ -340,7 +340,7 @@ bb3:
 sil @no_init_c_union : $@convention(thin) () -> (@out EmptyCUnion)
 
 // CHECK-LABEL: sil @test_empty_c_union : $@convention(thin) () -> () {
-// CHECK: inject_enum_addr
+// TODO: inject_enum_addr
 // CHECK-LABEL: } // end sil function 'test_empty_c_union'
 sil @test_empty_c_union : $@convention(thin) () -> () {
 bb0:
@@ -370,7 +370,7 @@ struct NestedUnreferenceableStorage {
 sil @no_init_nested_c_union : $@convention(thin) () -> (@out NestedUnreferenceableStorage)
 
 // CHECK-LABEL: sil @test_empty_nested_c_union : $@convention(thin) () -> () {
-// CHECK: inject_enum_addr
+// TODO: inject_enum_addr
 // CHECK-LABEL: } // end sil function 'test_empty_nested_c_union'
 sil @test_empty_nested_c_union : $@convention(thin) () -> () {
 bb0: