Skip to content

Commit 95da5a6

Browse files
committed
update test for generic executor changes
1 parent 13dd3d9 commit 95da5a6

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

test/SILGen/hop_to_executor_async_prop.swift

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -590,10 +590,9 @@ struct Container {
590590
// CHECK: hop_to_executor {{%[0-9]+}} : $MainActor
591591
// CHECK: = apply [[ADDRESS_ACCESSOR]]() : $@convention(thin) () -> Builtin.RawPointer
592592
// CHECK: hop_to_executor [[GENERIC_EXEC]] : $Optional<Builtin.Executor>
593-
// CHECK: [[MAIN:%[0-9]+]] = begin_borrow {{%[0-9]+}} : $MainActor
594-
// CHECK: hop_to_executor [[MAIN]] : $MainActor
595-
// CHECK: [[ACCESS:%[0-9]+]] = begin_access [read] [dynamic] {{%[0-9]+}} : $*Optional<Container>
596-
// CHECK: switch_enum_addr [[ACCESS]] : $*Optional<Container>, case #Optional.some!enumelt: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[CRASH_BB:bb[0-9]+]]
593+
// CHECK: hop_to_executor {{%.*}} : $MainActor
594+
// CHECK: [[ACCESS:%[0-9]+]] = begin_access [read] [dynamic] {{%[0-9]+}} : $*Optional<Container>
595+
// CHECK: switch_enum_addr [[ACCESS]] : $*Optional<Container>, case #Optional.some!enumelt: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[CRASH_BB:bb[0-9]+]]
597596
//
598597
// CHECK: [[CRASH_BB]]:
599598
// CHECK-NOT: hop_to_executor [[GENERIC_EXEC]]
@@ -602,11 +601,10 @@ struct Container {
602601
// CHECK: [[SOME_BB]]:
603602
// CHECK: [[DATA_ADDR:%[0-9]+]] = unchecked_take_enum_data_addr [[ACCESS]] : $*Optional<Container>, #Optional.some!enumelt
604603
// CHECK: [[ELEM_ADDR:%[0-9]+]] = struct_element_addr [[DATA_ADDR]] : $*Container, #Container.iso
605-
// CHECK: [[PREV_AGAIN:%[0-9]+]] = builtin "getCurrentExecutor"() : $Optional<Builtin.Executor>
606604
// CHECK: hop_to_executor {{%[0-9]+}} : $Cat
607605
// CHECK: {{%[0-9]+}} = load [trivial] [[ELEM_ADDR]] : $*Float
608-
// CHECK: hop_to_executor [[PREV]] : $Optional<Builtin.Executor>
609-
// CHECK: hop_to_executor [[PREV_AGAIN]] : $Optional<Builtin.Executor>
606+
// CHECK: hop_to_executor [[GENERIC_EXEC]] :
607+
// CHECK: hop_to_executor [[GENERIC_EXEC]] :
610608
// CHECK: } // end sil function '$s4test9ContainerV10getOrCrashSfyYaFZ'
611609
static func getOrCrash() async -> Float {
612610
return await this!.iso
@@ -620,8 +618,7 @@ struct Container {
620618
// CHECK: hop_to_executor {{%[0-9]+}} : $MainActor
621619
// CHECK: = apply [[ADDRESS_ACCESSOR]]() : $@convention(thin) () -> Builtin.RawPointer
622620
// CHECK: hop_to_executor [[GENERIC_EXEC]] : $Optional<Builtin.Executor>
623-
// CHECK: [[MAIN:%[0-9]+]] = begin_borrow {{%[0-9]+}} : $MainActor
624-
// CHECK: hop_to_executor [[MAIN]] : $MainActor
621+
// CHECK: hop_to_executor {{%.*}} : $MainActor
625622
// CHECK: [[ACCESS:%[0-9]+]] = begin_access [read] [dynamic] {{%[0-9]+}} : $*Optional<Container>
626623
// CHECK: switch_enum_addr [[ACCESS]] : $*Optional<Container>, case #Optional.some!enumelt: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[CRASH_BB:bb[0-9]+]]
627624
//
@@ -631,11 +628,10 @@ struct Container {
631628
// CHECK: [[SOME_BB]]:
632629
// CHECK: [[DATA_ADDR:%[0-9]+]] = unchecked_take_enum_data_addr [[ACCESS]] : $*Optional<Container>, #Optional.some!enumelt
633630
// CHECK: [[ELEM_ADDR:%[0-9]+]] = struct_element_addr [[DATA_ADDR]] : $*Container, #Container.iso
634-
// CHECK: [[PREV_AGAIN:%[0-9]+]] = builtin "getCurrentExecutor"() : $Optional<Builtin.Executor>
635631
// CHECK: hop_to_executor {{%[0-9]+}} : $Cat
636632
// CHECK: {{%[0-9]+}} = load [copy] [[ELEM_ADDR]] : $*CatBox
637-
// CHECK: hop_to_executor [[PREV]] : $Optional<Builtin.Executor>
638-
// CHECK: hop_to_executor [[PREV_AGAIN]] : $Optional<Builtin.Executor>
633+
// CHECK: hop_to_executor [[GENERIC_EXEC]] :
634+
// CHECK: hop_to_executor [[GENERIC_EXEC]] :
639635
// CHECK: } // end sil function '$s4test9ContainerV13getRefOrCrashAA6CatBoxCyYaFZ'
640636
static func getRefOrCrash() async -> CatBox {
641637
return await this!.isoRef

0 commit comments

Comments
 (0)