Fix build failure after "ArrayRef'ized CompilerInvocation::CreateFrom…

…Args" llvm/llvm-project@1fac68b
AlexeySotkin · Sep 12, 2019 · c563640 · c563640
1 parent 439235d
commit c563640
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/common_clang.cpp b/common_clang.cpp
@@ -247,8 +247,7 @@ Compile(const char *pszProgramSource, const char **pInputHeaders,
 
     // Create compiler invocation from user args before trickering with it
     clang::CompilerInvocation::CreateFromArgs(compiler->getInvocation(),
-                                              optionsParser.beginArgs(),
-                                              optionsParser.endArgs(), *Diags);
+                                              optionsParser.args(), *Diags);
 
     // Configure our handling of diagnostics.
     ProcessWarningOptions(*Diags, compiler->getDiagnosticOpts());

diff --git a/options.h b/options.h
@@ -22,6 +22,7 @@ Copyright (c) Intel Corporation (2009-2017).
 #define COMMON_CLANG_OPTIONS_H
 
 #include "llvm/Option/Arg.h"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"
@@ -167,6 +168,10 @@ class CompileOptionsParser {
     return beginArgs() + m_effectiveArgsRaw.size();
   }
 
+  llvm::ArrayRef<const char *> args() {
+    return m_effectiveArgsRaw;
+  }
+
   std::string getEffectiveOptionsAsString() const;
 
   bool hasEmitSPIRV() const { return m_emitSPIRV; }