From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Wed, 12 Apr 2017 23:21:25 +0000 (+0000)
Subject: Update to match LLVM r300135.
X-Git-Tag: llvmorg-5.0.0-rc1~7868
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac65f642a5a37c1cfd3ce3177ca9f4779514f399;p=platform%2Fupstream%2Fllvm.git

Update to match LLVM r300135.

Remove "REQUIRES: long_tests" from test/Driver/response-file.c since it is now about 10x faster. (We can add that back if it's still too slow for some buildbot.)

llvm-svn: 300136
---

diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index 6952f4551672..009a12da3015 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -1684,7 +1684,8 @@ Darwin::TranslateArgs(const DerivedArgList &Args, StringRef BoundArch,
       A = *it;
       assert(A->getOption().getID() == options::OPT_static &&
              "missing expected -static argument");
-      it = DAL->getArgs().erase(it);
+      *it = nullptr;
+      ++it;
     }
   }
 
diff --git a/clang/test/Driver/response-file.c b/clang/test/Driver/response-file.c
index bd336309adf8..0818f3fe2bc1 100644
--- a/clang/test/Driver/response-file.c
+++ b/clang/test/Driver/response-file.c
@@ -1,5 +1,3 @@
-// REQUIRES: long_tests
-
 // Check that clang is able to process short response files
 // Since this is a short response file, clang must not use a response file
 // to pass its parameters to other tools. This is only necessary for a large