Merge pull request #41194 from etcwilde/ewilde/lower-executors

Lower non-optional executors

Author: etcwilde

lib/SILOptimizer/Mandatory/LowerHopToActor.cpp

@@ -102,9 +102,19 @@ bool LowerHopToActor::processHop(HopToExecutorInst *hop) {
   B.setInsertionPoint(hop);
   B.setCurrentDebugScope(hop->getDebugScope());
 
-  // Get the dominating executor value for this actor, if available,
-  // or else emit code to derive it.
-  SILValue executor = emitGetExecutor(hop->getLoc(), actor, /*optional*/true);
+  SILValue executor;
+  if (actor->getType().is<BuiltinExecutorType>()) {
+    // IRGen expects an optional Builtin.Executor, not a Builtin.Executor
+    // but we can wrap it nicely
+    executor = B.createOptionalSome(
+        hop->getLoc(), actor,
+        SILType::getOptionalType(actor->getType()));
+  } else {
+    // Get the dominating executor value for this actor, if available,
+    // or else emit code to derive it.
+    executor = emitGetExecutor(hop->getLoc(), actor, /*optional*/true);
+  }
+  assert(executor && "executor not set");
 
   B.createHopToExecutor(hop->getLoc(), executor, /*mandatory*/ false);
 

test/SILOptimizer/lower_hop_to_actor.sil

@@ -221,3 +221,22 @@ bb0(%0 : @guaranteed $CustomActor):
   %r = tuple ()
   return %r : $()
 }
+
+sil @get_raw_executor : $@convention(thin) () -> Builtin.Executor
+
+// CHECK-LABEL: sil [ossa] @non_optional_executor :
+sil [ossa] @non_optional_executor : $@async () -> () {
+bb0:
+// CHECK: bb0:
+// CHECK:      [[GET_RAW_EXECUTOR:%.*]] = function_ref @get_raw_executor
+// CHECK-NEXT: [[EXECUTOR:%.*]] = apply [[GET_RAW_EXECUTOR]]()
+// CHECK-NEXT: [[SOME:%.*]] = enum $Optional<Builtin.Executor>, #Optional.some!enumelt, [[EXECUTOR]] : $Builtin.Executor
+// CHECK-NEXT: hop_to_executor [[SOME]] : $Optional<Builtin.Executor>
+// CHECK-NEXT: [[RET:%.*]] = tuple ()
+// CHECK-NEXT: return [[RET]] : $()
+  %0 = function_ref @get_raw_executor : $@convention(thin) () -> Builtin.Executor
+  %1 = apply %0() : $@convention(thin) () -> Builtin.Executor
+  hop_to_executor %1 : $Builtin.Executor
+  %r = tuple ()
+  return %r : $()
+}