[sil] Teach VariableNameUtils how to look through function conversion thunk patterns.

Author: gottesmm

lib/SILOptimizer/Utils/VariableNameUtils.cpp

@@ -180,6 +180,19 @@ VariableNameInferrer::findDebugInfoProvidingValue(SILValue searchValue) {
       }
     }
 
+    // Look through a function conversion thunk if we have one.
+    if (auto *pai = dyn_cast<PartialApplyInst>(searchValue)) {
+      if (auto *fn = pai->getCalleeFunction()) {
+        if (fn->isThunk() && ApplySite(pai).getNumArguments() == 1) {
+          SILValue value = ApplySite(pai).getArgument(0);
+          if (value->getType().isFunction()) {
+            searchValue = value;
+            continue;
+          }
+        }
+      }
+    }
+
     // If we do not do an exact match, see if we can find a debug_var inst. If
     // we do, we always break since we have a root value.
     if (auto *use = getAnyDebugUse(searchValue)) {
@@ -197,7 +210,8 @@ VariableNameInferrer::findDebugInfoProvidingValue(SILValue searchValue) {
     if (isa<BeginBorrowInst>(searchValue) || isa<LoadInst>(searchValue) ||
         isa<LoadBorrowInst>(searchValue) || isa<BeginAccessInst>(searchValue) ||
         isa<MarkUnresolvedNonCopyableValueInst>(searchValue) ||
-        isa<ProjectBoxInst>(searchValue) || isa<CopyValueInst>(searchValue)) {
+        isa<ProjectBoxInst>(searchValue) || isa<CopyValueInst>(searchValue) ||
+        isa<ConvertFunctionInst>(searchValue)) {
       searchValue = cast<SingleValueInstruction>(searchValue)->getOperand(0);
       continue;
     }

test/SILOptimizer/variable_name_inference.sil

@@ -19,6 +19,7 @@ class ContainsKlass {
 sil @getKlass : $@convention(thin) () -> @owned Klass
 sil @getContainsKlass : $@convention(thin) () -> @owned ContainsKlass
 sil @useIndirect : $@convention(thin) <T> (@in_guaranteed T) -> ()
+sil @sideEffect : $@convention(thin) () -> ()
 
 //===----------------------------------------------------------------------===//
 //                                MARK: Tests
@@ -113,3 +114,37 @@ bb0:
   %13 = tuple ()
   return %13 : $()
 }
+
+sil [thunk] @test_reabstraction_thunk : $@convention(thin) (@guaranteed @callee_guaranteed () -> ()) -> @out ()
+
+// CHECK-LABEL: begin running test {{.*}} of {{.*}} on handle_function_conversion_reabstraction_thunks: variable-name-inference with: @trace[0]
+// CHECK: Name: 'namedClosure'
+// CHECK: Root: %0 = alloc_stack [lexical] $@callee_guaranteed () -> (), var, name "namedClosure"
+// CHECK: end running test {{.*}} of {{.*}} on handle_function_conversion_reabstraction_thunks: variable-name-inference with: @trace[0]
+sil [ossa] @handle_function_conversion_reabstraction_thunks : $@convention(thin) () -> () {
+bb0:
+  specify_test "variable-name-inference @trace[0]"
+  %namedStack = alloc_stack [lexical] $@callee_guaranteed () -> (), var, name "namedClosure"
+  %f = function_ref @sideEffect : $@convention(thin) () -> ()
+  %pa = partial_apply [callee_guaranteed] %f() : $@convention(thin) () -> ()
+  store %pa to [init] %namedStack : $*@callee_guaranteed () -> ()
+
+  %temp = alloc_stack $@callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <()>
+  %access = begin_access [read] [static] %namedStack : $*@callee_guaranteed () -> ()
+  %load = load [copy] %access : $*@callee_guaranteed () -> ()
+  end_access %access : $*@callee_guaranteed () -> ()
+
+  %reabstract = function_ref @test_reabstraction_thunk : $@convention(thin) (@guaranteed @callee_guaranteed () -> ()) -> @out ()
+  %reabstract_partially_applied = partial_apply [callee_guaranteed] %reabstract(%load) : $@convention(thin) (@guaranteed @callee_guaranteed () -> ()) -> @out ()
+  %cvt = convert_function %reabstract_partially_applied : $@callee_guaranteed () -> @out () to $@callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <()>
+  store %cvt to [init] %temp : $*@callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <()>
+  debug_value [trace] %temp : $*@callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <()>
+
+  destroy_addr %temp : $*@callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <()>
+  dealloc_stack %temp : $*@callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <()>
+  destroy_addr %namedStack : $*@callee_guaranteed () -> ()
+  dealloc_stack %namedStack : $*@callee_guaranteed () -> ()
+
+  %9999 = tuple ()
+  return %9999 : $()
+}