[clang][cli] NFC: Remove ArgList infrastructure for recording queries

[jansvoboda11]

Summary

This patch removes the infrastructure for recording queries in ArgList, partially reverting D94472.

The infrastructure was used during command line round-trip to determine which arguments should a certain subset of CompilerInvocation generate.

Since D96280, the command line arguments are being generated all at once, making this code no longer necessary.

[dexonsmith]

LGTM.

llvm/include/llvm/Option/ArgList.h

private:
   arglist_type Args;
 
   using OptRange = std::pair<unsigned, unsigned>;
   static OptRange emptyRange() { return {-1u, 0u}; }
 
   /// The first and last index of each different OptSpecifier ID.
   DenseMap<unsigned, OptRange> OptRanges;
 
-  /// The OptSpecifiers that were queried from this argument list.
-  mutable DenseSet<unsigned> QueriedOpts;
-
-  /// Record the queried OptSpecifiers.
-  template <typename... OptSpecifiers>
-  void recordQueriedOpts(OptSpecifiers... Ids) const {
-    SmallVector<unsigned, 4> OptsSpecifiers({toOptSpecifier(Ids).getID()...});
-    QueriedOpts.insert(OptsSpecifiers.begin(), OptsSpecifiers.end());
-  }
-
   /// Get the range of indexes in which options with the specified IDs might
   /// reside, or (0, 0) if there are no such options.
   OptRange getRange(std::initializer_list<OptSpecifier> Ids) const;
 
 protected:
   // Make the default special members protected so they won't be used to slice
   // derived objects, but can still be used by derived objects to implement
   // their own special members.
public:
   const_iterator end() const { return {Args.end(), Args.end()}; }
 
   const_reverse_iterator rbegin() const { return {Args.rbegin(), Args.rend()}; }
   const_reverse_iterator rend() const { return {Args.rend(), Args.rend()}; }
 
   template<typename ...OptSpecifiers>
   iterator_range<filtered_iterator<sizeof...(OptSpecifiers)>>
   filtered(OptSpecifiers ...Ids) const {
-    recordQueriedOpts(Ids...);
     OptRange Range = getRange({toOptSpecifier(Ids)...});
     auto B = Args.begin() + Range.first;
     auto E = Args.begin() + Range.second;
     using Iterator = filtered_iterator<sizeof...(OptSpecifiers)>;
     return make_range(Iterator(B, E, {toOptSpecifier(Ids)...}),
                       Iterator(E, E, {toOptSpecifier(Ids)...}));
   }
 
   template<typename ...OptSpecifiers>
   iterator_range<filtered_reverse_iterator<sizeof...(OptSpecifiers)>>
   filtered_reverse(OptSpecifiers ...Ids) const {
-    recordQueriedOpts(Ids...);
     OptRange Range = getRange({toOptSpecifier(Ids)...});
     auto B = Args.rend() - Range.second;
     auto E = Args.rend() - Range.first;
     using Iterator = filtered_reverse_iterator<sizeof...(OptSpecifiers)>;
     return make_range(Iterator(B, E, {toOptSpecifier(Ids)...}),
                       Iterator(E, E, {toOptSpecifier(Ids)...}));
   }
 
public:
 
   /// Render only the last argument match \p Id0, if present.
   template<typename ...OptSpecifiers>
   void AddLastArg(ArgStringList &Output, OptSpecifiers ...Ids) const {
     if (Arg *A = getLastArg(Ids...)) // Calls claim() on all Ids's Args.
       A->render(*this, Output);
   }
 
-  /// AddAllArgsExcept - Render all arguments not matching any of the excluded
-  /// ids.
-  void AddAllArgsExcept(ArgStringList &Output,
-                        const DenseSet<unsigned> &ExcludeIds) const;
   /// AddAllArgsExcept - Render all arguments matching any of the given ids
   /// and not matching any of the excluded ids.
   void AddAllArgsExcept(ArgStringList &Output, ArrayRef<OptSpecifier> Ids,
                         ArrayRef<OptSpecifier> ExcludeIds) 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.
public:
 
   /// ClaimAllArgs - Claim all arguments which match the given
   /// option id.
   void ClaimAllArgs(OptSpecifier Id0) const;
 
   /// ClaimAllArgs - Claim all arguments.
   ///
   void ClaimAllArgs() const;
-
-  /// Return the OptSpecifiers queried from this argument list.
-  const DenseSet<unsigned> &getQueriedOpts() const { return QueriedOpts; }
-
-  /// Clear the set of queried OptSpecifiers.
-  void clearQueriedOpts() const { QueriedOpts.clear(); }
-
   /// @}
   /// @name Arg Synthesis
   /// @{
 
   /// Construct a constant string pointer whose
   /// lifetime will match that of the ArgList.
   virtual const char *MakeArgStringRef(StringRef Str) const = 0;
   const char *MakeArgString(const Twine &Str) const {

llvm/lib/Option/ArgList.cpp

 
 StringRef ArgList::getLastArgValue(OptSpecifier Id, StringRef Default) const {
   if (Arg *A = getLastArg(Id))
     return A->getValue();
   return Default;
 }
 
 std::vector<std::string> ArgList::getAllArgValues(OptSpecifier Id) const {
-  recordQueriedOpts(Id);
   SmallVector<const char *, 16> Values;
   AddAllArgValues(Values, Id);
   return std::vector<std::string>(Values.begin(), Values.end());
 }
 
 void ArgList::AddAllArgsExcept(ArgStringList &Output,
-                               const DenseSet<unsigned> &ExcludeIds) const {
-  for (const Arg *Arg : *this) {
-    if (!ExcludeIds.contains(Arg->getOption().getID())) {
-      Arg->claim();
-      Arg->render(*this, Output);
-    }
-  }
-}
-
-void ArgList::AddAllArgsExcept(ArgStringList &Output,
                                ArrayRef<OptSpecifier> Ids,
                                ArrayRef<OptSpecifier> ExcludeIds) const {
   for (const Arg *Arg : *this) {
     bool Excluded = false;
     for (OptSpecifier Id : ExcludeIds) {
       if (Arg->getOption().matches(Id)) {
         Excluded = true;
         break;