Changes required for https://reviews.llvm.org/D116011

Change-Id: I6cbec349cf1292a74a8a9f9668b96e90ffedbde7
ROCm · Dec 22, 2021 · a75326c · a75326c
1 parent 675501d
commit a75326c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp
@@ -680,6 +680,9 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
       }
       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;
@@ -699,6 +702,9 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
         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;