Fix SIL test cases for terminator ownership verification.

atrick · atrick · commit 6525a61af3e0 · 2021-09-07T22:50:46.000-07:00
diff --git a/test/SIL/Serialization/forwarding_ownership.sil b/test/SIL/Serialization/forwarding_ownership.sil
@@ -16,24 +16,6 @@ class Klass {
 class SubKlass : Klass {
 }
 
-// CHECK-LABEL: sil [ossa] @switch_test : $@convention(thin) () -> () {
-// CHECK: switch_enum {{.*}}, forwarding: @guaranteed
-// CHECK-LABEL: } // end sil function 'switch_test'
-sil [ossa] @switch_test : $@convention(thin) () -> () {
-  %none = enum $FakeOptional<Klass>, #FakeOptional.none
-  switch_enum %none : $FakeOptional<Klass>, case #FakeOptional.some!enumelt:bb1, case #FakeOptional.none!enumelt:bb2, forwarding: @guaranteed
-
-bb1(%arg : @guaranteed $Klass):
-  br bb3
-
-bb2:
-  br bb3
-
-bb3:
-  %8 = tuple ()
-  return %8 : $()
-}
-
 // Test checked_cast_br ownership forwarding.
 //
 // Also test unchecked_ownership_conversion @none serialization (@none
@@ -58,3 +40,22 @@ bb3:
   %8 = tuple ()
   return %8 : $()
 }
+
+// CHECK-LABEL: sil [ossa] @switch_test : $@convention(thin) () -> () {
+// CHECK: switch_enum {{.*}}, forwarding: @guaranteed
+// CHECK-LABEL: } // end sil function 'switch_test'
+sil [ossa] @switch_test : $@convention(thin) () -> () {
+  %none = enum $FakeOptional<Klass>, #FakeOptional.none
+  switch_enum %none : $FakeOptional<Klass>, case #FakeOptional.some!enumelt:bb1, case #FakeOptional.none!enumelt:bb2, forwarding: @guaranteed
+
+bb1(%arg : @guaranteed $Klass):
+  br bb3
+
+bb2:
+  br bb3
+
+bb3:
+  %8 = tuple ()
+  return %8 : $()
+}
+
diff --git a/test/SIL/memory_lifetime.sil b/test/SIL/memory_lifetime.sil
@@ -417,7 +417,7 @@ bb0(%0 : $*Optional<T>):
   %1 = load_borrow %0 : $*Optional<T>
   switch_enum %1 : $Optional<T>, case #Optional.some!enumelt: bb1, case #Optional.none!enumelt: bb2
 
-bb1(%3 : $T):
+bb1(%3 : @guaranteed $T):
   end_borrow %1 : $Optional<T>
   %2 = unchecked_take_enum_data_addr %0 : $*Optional<T>, #Optional.some!enumelt
   destroy_addr %2 : $*T
diff --git a/test/SIL/memory_lifetime_failures.sil b/test/SIL/memory_lifetime_failures.sil
@@ -191,7 +191,7 @@ bb0(%0 : $*Optional<T>):
   %1 = load_borrow %0 : $*Optional<T>
   switch_enum %1 : $Optional<T>, case #Optional.some!enumelt: bb1, case #Optional.none!enumelt: bb2
 
-bb1(%3 : $T):
+bb1(%3 : @guaranteed $T):
   end_borrow %1 : $Optional<T>
   %2 = unchecked_take_enum_data_addr %0 : $*Optional<T>, #Optional.some!enumelt
   br bb3
