Call forEachNonPrimaryInput directly instead of providing useless semantics for forEachInputNotProducingSupplementaryOutput.

Author: David Ungar

include/swift/Frontend/FrontendInputsAndOutputs.h

@@ -215,10 +215,6 @@ class FrontendInputsAndOutputs {
   bool forEachInputProducingSupplementaryOutput(
       llvm::function_ref<bool(const InputFile &)> fn) const;
 
-  /// If \p fn returns true, exit early and return true.
-  bool forEachInputNotProducingSupplementaryOutput(
-      llvm::function_ref<bool(const InputFile &)> fn) const;
-
   /// Assumes there is not more than one primary input file, if any.
   /// Otherwise, you would need to call getPrimarySpecificPathsForPrimary
   /// to tell it which primary input you wanted the outputs for.

lib/Frontend/FrontendInputsAndOutputs.cpp

@@ -371,22 +371,6 @@ bool FrontendInputsAndOutputs::forEachInputProducingSupplementaryOutput(
                             : hasInputs() ? fn(firstInput()) : false;
 }
 
-bool FrontendInputsAndOutputs::forEachInputNotProducingSupplementaryOutput(
-    llvm::function_ref<bool(const InputFile &)> fn) const {
-  if (hasPrimaryInputs())
-    return forEachNonPrimaryInput(fn);
-  // If no primary inputs, compiler is in whole-module-optimization mode, and
-  // only the first input can produce supplementary outputs, although all
-  // inputs may contribute.
-  bool isFirst = true;
-  return forEachNonPrimaryInput([&](const InputFile &f) -> bool {
-    if (!isFirst)
-      return fn(f);
-    isFirst = false;
-    return false;
-  });
-}
-
 bool FrontendInputsAndOutputs::hasSupplementaryOutputPath(
     llvm::function_ref<const std::string &(const SupplementaryOutputPaths &)>
         extractorFn) const {

lib/FrontendTool/FrontendTool.cpp

@@ -1538,7 +1538,7 @@ createDispatchingDiagnosticConsumerIfNeeded(
   // To avoid introducing bugs into WMO or single-file modes, test for multiple
   // primaries.
   if (inputsAndOutputs.hasMultiplePrimaryInputs()) {
-    inputsAndOutputs.forEachInputNotProducingSupplementaryOutput(
+    inputsAndOutputs.forEachNonPrimaryInput(
         [&](const InputFile &input) -> bool {
           subConsumers.emplace_back(input.file(), nullptr);
           return false;