From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Wed, 12 Apr 2017 23:43:58 +0000 (+0000)
Subject: Fix some ArgList uses after API change in r300135.
X-Git-Tag: llvmorg-5.0.0-rc1~7865
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fd4bc6b22eed5e02217862328c1fcbe5c96eab5;p=platform%2Fupstream%2Fllvm.git

Fix some ArgList uses after API change in r300135.

llvm-svn: 300139
---

diff --git a/llvm/lib/LibDriver/LibDriver.cpp b/llvm/lib/LibDriver/LibDriver.cpp
index bcdec4f..c50629d 100644
--- a/llvm/lib/LibDriver/LibDriver.cpp
+++ b/llvm/lib/LibDriver/LibDriver.cpp
@@ -121,7 +121,7 @@ int llvm::libDriverMain(llvm::ArrayRef<const char*> ArgsArr) {
   for (auto *Arg : Args.filtered(OPT_UNKNOWN))
     llvm::errs() << "ignoring unknown argument: " << Arg->getSpelling() << "\n";
 
-  if (Args.filtered_begin(OPT_INPUT) == Args.filtered_end()) {
+  if (!Args.hasArgNoClaim(OPT_INPUT)) {
     // No input files.  To match lib.exe, silently do nothing.
     return 0;
   }
diff --git a/llvm/unittests/Option/OptionParsingTest.cpp b/llvm/unittests/Option/OptionParsingTest.cpp
index b0418a7..8630ff1 100644
--- a/llvm/unittests/Option/OptionParsingTest.cpp
+++ b/llvm/unittests/Option/OptionParsingTest.cpp
@@ -97,11 +97,11 @@ TEST(Option, OptionParsing) {
   EXPECT_NE(std::string::npos, Help.find("-A"));
 
   // Test aliases.
-  arg_iterator Cs = AL.filtered_begin(OPT_C);
-  ASSERT_NE(AL.filtered_end(), Cs);
-  EXPECT_EQ("desu", StringRef((*Cs)->getValue()));
+  auto Cs = AL.filtered(OPT_C);
+  ASSERT_NE(Cs.begin(), Cs.end());
+  EXPECT_EQ("desu", StringRef((*Cs.begin())->getValue()));
   ArgStringList ASL;
-  (*Cs)->render(AL, ASL);
+  (*Cs.begin())->render(AL, ASL);
   ASSERT_EQ(2u, ASL.size());
   EXPECT_EQ("-C", StringRef(ASL[0]));
   EXPECT_EQ("desu", StringRef(ASL[1]));