Merge commit '98e20e15ba22' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/lib/Support/CommandLine.cpp

@@ -175,8 +175,7 @@ class CommandLineParser {
                                StringRef Overview, raw_ostream *Errs = nullptr,
                                bool LongOptionsUseDoubleDash = false);
 
-  void forEachSubCommand(Option &Opt,
-                         std::function<void(SubCommand &)> Action) {
+  void forEachSubCommand(Option &Opt, function_ref<void(SubCommand &)> Action) {
     if (Opt.Subs.empty()) {
       Action(SubCommand::getTopLevel());
       return;