Add an ArgList::AddAllArgs that accepts a vector of OptSpecifier.

[dougk]

Summary

This lifts the somewhat arbitrary restriction on 3 OptSpecifiers.

[bkramer]

include/llvm/Option/ArgList.h

264 ↗

(On Diff #30911)

s/const std::vector<OptSpecifier> &/ArrayRef<OptSpecifier> /

[dougk]

include/llvm/Option/ArgList.h

264 ↗

(On Diff #30911)

will do, thanks

[chandlerc]

LGTM with Ben's suggestion.

llvm/trunk/include/llvm/Option/ArgList.h

public:
   bool hasFlag(OptSpecifier Pos, OptSpecifier PosAlias, OptSpecifier Neg,
                bool Default = true) const;
 
   /// AddLastArg - Render only the last argument match \p Id0, if present.
   void AddLastArg(ArgStringList &Output, OptSpecifier Id0) const;
   void AddLastArg(ArgStringList &Output, OptSpecifier Id0,
                   OptSpecifier Id1) const;
 
+  /// AddAllArgs - Render all arguments matching any of the given ids.
+  void AddAllArgs(ArgStringList &Output, ArrayRef<OptSpecifier> Ids) const;
+
   /// AddAllArgs - Render all arguments matching the given ids.
   void AddAllArgs(ArgStringList &Output, OptSpecifier Id0,
                   OptSpecifier Id1 = 0U, OptSpecifier Id2 = 0U) const;
 
   /// AddAllArgValues - Render the argument values of all arguments
   /// matching the given ids.
   void AddAllArgValues(ArgStringList &Output, OptSpecifier Id0,
                         OptSpecifier Id1 = 0U, OptSpecifier Id2 = 0U) const;

llvm/trunk/lib/Option/ArgList.cpp

 void ArgList::AddLastArg(ArgStringList &Output, OptSpecifier Id0,
                          OptSpecifier Id1) const {
   if (Arg *A = getLastArg(Id0, Id1)) {
     A->claim();
     A->render(*this, Output);
   }
 }
 
+void ArgList::AddAllArgs(ArgStringList &Output,
+                         ArrayRef<OptSpecifier> Ids) const {
+  for (const Arg *Arg : Args) {
+    for (OptSpecifier Id : Ids) {
+      if (Arg->getOption().matches(Id)) {
+        Arg->claim();
+        Arg->render(*this, Output);
+        break;
+      }
+    }
+  }
+}
+
+/// This 3-opt variant of AddAllArgs could be eliminated in favor of one
+/// that accepts a single specifier, given the above which accepts any number.
 void ArgList::AddAllArgs(ArgStringList &Output, OptSpecifier Id0,
                          OptSpecifier Id1, OptSpecifier Id2) const {
   for (auto Arg: filtered(Id0, Id1, Id2)) {
     Arg->claim();
     Arg->render(*this, Output);
   }
 }