Import LLVM 5.0.0 release including clang, lld and lldb.

1 files changed, 11 insertions, 10 deletions

diff --git a/gnu/llvm/unittests/Option/OptionParsingTest.cpp b/gnu/llvm/unittests/Option/OptionParsingTest.cpp
index b0418a71c78..6ac6283327b 100644
--- a/gnu/llvm/unittests/Option/OptionParsingTest.cpp
+++ b/gnu/llvm/unittests/Option/OptionParsingTest.cpp
@@ -18,8 +18,9 @@ using namespace llvm::opt;
 
 enum ID {
   OPT_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
-               HELPTEXT, METAVAR) OPT_##ID,
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
+               HELPTEXT, METAVAR, VALUES)                                      \
+  OPT_##ID,
 #include "Opts.inc"
   LastOption
 #undef OPTION
@@ -36,10 +37,10 @@ enum OptionFlags {
 };
 
 static const OptTable::Info InfoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
-               HELPTEXT, METAVAR)   \
-  { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, \
-    FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS },
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
+               HELPTEXT, METAVAR, VALUES)                                      \
+  {PREFIX, NAME,  HELPTEXT,    METAVAR,     OPT_##ID,  Option::KIND##Class,    \
+   PARAM,  FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS, VALUES},
 #include "Opts.inc"
 #undef OPTION
 };
@@ -97,11 +98,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]));