diff --git a/test/SIL/ownership-verifier/use_verifier.sil b/test/SIL/ownership-verifier/use_verifier.sil
@@ -484,7 +484,7 @@ bb3:
 sil [ossa] @switch_enum_owned_payload_test3 : $@convention(thin) () -> () {
 bb0:
   %1 = enum $Optional<Builtin.NativeObject>, #Optional.none!enumelt
-  switch_enum %1 : $Optional<Builtin.NativeObject>, case #Optional.none!enumelt: bb1, case #Optional.some!enumelt: bb2
+  switch_enum %1 : $Optional<Builtin.NativeObject>, case #Optional.none!enumelt: bb1, case #Optional.some!enumelt: bb2, forwarding: @owned
 
 bb1:
   br bb3
@@ -597,7 +597,7 @@ bb3:
 sil [ossa] @switch_enum_no_payload_test : $@convention(thin) () -> () {
 bb0:
   %0 = enum $Optional<Builtin.NativeObject>, #Optional.none!enumelt
-  switch_enum %0 : $Optional<Builtin.NativeObject>, case #Optional.some!enumelt: bb1, case #Optional.none!enumelt: bb2
+  switch_enum %0 : $Optional<Builtin.NativeObject>, case #Optional.some!enumelt: bb1, case #Optional.none!enumelt: bb2, forwarding: @owned
 
 bb1(%1 : @owned $Builtin.NativeObject):
   destroy_value %1 : $Builtin.NativeObject
@@ -676,7 +676,7 @@ bb12:
 
 bb13:
   %e2 = enum $ThreeDifferingPayloadEnum, #ThreeDifferingPayloadEnum.trivial_payload!enumelt, %0 : $Builtin.Int32
-  switch_enum %e2 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb16, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb18, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb20
+  switch_enum %e2 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb16, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb18, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb20, forwarding: @owned
 
 bb16(%17 : @owned $Builtin.NativeObject):
   destroy_value %17 : $Builtin.NativeObject
@@ -689,7 +689,7 @@ bb20:
   br bb21
 
 bb21:  
-  switch_enum %e2 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb24, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb26, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb22
+  switch_enum %e2 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb24, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb26, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb22, forwarding: @owned
 
 bb22(%23 : @owned $Builtin.NativeObject):
   destroy_value %23 : $Builtin.NativeObject
@@ -702,7 +702,7 @@ bb26:
   br bb27
 
 bb27:
-  switch_enum %e2 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb32, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb28, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb30
+  switch_enum %e2 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb32, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb28, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb30, forwarding: @owned
 
 bb28(%29 : @owned $Builtin.NativeObject):
   destroy_value %29 : $Builtin.NativeObject
@@ -716,7 +716,7 @@ bb32:
 
 bb33:
   %e3 = enum $ThreeDifferingPayloadEnum, #ThreeDifferingPayloadEnum.nopayload!enumelt
-  switch_enum %e3 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb34, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb36, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb38
+  switch_enum %e3 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb34, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb36, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb38, forwarding: @owned
 
 bb34(%35 : @owned $Builtin.NativeObject):
   destroy_value %35 : $Builtin.NativeObject
@@ -729,7 +729,7 @@ bb38:
   br bb39
 
 bb39:
-  switch_enum %e3 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb42, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb44, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb40
+  switch_enum %e3 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb42, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb44, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb40, forwarding: @owned
 
 bb40(%41 : @owned $Builtin.NativeObject):
   destroy_value %41 : $Builtin.NativeObject
@@ -742,7 +742,7 @@ bb44:
   br bb45
 
 bb45:
-  switch_enum %e3 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb50, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb46, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb48
+  switch_enum %e3 : $ThreeDifferingPayloadEnum, case #ThreeDifferingPayloadEnum.nopayload!enumelt: bb50, case #ThreeDifferingPayloadEnum.nontrivial_payload!enumelt: bb46, case #ThreeDifferingPayloadEnum.trivial_payload!enumelt: bb48, forwarding: @owned
 
 bb46(%47 : @owned $Builtin.NativeObject):
   destroy_value %47 : $Builtin.NativeObject
@@ -1073,7 +1073,7 @@ bb0:
 sil [ossa] @transforming_terminator_undef_test : $@convention(thin) () -> () {
 bb0:
   %0 = unchecked_ref_cast undef : $Builtin.NativeObject to $Builtin.NativeObject
-  checked_cast_br %0 : $Builtin.NativeObject to SuperKlass, bb1, bb2
+  checked_cast_br %0 : $Builtin.NativeObject to SuperKlass, bb1, bb2, forwarding: @owned
 
 bb1(%1 : @owned $SuperKlass):
   destroy_value %1 : $SuperKlass
diff --git a/test/SILGen/switch.swift b/test/SILGen/switch.swift
@@ -890,21 +890,21 @@ func test_switch_two_unions(x: Foo, y: Foo) {
   // CHECK:   function_ref @$s6switch1ayyF
     a()
 
-  // CHECK: [[IS_NOT_CASE1]](
+  // CHECK: [[IS_NOT_CASE1]]:
   // CHECK:   switch_enum [[X]] : $Foo, case #Foo.B!enumelt: [[IS_CASE2:bb[0-9]+]], default [[IS_NOT_CASE2:bb[0-9]+]]
   // CHECK: [[IS_CASE2]]:
   case (Foo.B, _):
   // CHECK:   function_ref @$s6switch1byyF
     b()
 
-  // CHECK: [[IS_NOT_CASE2]](
+  // CHECK: [[IS_NOT_CASE2]]:
   // CHECK:   switch_enum [[Y]] : $Foo, case #Foo.B!enumelt: [[IS_CASE3:bb[0-9]+]], default [[UNREACHABLE:bb[0-9]+]]
   // CHECK: [[IS_CASE3]]:
   case (_, Foo.B):
   // CHECK:   function_ref @$s6switch1cyyF
     c()
 
-  // CHECK: [[UNREACHABLE]](
+  // CHECK: [[UNREACHABLE]]:
   // CHECK:   unreachable
   }
 }
diff --git a/test/SILGen/switch_ownership.swift b/test/SILGen/switch_ownership.swift
@@ -42,21 +42,21 @@ func test_switch_two_trivial_unions(x: Foo, y: Foo) {
   // CHECK:   function_ref @$s6switch1ayyF
     a()
 
-  // CHECK: [[IS_NOT_CASE1]](
+  // CHECK: [[IS_NOT_CASE1]]:
   // CHECK:   switch_enum [[X]] : $Foo, case #Foo.B!enumelt: [[IS_CASE2:bb[0-9]+]], default [[IS_NOT_CASE2:bb[0-9]+]]
   // CHECK: [[IS_CASE2]]:
   case (Foo.B, _):
   // CHECK:   function_ref @$s6switch1byyF
     b()
 
-  // CHECK: [[IS_NOT_CASE2]](
+  // CHECK: [[IS_NOT_CASE2]]:
   // CHECK:   switch_enum [[Y]] : $Foo, case #Foo.B!enumelt: [[IS_CASE3:bb[0-9]+]], default [[UNREACHABLE:bb[0-9]+]]
   // CHECK: [[IS_CASE3]]:
   case (_, Foo.B):
   // CHECK:   function_ref @$s6switch1cyyF
     c()
 
-  // CHECK: [[UNREACHABLE]](
+  // CHECK: [[UNREACHABLE]]:
   // CHECK:   unreachable
   }
 }
@@ -77,22 +77,22 @@ func test_switch_two_nontrivial_unions(x: NonTrivialFoo, y: NonTrivialFoo) {
   // CHECK:   function_ref @$s6switch1ayyF
     a()
 
-  // CHECK: [[IS_NOT_CASE1]]({{%.*}} : @guaranteed $NonTrivialFoo):
+  // CHECK: [[IS_NOT_CASE1]]({{%.*}} : @guaranteed $Klass):
   // CHECK:   [[BORROWED_X:%.*]] = begin_borrow [[X]]
   // CHECK:   switch_enum [[BORROWED_X]] : $NonTrivialFoo, case #NonTrivialFoo.B!enumelt: [[IS_CASE2:bb[0-9]+]], default [[IS_NOT_CASE2:bb[0-9]+]]
   // CHECK: [[IS_CASE2]]({{%.*}} : @guaranteed $Klass)
   case (NonTrivialFoo.B, _):
   // CHECK:   function_ref @$s6switch1byyF
     b()
 
-  // CHECK: [[IS_NOT_CASE2]]({{%.*}} : @guaranteed $NonTrivialFoo)
+  // CHECK: [[IS_NOT_CASE2]]({{%.*}} : @guaranteed $Klass)
   // CHECK:   switch_enum [[Y]] : $NonTrivialFoo, case #NonTrivialFoo.B!enumelt: [[IS_CASE3:bb[0-9]+]], default [[UNREACHABLE:bb[0-9]+]]
   // CHECK: [[IS_CASE3]]({{%.*}} : @owned $Klass):
   case (_, NonTrivialFoo.B):
   // CHECK:   function_ref @$s6switch1cyyF
     c()
 
-  // CHECK: [[UNREACHABLE]]({{%.*}} : @owned $NonTrivialFoo):
+  // CHECK: [[UNREACHABLE]]({{%.*}} : @owned $Klass):
   // CHECK:   unreachable
   }
 }
