[region-isolation] Eliminate more of the 'task or actor isolated value cannot be transferred' warning.

Specifically, I had to teach the variable name inferrer how to infer through
unchecked_enum_data and unchecked_take_enum_data_addr.

Author: gottesmm

lib/SILOptimizer/Utils/VariableNameUtils.cpp

@@ -276,6 +276,12 @@ VariableNameInferrer::findDebugInfoProvidingValueHelper(SILValue searchValue) {
       continue;
     }
 
+    if (auto *uedi = dyn_cast<UncheckedEnumDataInst>(searchValue)) {
+      variableNamePath.push_back(uedi);
+      searchValue = uedi->getOperand();
+      continue;
+    }
+
     if (auto *tei = dyn_cast<TupleExtractInst>(searchValue)) {
       variableNamePath.push_back(tei);
       searchValue = tei->getOperand();
@@ -294,6 +300,12 @@ VariableNameInferrer::findDebugInfoProvidingValueHelper(SILValue searchValue) {
       continue;
     }
 
+    if (auto *e = dyn_cast<UncheckedTakeEnumDataAddrInst>(searchValue)) {
+      variableNamePath.push_back(e);
+      searchValue = e->getOperand();
+      continue;
+    }
+
     if (auto *dti = dyn_cast_or_null<DestructureTupleInst>(
             searchValue->getDefiningInstruction())) {
       // Append searchValue, so we can find the specific tuple index.
@@ -473,6 +485,11 @@ void VariableNameInferrer::popSingleVariableName() {
       return;
     }
 
+    if (auto *uedi = dyn_cast<UncheckedEnumDataInst>(inst)) {
+      resultingString += getNameFromDecl(uedi->getElement());
+      return;
+    }
+
     if (auto *sei = dyn_cast<StructElementAddrInst>(inst)) {
       resultingString += getNameFromDecl(sei->getField());
       return;
@@ -484,6 +501,11 @@ void VariableNameInferrer::popSingleVariableName() {
       return;
     }
 
+    if (auto *uedi = dyn_cast<UncheckedTakeEnumDataAddrInst>(inst)) {
+      resultingString += getNameFromDecl(uedi->getElement());
+      return;
+    }
+
     resultingString += "<unknown decl>";
     return;
   }

test/Concurrency/transfernonsendable.sil

@@ -249,15 +249,17 @@ bb0(%0 : @guaranteed $MainActorIsolatedEnum):
   debug_value %0 : $MainActorIsolatedEnum, var, name "myname"
   %2 = unchecked_enum_data %0 : $MainActorIsolatedEnum, #MainActorIsolatedEnum.second!enumelt
   %3 = copy_value %2 : $NonSendableKlass
-  return %3 : $NonSendableKlass // expected-warning {{task or actor isolated value cannot be transferred}}
+  return %3 : $NonSendableKlass // expected-warning {{transferring 'myname.second' may cause a race}}
+  // expected-note @-1 {{main actor-isolated 'myname.second' cannot be a transferring result. main actor-isolated uses may race with caller uses}}
 }
 
 sil [ossa] @synchronous_returns_transferring_globalactor_enum_uncheckedtakeenumdataaddr : $@convention(method) (@in MainActorIsolatedEnum) -> @sil_transferring @owned NonSendableKlass {
 bb0(%0 : $*MainActorIsolatedEnum):
   debug_value %0 : $*MainActorIsolatedEnum, var, name "myname"
   %2 = unchecked_take_enum_data_addr %0 : $*MainActorIsolatedEnum, #MainActorIsolatedEnum.second!enumelt
   %3 = load [take] %2 : $*NonSendableKlass
-  return %3 : $NonSendableKlass // expected-warning {{task or actor isolated value cannot be transferred}}
+  return %3 : $NonSendableKlass // expected-warning {{transferring 'myname.second' may cause a race}}
+  // expected-note @-1 {{main actor-isolated 'myname.second' cannot be a transferring result. main actor-isolated uses may race with caller uses}}
 }
 
 sil [ossa] @synchronous_returns_transferring_globalactor_enum_switchenum : $@convention(method) (@guaranteed MainActorIsolatedEnum) -> @sil_transferring @owned FakeOptional<NonSendableKlass> {

test/SILOptimizer/variable_name_inference.sil

@@ -31,6 +31,11 @@ sil @getContainsKlass : $@convention(thin) () -> @owned ContainsKlass
 sil @useIndirect : $@convention(thin) <T> (@in_guaranteed T) -> ()
 sil @sideEffect : $@convention(thin) () -> ()
 
+enum FakeOptional<T> {
+case none
+case some(T)
+}
+
 //===----------------------------------------------------------------------===//
 //                                MARK: Tests
 //===----------------------------------------------------------------------===//
@@ -391,17 +396,63 @@ bb0(%0 : @owned $Klass, %1 : @guaranteed $KlassWithKlassPair):
   return %37 : $()
 }
 
-// CHECK-LABEL: begin running test 1 of 1 on function_argument_inference_from_result: variable-name-inference with: @trace[0]
+// CHECK-LABEL: begin running test 1 of 1 on function_argument_inference_through_structextract: variable-name-inference with: @trace[0]
 // CHECK: Input Value:   %3 = copy_value %2 : $Klass
 // CHECK: Name: 'self.lhs'
 // CHECK: Root: %0 = argument of bb0 : $KlassPair
-// CHECK: end running test 1 of 1 on function_argument_inference_from_result: variable-name-inference with: @trace[0]
-sil [ossa] @function_argument_inference_from_result : $@convention(thin) (@guaranteed KlassPair) -> @owned Klass {
+// CHECK: end running test 1 of 1 on function_argument_inference_through_structextract: variable-name-inference with: @trace[0]
+sil [ossa] @function_argument_inference_through_structextract : $@convention(thin) (@guaranteed KlassPair) -> @owned Klass {
 bb0(%0 : @guaranteed $KlassPair):
   specify_test "variable-name-inference @trace[0]"
   debug_value %0 : $KlassPair, let, name "self", argno 1, implicit
   %2 = struct_extract %0 : $KlassPair, #KlassPair.lhs
   %3 = copy_value %2 : $Klass
   debug_value [trace] %3 : $Klass
   return %3 : $Klass
-}
+}
+
+// CHECK-LABEL: begin running test 1 of 1 on function_argument_inference_through_uncheckedenumdata: variable-name-inference with: @trace[0]
+// CHECK: Input Value:   %3 = copy_value %2 : $Klass
+// CHECK: Name: 'self.some'
+// CHECK: Root: %0 = argument of bb0 : $FakeOptional<Klass>
+// CHECK: end running test 1 of 1 on function_argument_inference_through_uncheckedenumdata: variable-name-inference with: @trace[0]
+sil [ossa] @function_argument_inference_through_uncheckedenumdata : $@convention(thin) (@guaranteed FakeOptional<Klass>) -> @owned Klass {
+bb0(%0 : @guaranteed $FakeOptional<Klass>):
+  specify_test "variable-name-inference @trace[0]"
+  debug_value %0 : $FakeOptional<Klass>, let, name "self", argno 1, implicit
+  %2 = unchecked_enum_data %0 : $FakeOptional<Klass>, #FakeOptional.some!enumelt
+  %3 = copy_value %2 : $Klass
+  debug_value [trace] %3 : $Klass
+  return %3 : $Klass
+}
+
+// CHECK-LABEL: begin running test 1 of 1 on function_argument_inference_through_uncheckedtakeenumdataaddr: variable-name-inference with: @trace[0]
+// CHECK: Input Value:   %3 = load [take] %2 : $*Klass
+// CHECK: Name: 'self.some'
+// CHECK: Root: %0 = argument of bb0 : $*FakeOptional<Klass>
+// CHECK: end running test 1 of 1 on function_argument_inference_through_uncheckedtakeenumdataaddr: variable-name-inference with: @trace[0]
+sil [ossa] @function_argument_inference_through_uncheckedtakeenumdataaddr : $@convention(thin) (@in FakeOptional<Klass>) -> @owned Klass {
+bb0(%0 : $*FakeOptional<Klass>):
+  specify_test "variable-name-inference @trace[0]"
+  debug_value %0 : $*FakeOptional<Klass>, let, name "self", argno 1, implicit
+  %2 = unchecked_take_enum_data_addr %0 : $*FakeOptional<Klass>, #FakeOptional.some!enumelt
+  %3 = load [take] %2 : $*Klass
+  debug_value [trace] %3 : $Klass
+  return %3 : $Klass
+}
+
+// CHECK-LABEL: begin running test 1 of 1 on function_argument_inference_through_uncheckedtakeenumdataaddr_2: variable-name-inference with: @trace[0]
+// CHECK: Input Value:   %2 = unchecked_take_enum_data_addr %0
+// CHECK: Name: 'self.some'
+// CHECK: Root: %0 = argument of bb0 : $*FakeOptional<Klass>
+// CHECK: end running test 1 of 1 on function_argument_inference_through_uncheckedtakeenumdataaddr_2: variable-name-inference with: @trace[0]
+sil [ossa] @function_argument_inference_through_uncheckedtakeenumdataaddr_2 : $@convention(thin) (@in FakeOptional<Klass>) -> @owned Klass {
+bb0(%0 : $*FakeOptional<Klass>):
+  specify_test "variable-name-inference @trace[0]"
+  debug_value %0 : $*FakeOptional<Klass>, let, name "self", argno 1, implicit
+  %2 = unchecked_take_enum_data_addr %0 : $*FakeOptional<Klass>, #FakeOptional.some!enumelt
+  debug_value [trace] %2 : $*Klass
+  %3 = load [take] %2 : $*Klass
+  return %3 : $Klass
+}
+