From 54071f1efd044a8109d40a646369611db5bb7f4e Mon Sep 17 00:00:00 2001
From: Naveen Seth Hanig <naveen.hanig@outlook.com>
Date: Mon, 15 Dec 2025 17:44:45 +0100
Subject: [PATCH] [clang][DependencyScanning] Use structured bindings for
 initVFSForByNameScanning (NFC)

---
 clang/lib/DependencyScanning/DependencyScanningWorker.cpp | 6 +-----
 clang/lib/Tooling/DependencyScanningTool.cpp              | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/clang/lib/DependencyScanning/DependencyScanningWorker.cpp b/clang/lib/DependencyScanning/DependencyScanningWorker.cpp
index ef16b14e7cc6e..99fe082634524 100644
--- a/clang/lib/DependencyScanning/DependencyScanningWorker.cpp
+++ b/clang/lib/DependencyScanning/DependencyScanningWorker.cpp
@@ -170,15 +170,11 @@ bool DependencyScanningWorker::computeDependencies(
 
 bool DependencyScanningWorker::initializeCompilerInstanceWithContext(
     StringRef CWD, ArrayRef<std::string> CommandLine, DiagnosticConsumer &DC) {
-  auto OverlayFSAndArgs =
+  auto [OverlayFS, ModifiedCommandLine] =
       initVFSForByNameScanning(DepFS, CommandLine, CWD, "ScanningByName");
-  auto &OverlayFS = OverlayFSAndArgs.first;
-  const auto &ModifiedCommandLine = OverlayFSAndArgs.second;
-
   auto DiagEngineWithCmdAndOpts =
       std::make_unique<DiagnosticsEngineWithDiagOpts>(ModifiedCommandLine,
                                                       OverlayFS, DC);
-
   return initializeCompilerInstanceWithContext(
       CWD, ModifiedCommandLine, std::move(DiagEngineWithCmdAndOpts), OverlayFS);
 }
diff --git a/clang/lib/Tooling/DependencyScanningTool.cpp b/clang/lib/Tooling/DependencyScanningTool.cpp
index 74cc6af3551f8..3687db03628f4 100644
--- a/clang/lib/Tooling/DependencyScanningTool.cpp
+++ b/clang/lib/Tooling/DependencyScanningTool.cpp
@@ -235,11 +235,8 @@ DependencyScanningTool::initializeCompilerInstanceWithContextOrError(
   // The input command line is either a driver-style command line, or
   // ill-formed. In this case, we will first call the Driver to build a -cc1
   // command line for this compilation or diagnose any ill-formed input.
-  auto OverlayFSAndArgs = initVFSForByNameScanning(
+  auto [OverlayFS, ModifiedCommandLine] = initVFSForByNameScanning(
       &Worker.getVFS(), CommandLine, CWD, "ScanningByName");
-  auto &OverlayFS = OverlayFSAndArgs.first;
-  const auto &ModifiedCommandLine = OverlayFSAndArgs.second;
-
   auto DiagEngineWithCmdAndOpts =
       std::make_unique<DiagnosticsEngineWithDiagOpts>(
           ModifiedCommandLine, OverlayFS, DiagPrinterWithOS->DiagPrinter);