clang-check to ignore -no-integrated-as because certain drivers can't handle it

llvm-svn: 197229

2 files changed, 6 insertions, 5 deletions

diff --git a/clang/lib/Tooling/CompilationDatabase.cpp b/clang/lib/Tooling/CompilationDatabase.cpp
index 286beb7ae26..7bbae12dbf5 100644
--- a/clang/lib/Tooling/CompilationDatabase.cpp
+++ b/clang/lib/Tooling/CompilationDatabase.cpp
@@ -204,8 +204,8 @@ private:
 ///          \li true if successful.
 ///          \li false if \c Args cannot be used for compilation jobs (e.g.
 ///          contains an option like -E or -version).
-bool stripPositionalArgs(std::vector<const char *> Args,
-                         std::vector<std::string> &Result) {
+static bool stripPositionalArgs(std::vector<const char *> Args,
+                                std::vector<std::string> &Result) {
   IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
   UnusedInputDiagConsumer DiagClient;
   DiagnosticsEngine Diagnostics(
@@ -237,6 +237,10 @@ bool stripPositionalArgs(std::vector<const char *> Args,
   // up with no jobs but then this is the user's fault.
   Args.push_back("placeholder.cpp");
 
+  // Remove -no-integrated-as; it's not used for syntax checking,
+  // and it confuses targets which don't support this option.
+  std::remove_if(Args.begin(), Args.end(), MatchesAny(std::string("no-integrated-as")));
+
   const OwningPtr<driver::Compilation> Compilation(
       NewDriver->BuildCompilation(Args));
 
diff --git a/clang/test/Tooling/multi-jobs.cpp b/clang/test/Tooling/multi-jobs.cpp
index cef84439f0d..db8e9494083 100644
--- a/clang/test/Tooling/multi-jobs.cpp
+++ b/clang/test/Tooling/multi-jobs.cpp
@@ -2,6 +2,3 @@
 
 // CHECK: C++ requires
 invalid;
-
-// MSVC targeted drivers (*-win32) are incapable of invoking external assembler.
-// XFAIL: win32