Merge pull request #40576 from gottesmm/pr-9f985cc053ba9a76411f33f3e69b6bb7251c69b3

[gardening] Two small refactorings

Author: gottesmm

lib/SILOptimizer/Mandatory/MoveKillsCopyableValuesChecker.cpp

@@ -363,17 +363,7 @@ bool MoveKillsCopyableValuesChecker::check() {
 
     // Before we do anything, see if we can find a name for our value. We do
     // this early since we need this for all of our diagnostics below.
-    StringRef varName = "unknown";
-    if (auto *use = getSingleDebugUse(lexicalValue)) {
-      DebugVarCarryingInst debugVar(use->getUser());
-      if (auto varInfo = debugVar.getVarInfo()) {
-        varName = varInfo->Name;
-      } else {
-        if (auto *decl = debugVar.getDecl()) {
-          varName = decl->getBaseName().userFacingName();
-        }
-      }
-    }
+    StringRef varName = getDebugVarName(lexicalValue);
 
     // Then compute liveness.
     SWIFT_DEFER { livenessInfo.clear(); };
@@ -419,6 +409,18 @@ bool MoveKillsCopyableValuesChecker::check() {
   return false;
 }
 
+//===----------------------------------------------------------------------===//
+//                        Unsupported Use Case Errors
+//===----------------------------------------------------------------------===//
+
+static void emitUnsupportedUseCaseError(MoveValueInst *mvi) {
+  auto &astContext = mvi->getModule().getASTContext();
+  auto diag = diag::
+    sil_movekillscopyablevalue_move_applied_to_unsupported_move;
+  diagnose(astContext, mvi->getLoc().getSourceLoc(), diag);
+  mvi->setAllowsDiagnostics(false);
+}
+
 //===----------------------------------------------------------------------===//
 //                            Top Level Entrypoint
 //===----------------------------------------------------------------------===//
@@ -455,10 +457,7 @@ class MoveKillsCopyableValuesCheckerPass : public SILFunctionTransform {
       for (auto &inst : block) {
         if (auto *mvi = dyn_cast<MoveValueInst>(&inst)) {
           if (mvi->getAllowDiagnostics()) {
-            auto diag = diag::
-                sil_movekillscopyablevalue_move_applied_to_unsupported_move;
-            diagnose(astContext, mvi->getLoc().getSourceLoc(), diag);
-            mvi->setAllowsDiagnostics(false);
+            emitUnsupportedUseCaseError(mvi);
           }
         }
       }