[COMGR][NFC] Move code that executes a single clang::driver::Command into its own function

Change-Id: Ic6e6fbc182563b1c3036be1fe81f90ba602850e4

Author: jmmartinez

amd/comgr/src/comgr-compiler.cpp

@@ -642,6 +642,79 @@ void logArgv(raw_ostream &OS, StringRef ProgramName,
   OS << '\n';
   OS.flush();
 }
+
+amd_comgr_status_t executeCommand(const Command &Job, raw_ostream &LogS,
+                                  TextDiagnosticPrinter *DiagClient,
+                                  DiagnosticsEngine &Diags) {
+  auto Arguments = Job.getArguments();
+  SmallVector<const char *, 128> Argv;
+  initializeCommandLineArgs(Argv);
+  Argv.append(Arguments.begin(), Arguments.end());
+  Argv.push_back(nullptr);
+
+  // By default clang driver will ask CC1 to leak memory.
+  auto *IT = find(Argv, StringRef("-disable-free"));
+  if (IT != Argv.end()) {
+    Argv.erase(IT);
+  }
+
+  clearLLVMOptions();
+
+  if (Argv[1] == StringRef("-cc1")) {
+    if (env::shouldEmitVerboseLogs()) {
+      logArgv(LogS, "clang", Argv);
+    }
+
+    std::unique_ptr<CompilerInstance> Clang(new CompilerInstance());
+    Clang->setVerboseOutputStream(LogS);
+    if (!Argv.back()) {
+      Argv.pop_back();
+    }
+    if (!CompilerInvocation::CreateFromArgs(Clang->getInvocation(), Argv,
+                                            Diags)) {
+      return AMD_COMGR_STATUS_ERROR;
+    }
+    // Internally this call refers to the invocation created above, so at
+    // this point the DiagnosticsEngine should accurately reflect all user
+    // requested configuration from Argv.
+    Clang->createDiagnostics(DiagClient, /* ShouldOwnClient */ false);
+    if (!Clang->hasDiagnostics()) {
+      return AMD_COMGR_STATUS_ERROR;
+    }
+    if (!ExecuteCompilerInvocation(Clang.get())) {
+      return AMD_COMGR_STATUS_ERROR;
+    }
+  } else if (Argv[1] == StringRef("-cc1as")) {
+    if (env::shouldEmitVerboseLogs()) {
+      logArgv(LogS, "clang", Argv);
+    }
+    Argv.erase(Argv.begin() + 1);
+    if (!Argv.back()) {
+      Argv.pop_back();
+    }
+    AssemblerInvocation Asm;
+    if (!AssemblerInvocation::createFromArgs(Asm, Argv, Diags)) {
+      return AMD_COMGR_STATUS_ERROR;
+    }
+    if (auto Status = parseLLVMOptions(Asm.LLVMArgs)) {
+      return Status;
+    }
+    if (executeAssembler(Asm, Diags, LogS)) {
+      return AMD_COMGR_STATUS_ERROR;
+    }
+  } else if (Job.getCreator().getName() == LinkerJobName) {
+    if (env::shouldEmitVerboseLogs()) {
+      logArgv(LogS, "lld", Argv);
+    }
+    if (auto Status = linkWithLLD(Arguments, LogS, LogS)) {
+      return Status;
+    }
+  } else {
+    return AMD_COMGR_STATUS_ERROR;
+  }
+  return AMD_COMGR_STATUS_SUCCESS;
+}
+
 } // namespace
 
 amd_comgr_status_t
@@ -693,71 +766,8 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
   }
 
   for (auto &Job : C->getJobs()) {
-    auto Arguments = Job.getArguments();
-    SmallVector<const char *, 128> Argv;
-    initializeCommandLineArgs(Argv);
-    Argv.append(Arguments.begin(), Arguments.end());
-    Argv.push_back(nullptr);
-
-    // By default clang driver will ask CC1 to leak memory.
-    auto *IT = find(Argv, StringRef("-disable-free"));
-    if (IT != Argv.end()) {
-      Argv.erase(IT);
-    }
-
-    clearLLVMOptions();
-
-    if (Argv[1] == StringRef("-cc1")) {
-      if (env::shouldEmitVerboseLogs()) {
-        logArgv(LogS, "clang", Argv);
-      }
-
-      std::unique_ptr<CompilerInstance> Clang(new CompilerInstance());
-      Clang->setVerboseOutputStream(LogS);
-      if (!Argv.back()) {
-        Argv.pop_back();
-      }
-      if (!CompilerInvocation::CreateFromArgs(Clang->getInvocation(), Argv,
-                                              Diags)) {
-        return AMD_COMGR_STATUS_ERROR;
-      }
-      // Internally this call refers to the invocation created above, so at
-      // this point the DiagnosticsEngine should accurately reflect all user
-      // requested configuration from Argv.
-      Clang->createDiagnostics(DiagClient, /* ShouldOwnClient */ false);
-      if (!Clang->hasDiagnostics()) {
-        return AMD_COMGR_STATUS_ERROR;
-      }
-      if (!ExecuteCompilerInvocation(Clang.get())) {
-        return AMD_COMGR_STATUS_ERROR;
-      }
-    } else if (Argv[1] == StringRef("-cc1as")) {
-      if (env::shouldEmitVerboseLogs()) {
-        logArgv(LogS, "clang", Argv);
-      }
-      Argv.erase(Argv.begin() + 1);
-      if (!Argv.back()) {
-        Argv.pop_back();
-      }
-      AssemblerInvocation Asm;
-      if (!AssemblerInvocation::createFromArgs(Asm, Argv, Diags)) {
-        return AMD_COMGR_STATUS_ERROR;
-      }
-      if (auto Status = parseLLVMOptions(Asm.LLVMArgs)) {
-        return Status;
-      }
-      if (executeAssembler(Asm, Diags, LogS)) {
-        return AMD_COMGR_STATUS_ERROR;
-      }
-    } else if (Job.getCreator().getName() == LinkerJobName) {
-      if (env::shouldEmitVerboseLogs()) {
-        logArgv(LogS, "lld", Argv);
-      }
-      if (auto Status = linkWithLLD(Arguments, LogS, LogS)) {
-        return Status;
-      }
-    } else {
-      return AMD_COMGR_STATUS_ERROR;
+    if (auto Status = executeCommand(Job, LogS, DiagClient, Diags)) {
+      return Status;
     }
   }
   return AMD_COMGR_STATUS_SUCCESS;