[COMGR][Cache] In executeCommand use the stream passed by parameter to initialize the DiagnosticPrinter

executeCommand is the function that will get cached. To capture the
error-stream, the cache passes a raw_string_ostream in place of the error stream
in as the LogS parameter.

co-authored by anjenner and jmmartinez

Change-Id: I93c4afa7595f63475f9c95dec3129731449f9228

Author: jmmartinez

amd/comgr/src/comgr-compiler.cpp

@@ -644,8 +644,11 @@ void logArgv(raw_ostream &OS, StringRef ProgramName,
 }
 
 amd_comgr_status_t executeCommand(const Command &Job, raw_ostream &LogS,
-                                  TextDiagnosticPrinter *DiagClient,
-                                  DiagnosticsEngine &Diags) {
+                                  DiagnosticOptions &DiagOpts) {
+  TextDiagnosticPrinter DiagClient(LogS, &DiagOpts);
+  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs);
+  DiagnosticsEngine Diags(DiagID, &DiagOpts, &DiagClient, false);
+
   auto Arguments = Job.getArguments();
   SmallVector<const char *, 128> Argv;
   initializeCommandLineArgs(Argv);
@@ -677,7 +680,7 @@ amd_comgr_status_t executeCommand(const Command &Job, raw_ostream &LogS,
     // 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);
+    Clang->createDiagnostics(&DiagClient, /* ShouldOwnClient */ false);
     if (!Clang->hasDiagnostics()) {
       return AMD_COMGR_STATUS_ERROR;
     }
@@ -766,7 +769,7 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
   }
 
   for (auto &Job : C->getJobs()) {
-    if (auto Status = executeCommand(Job, LogS, DiagClient, Diags)) {
+    if (auto Status = executeCommand(Job, LogS, *DiagOpts)) {
       return Status;
     }
   }