Fix check lines in array property opt test

Author: meg-gupta

test/SILOptimizer/array_property_opt.sil

@@ -25,6 +25,10 @@ enum MyBool{
 class MyClass {
 }
 
+struct MyInt {
+  @_hasStorage var _value: Builtin.Int64
+}
+
 // CHECK-LABEL: sil @clone_switch_enum_exit : 
 // CHECK: bb1:
 // CHECK: [[FUNC1:%.*]] = function_ref @arrayPropertyIsNative
@@ -264,7 +268,7 @@ bb11: // Non-exit dominated by bb1
 }
 
 class Klass {
-  var val: Optional<Int>
+  var val: Optional<MyInt>
 }
 
 struct WrapperStruct {
@@ -273,6 +277,13 @@ struct WrapperStruct {
 
 sil @use_klass : $@convention(thin) (@in_guaranteed Klass) -> ()
 
+// Test verifier does not fire for address phis
+// Check if array property opt is kicking in by looking for 2 calls to hoistableIsNativeTypeChecked
+// CHECK-LABEL: sil @test_sink_address_proj : 
+// [[FUNC:%.*]] = function_ref @arrayPropertyIsNative : $@convention(method) (@owned MyArray<MyClass>) -> Bool
+// apply [[FUNC]]
+// apply [[FUNC]]
+// CHECK-LABEL: } // end sil function 'test_sink_address_proj'
 sil @test_sink_address_proj : $@convention(thin) (@inout MyArray<MyClass>, @in_guaranteed WrapperStruct) -> () {
 bb0(%0 : $*MyArray<MyClass>, %1 : $*WrapperStruct):
   %3 = load %0 : $*MyArray<MyClass>
@@ -306,10 +317,17 @@ bb6:
 }
 
 sil [_semantics "array.props.isNativeTypeChecked"] @hoistableIsNativeTypeChecked : $@convention(method) (@guaranteed Array<Klass>) -> Bool
-sil [_semantics "array.get_element"] @getElement : $@convention(method) (Int, Bool, _DependenceToken, @guaranteed Array<Klass>) -> @owned Klass
-sil [_semantics "array.get_count"] @getCount : $@convention(method) (@guaranteed Array<Klass>) -> Int
-
-sil hidden @test_array_prop_opt : $@convention(thin) (@guaranteed Optional<Array<Klass>>) -> Int {
+sil [_semantics "array.get_element"] @getElement : $@convention(method) (MyInt, Bool, _DependenceToken, @guaranteed Array<Klass>) -> @owned Klass
+sil [_semantics "array.get_count"] @getCount : $@convention(method) (@guaranteed Array<Klass>) -> MyInt
+
+// Test verifier does not fire for address phis
+// Check if array property opt is kicking in by looking for 2 calls to hoistableIsNativeTypeChecked
+// CHECK-LABEL: sil @test_array_prop_opt : 
+// [[FUNC:%.*]] = function_ref @hoistableIsNativeTypeChecked : $@convention(method) (@guaranteed Array<Klass>) -> Bool
+// apply [[FUNC]]
+// apply [[FUNC]]
+// CHECK-LABEL: } // end sil function 'test_array_prop_opt'
+sil @test_array_prop_opt : $@convention(thin) (@guaranteed Optional<Array<Klass>>) -> MyInt {
 bb0(%0 : $Optional<Array<Klass>>):
   %4 = integer_literal $Builtin.Int64, 0
   switch_enum %0 : $Optional<Array<Klass>>, case #Optional.some!enumelt: bb2, case #Optional.none!enumelt: bb1
@@ -318,11 +336,11 @@ bb1:
   br bb12(%4 : $Builtin.Int64)
 
 bb2(%12 : $Array<Klass>):
-  %14 = function_ref @getCount : $@convention(method) (@guaranteed Array<Klass>) -> Int
+  %14 = function_ref @getCount : $@convention(method) (@guaranteed Array<Klass>) -> MyInt
   retain_value %0 : $Optional<Array<Klass>>
   retain_value %0 : $Optional<Array<Klass>>
-  %17 = apply %14(%12) : $@convention(method) (@guaranteed Array<Klass>) -> Int
-  %18 = struct_extract %17 : $Int, #Int._value
+  %17 = apply %14(%12) : $@convention(method) (@guaranteed Array<Klass>) -> MyInt
+  %18 = struct_extract %17 : $MyInt, #MyInt._value
   %19 = builtin "cmp_eq_Int64"(%18 : $Builtin.Int64, %4 : $Builtin.Int64) : $Builtin.Int1
   cond_br %19, bb3, bb4
 
@@ -337,25 +355,25 @@ bb3:
 
 bb4:
   %28 = function_ref @hoistableIsNativeTypeChecked : $@convention(method) (@guaranteed Array<Klass>) -> Bool
-  %29 = function_ref @getElement : $@convention(method) (Int, Bool, _DependenceToken, @guaranteed Array<Klass>) -> @owned Klass
+  %29 = function_ref @getElement : $@convention(method) (MyInt, Bool, _DependenceToken, @guaranteed Array<Klass>) -> @owned Klass
   %30 = integer_literal $Builtin.Int64, 1
   %31 = integer_literal $Builtin.Int1, -1
   %32 = struct $_DependenceToken ()
   br bb5(%4 : $Builtin.Int64)
 
 bb5(%34 : $Builtin.Int64):
-  %35 = struct $Int (%34 : $Builtin.Int64)
+  %35 = struct $MyInt (%34 : $Builtin.Int64)
   %36 = apply %28(%12) : $@convention(method) (@guaranteed Array<Klass>) -> Bool
-  %37 = apply %29(%35, %36, %32, %12) : $@convention(method) (Int, Bool, _DependenceToken, @guaranteed Array<Klass>) -> @owned Klass
+  %37 = apply %29(%35, %36, %32, %12) : $@convention(method) (MyInt, Bool, _DependenceToken, @guaranteed Array<Klass>) -> @owned Klass
   %38 = builtin "sadd_with_overflow_Int64"(%34 : $Builtin.Int64, %30 : $Builtin.Int64, %31 : $Builtin.Int1) : $(Builtin.Int64, Builtin.Int1)
   %39 = tuple_extract %38 : $(Builtin.Int64, Builtin.Int1), 0
   %40 = tuple_extract %38 : $(Builtin.Int64, Builtin.Int1), 1
   cond_fail %40 : $Builtin.Int1, "arithmetic overflow"
   %43 = ref_element_addr %37 : $Klass, #Klass.val
-  %44 = begin_access [read] [dynamic] [no_nested_conflict] %43 : $*Optional<Int>
-  %45 = load %44 : $*Optional<Int>
-  end_access %44 : $*Optional<Int>
-  switch_enum %45 : $Optional<Int>, case #Optional.some!enumelt: bb9, case #Optional.none!enumelt: bb6
+  %44 = begin_access [read] [dynamic] [no_nested_conflict] %43 : $*Optional<MyInt>
+  %45 = load %44 : $*Optional<MyInt>
+  end_access %44 : $*Optional<MyInt>
+  switch_enum %45 : $Optional<MyInt>, case #Optional.some!enumelt: bb9, case #Optional.none!enumelt: bb6
 
 bb6:
   strong_release %37 : $Klass
@@ -372,22 +390,22 @@ bb8:
 
 bb9:
   release_value %0 : $Optional<Array<Klass>>
-  %57 = begin_access [read] [dynamic] [no_nested_conflict] %43 : $*Optional<Int>
-  %58 = load %57 : $*Optional<Int>
-  end_access %57 : $*Optional<Int>
-  switch_enum %58 : $Optional<Int>, case #Optional.some!enumelt: bb11, case #Optional.none!enumelt: bb10
+  %57 = begin_access [read] [dynamic] [no_nested_conflict] %43 : $*Optional<MyInt>
+  %58 = load %57 : $*Optional<MyInt>
+  end_access %57 : $*Optional<MyInt>
+  switch_enum %58 : $Optional<MyInt>, case #Optional.some!enumelt: bb11, case #Optional.none!enumelt: bb10
 
 bb10:
   cond_fail %31 : $Builtin.Int1, "Unexpectedly found nil while unwrapping an Optional value"
   unreachable
 
-bb11(%63 : $Int):
+bb11(%63 : $MyInt):
   release_value %0 : $Optional<Array<Klass>>
   strong_release %37 : $Klass
-  %66 = struct_extract %63 : $Int, #Int._value
+  %66 = struct_extract %63 : $MyInt, #MyInt._value
   br bb12(%66 : $Builtin.Int64)
 
 bb12(%69 : $Builtin.Int64):
-  %70 = struct $Int (%69 : $Builtin.Int64)
-  return %70 : $Int
+  %70 = struct $MyInt (%69 : $Builtin.Int64)
+  return %70 : $MyInt
 }