From 6fd4bc6b22eed5e02217862328c1fcbe5c96eab5 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 12 Apr 2017 23:43:58 +0000 Subject: [PATCH] Fix some ArgList uses after API change in r300135. llvm-svn: 300139 --- llvm/lib/LibDriver/LibDriver.cpp | 2 +- llvm/unittests/Option/OptionParsingTest.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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 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])); -- 2.7.4