diff --git a/test/SILOptimizer/accessed_storage_analysis_ossa.sil b/test/SILOptimizer/accessed_storage_analysis_ossa.sil
@@ -644,7 +644,7 @@ sil [ossa] @readUnidentifiedArgCaller : $@convention(thin) (@guaranteed Indirect
 bb0(%0 : @guaranteed $IndirectEnum, %1 : $Int):
   switch_enum %0 : $IndirectEnum, case #IndirectEnum.V!enumelt: bb2, default bb1
 
-bb1(%defaultArg : @guaranteed $IndirectEnum):
+bb1:
   br bb3(%1 : $Int)
 
 bb2(%7 : @guaranteed ${ var Int }):
diff --git a/test/SILOptimizer/capture_promotion_generic_context.sil b/test/SILOptimizer/capture_promotion_generic_context.sil
@@ -89,12 +89,12 @@ entry(%result : $*Int, %0: $*R<T>, %1 : $*Int, %b : @guaranteed $<τ_0_0> { var
   %e = load_borrow %a : $*E<(R<T>)->Int>
   switch_enum %e : $E<(R<T>)->Int>, case #E.Some!enumelt : bb1, default bb2
 
-bb1(%f : $@callee_guaranteed @substituted <A, B> (@in_guaranteed A) -> @out B for <R<T>, Int>):
+bb1(%f : @guaranteed $@callee_guaranteed @substituted <A, B> (@in_guaranteed A) -> @out B for <R<T>, Int>):
   apply %f(%result, %0) : $@callee_guaranteed @substituted <A, B> (@in_guaranteed A) -> @out B for <R<T>, Int>
   end_borrow %e : $E<(R<T>)->Int>
   br exit
 
-bb2(%default : @guaranteed $E<(R<T>)->Int>):
+bb2:
   end_borrow %e : $E<(R<T>)->Int>
   copy_addr %1 to %result : $*Int
   br exit
diff --git a/test/SILOptimizer/capture_promotion_generic_context_ownership.sil b/test/SILOptimizer/capture_promotion_generic_context_ownership.sil
@@ -101,8 +101,7 @@ bb1(%f : @owned $@callee_guaranteed @substituted <τ_0_0, τ_0_1> (@in_guarantee
   destroy_value %f : $@callee_guaranteed @substituted <τ_0_0, τ_0_1> (@in_guaranteed τ_0_0) -> @out τ_0_1 for <R<T>, Int>
   br exit
 
-bb2(%original : @owned $E<(R<T>)->Int>):
-  destroy_value %original : $E<(R<T>)->Int>
+bb2:
   br exit
 
 exit:
diff --git a/test/SILOptimizer/diagnose_unreachable.sil b/test/SILOptimizer/diagnose_unreachable.sil
@@ -484,8 +484,8 @@ bb1(%2 : @owned $Klass1):
   destroy_value %2 : $Klass1
   br bb3
 
-bb2(%3 : @owned $Either<Klass1, Klass2>):
-  destroy_value %3 : $Either<Klass1, Klass2>
+bb2(%3 : @owned $Klass2):
+  destroy_value %3 : $Klass2
   br bb3
 
 bb3:
@@ -507,8 +507,8 @@ bb1(%2 : @owned $Klass1):
   destroy_value %2 : $Klass1
   br bb3
 
-bb2(%3 : @owned $Either<Klass1, Klass2>):
-  destroy_value %3 : $Either<Klass1, Klass2>
+bb2(%3 : @owned $Klass2):
+  destroy_value %3 : $Klass2
   br bb3
 
 bb3:
diff --git a/test/SILOptimizer/mandatory_inlining_ossa_to_non_ossa.sil b/test/SILOptimizer/mandatory_inlining_ossa_to_non_ossa.sil
@@ -256,8 +256,7 @@ bb4(%3 : @owned $Klass):
   destroy_value %3 : $Klass
   br bb6
 
-bb5(%4 : @owned $FakeOptional<Klass>):
-  destroy_value %4 : $FakeOptional<Klass>
+bb5:
   br bb6
 
 bb6:
@@ -284,7 +283,6 @@ bb6:
 // CHECK:   release_value [[PAYLOAD]]
 //
 // CHECK: [[DEFAULT]]:
-// CHECK:   release_value [[ARG1]]
 // CHECK: } // end sil function 'term_non_ossa_caller'
 sil @term_non_ossa_caller : $@convention(thin) (@owned Builtin.NativeObject, @owned FakeOptional<Klass>) -> () {
 bb0(%0 : $Builtin.NativeObject, %1 : $FakeOptional<Klass>):
diff --git a/test/SILOptimizer/ownership_model_eliminator.sil b/test/SILOptimizer/ownership_model_eliminator.sil
@@ -228,8 +228,8 @@ bb1(%1 : @owned $Builtin.NativeObject):
   destroy_value %1 : $Builtin.NativeObject
   br bb3
 
-bb2(%2 : @owned $Either<Builtin.NativeObject, Builtin.AnyObject>):
-  destroy_value %2 : $Either<Builtin.NativeObject, Builtin.AnyObject>
+bb2(%2 : @owned $Builtin.AnyObject):
+  destroy_value %2 : $Builtin.AnyObject
   br bb3
 
 bb3:
diff --git a/test/SILOptimizer/pound_assert_ossa.sil b/test/SILOptimizer/pound_assert_ossa.sil
@@ -542,6 +542,8 @@ case right(Builtin.Int64)
 }
 
 // Make sure that we properly handle failure default cases.
+//
+// This always returns 0.
 sil [ossa] @switch_enum_test_callee_1 : $@convention(thin) () -> Builtin.Int64 {
 bb0:
   %0 = integer_literal $Builtin.Int64, 0
@@ -551,27 +553,27 @@ bb0:
 bb1(%2 : $Builtin.Int64):
   br bb3(%2 : $Builtin.Int64)
 
-bb2(%3 : $Either):
+bb2(%3 : $Builtin.Int64):
   %4 = integer_literal $Builtin.Int64, 1
   br bb3(%4 : $Builtin.Int64)
 
 bb3(%5 : $Builtin.Int64):
   return %5 : $Builtin.Int64
 }
 
+// This always returns 0.
 sil [ossa] @switch_enum_test_callee_2 : $@convention(thin) () -> Builtin.Int64 {
 bb0:
   %0 = integer_literal $Builtin.Int64, 0
   %1 = enum $Either, #Either.left!enumelt, %0 : $Builtin.Int64
   // Make sure we go down the bad path.
   switch_enum %1 : $Either, case #Either.right!enumelt: bb4, default bb5
 
-bb4(%7 : $Builtin.Int64):
-  br bb6(%7 : $Builtin.Int64)
+bb4(%6 : $Builtin.Int64):
+  br bb6(%6 : $Builtin.Int64)
 
-bb5(%8 : $Either):
-  %9 = unchecked_enum_data %8 : $Either, #Either.right!enumelt
-  br bb6(%9 : $Builtin.Int64)
+bb5(%8 : $Builtin.Int64):
+  br bb6(%8 : $Builtin.Int64)
 
 bb6(%10 : $Builtin.Int64):
   return %10 : $Builtin.Int64
diff --git a/test/SILOptimizer/semantic-arc-opts-canonical.sil b/test/SILOptimizer/semantic-arc-opts-canonical.sil
@@ -372,8 +372,7 @@ bb1(%2 : @owned $Builtin.NativeObject):
   destroy_value %2 : $Builtin.NativeObject
   br bb3
 
-bb2(%3 : @owned $FakeOptional<Builtin.NativeObject>):
-  destroy_value %3 : $FakeOptional<Builtin.NativeObject>
+bb2:
   br bb3
 
 bb3:
@@ -436,8 +435,7 @@ bb1(%2 : @owned $Builtin.NativeObject):
   destroy_value %2 : $Builtin.NativeObject
   br bb3
 
-bb2(%3 : @owned $FakeOptional<Builtin.NativeObject>):
-  destroy_value %3 : $FakeOptional<Builtin.NativeObject>
+bb2:
   br bb3
 
 bb3:
diff --git a/test/SILOptimizer/semantic-arc-opts-loadcopy-to-loadborrow.sil b/test/SILOptimizer/semantic-arc-opts-loadcopy-to-loadborrow.sil
diff --git a/test/SILOptimizer/semantic-arc-opts.sil b/test/SILOptimizer/semantic-arc-opts.sil
diff --git a/test/SILOptimizer/simplify_cfg_args_ossa.sil b/test/SILOptimizer/simplify_cfg_args_ossa.sil
diff --git a/test/SILOptimizer/simplify_cfg_ossa.sil b/test/SILOptimizer/simplify_cfg_ossa.sil
diff --git a/test/SILOptimizer/simplify_cfg_trivial_jumpthread.sil b/test/SILOptimizer/simplify_cfg_trivial_jumpthread.sil
diff --git a/test/SILOptimizer/simplify_cfg_tryapply.sil b/test/SILOptimizer/simplify_cfg_tryapply.sil
