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

[Artyom Skrobov]

Author: askrobov
Date: Fri Dec 13 07:43:48 2013
New Revision: 197229

URL: http://llvm.org/viewvc/llvm-project?rev=197229&view=rev
Log:
clang-check to ignore -no-integrated-as because certain drivers can't handle it

Modified:
    cfe/trunk/lib/Tooling/CompilationDatabase.cpp
    cfe/trunk/test/Tooling/multi-jobs.cpp

Modified: cfe/trunk/lib/Tooling/CompilationDatabase.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/CompilationDatabase.cpp?rev=197229&r1=197228&r2=197229&view=diff
==============================================================================
--- cfe/trunk/lib/Tooling/CompilationDatabase.cpp (original)
+++ cfe/trunk/lib/Tooling/CompilationDatabase.cpp Fri Dec 13 07:43:48 2013
@@ -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<con
   // 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));
 

Modified: cfe/trunk/test/Tooling/multi-jobs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Tooling/multi-jobs.cpp?rev=197229&r1=197228&r2=197229&view=diff
==============================================================================
--- cfe/trunk/test/Tooling/multi-jobs.cpp (original)
+++ cfe/trunk/test/Tooling/multi-jobs.cpp Fri Dec 13 07:43:48 2013
@@ -2,6 +2,3 @@
 
 // CHECK: C++ requires
 invalid;
-
-// MSVC targeted drivers (*-win32) are incapable of invoking external assembler.
-// XFAIL: win32