Move interleave(...) to the llvm namespace

include/swift/AST/AutoDiff.h

@@ -202,7 +202,7 @@ struct SILAutoDiffIndices {
 
   std::string mangle() const {
     std::string result = "src_" + llvm::utostr(source) + "_wrt_";
-    interleave(
+    llvm::interleave(
         parameters->getIndices(),
         [&](unsigned idx) { result += llvm::utostr(idx); },
         [&] { result += '_'; });

include/swift/Basic/STLExtras.h

@@ -69,6 +69,10 @@ struct function_traits<R (T::*)(Args...) const> {
   using argument_types = std::tuple<Args...>;
 };
 
+} // end namespace swift
+
+namespace llvm {
+
 /// @{
 
 /// An STL-style algorithm similar to std::for_each that applies a second
@@ -103,6 +107,11 @@ inline void interleave(const Container &c, UnaryFunctor each_fn,
 }
 
 /// @}
+
+} // end namespace llvm
+
+namespace swift {
+
 /// @{
 
 /// The equivalent of std::for_each, but for two lists at once.

lib/AST/ASTPrinter.cpp

@@ -1477,25 +1477,26 @@ void PrintAST::printSingleDepthOfGenericSignature(
   if (printParams) {
     // Print the generic parameters.
     Printer << "<";
-    interleave(genericParams,
-               [&](GenericTypeParamType *param) {
-                 if (!subMap.empty()) {
-                   if (auto argTy = substParam(param))
-                     printType(argTy);
-                   else
-                     printType(param);
-                 } else if (auto *GP = param->getDecl()) {
-                   Printer.callPrintStructurePre(
-                       PrintStructureKind::GenericParameter, GP);
-                   Printer.printName(GP->getName(),
-                                     PrintNameContext::GenericParameter);
-                   Printer.printStructurePost(
-                       PrintStructureKind::GenericParameter, GP);
-                 } else {
-                   printType(param);
-                 }
-               },
-               [&] { Printer << ", "; });
+    llvm::interleave(
+        genericParams,
+        [&](GenericTypeParamType *param) {
+          if (!subMap.empty()) {
+            if (auto argTy = substParam(param))
+              printType(argTy);
+            else
+              printType(param);
+          } else if (auto *GP = param->getDecl()) {
+            Printer.callPrintStructurePre(PrintStructureKind::GenericParameter,
+                                          GP);
+            Printer.printName(GP->getName(),
+                              PrintNameContext::GenericParameter);
+            Printer.printStructurePost(PrintStructureKind::GenericParameter,
+                                       GP);
+          } else {
+            printType(param);
+          }
+        },
+        [&] { Printer << ", "; });
   }
 
   if (printRequirements || printInherited) {
@@ -3025,7 +3026,7 @@ void PrintAST::visitEnumCaseDecl(EnumCaseDecl *decl) {
   }
   Printer << tok::kw_case << " ";
 
-  interleave(elems.begin(), elems.end(),
+  llvm::interleave(elems.begin(), elems.end(),
     [&](EnumElementDecl *elt) {
       printEnumElement(elt);
     },
@@ -4438,9 +4439,9 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       if (!T->getSubstitutions().empty()) {
         Printer << '<';
         auto replacements = T->getSubstitutions().getReplacementTypes();
-        interleave(replacements.begin(), replacements.end(),
-                   [&](Type t) { visit(t); },
-                   [&] { Printer << ", "; });
+        llvm::interleave(
+            replacements.begin(), replacements.end(), [&](Type t) { visit(t); },
+            [&] { Printer << ", "; });
         Printer << '>';
       }
       return;

lib/AST/ASTScopePrinting.cpp

@@ -65,9 +65,10 @@ void ASTScopeImpl::dumpOneScopeMapLocation(
   locScope->lookupLocalsOrMembers({this}, gatherer);
   if (!gatherer.getDecls().empty()) {
     llvm::errs() << "Local bindings: ";
-    interleave(gatherer.getDecls().begin(), gatherer.getDecls().end(),
-               [&](ValueDecl *value) { llvm::errs() << value->getFullName(); },
-               [&]() { llvm::errs() << " "; });
+    llvm::interleave(
+        gatherer.getDecls().begin(), gatherer.getDecls().end(),
+        [&](ValueDecl *value) { llvm::errs() << value->getFullName(); },
+        [&]() { llvm::errs() << " "; });
     llvm::errs() << "\n";
   }
 }

lib/AST/GenericSignature.cpp

@@ -29,13 +29,13 @@
 using namespace swift;
 
 void ConformanceAccessPath::print(raw_ostream &out) const {
-  interleave(begin(), end(),
-             [&](const Entry &entry) {
-               entry.first.print(out);
-               out << ": " << entry.second->getName();
-             }, [&] {
-               out << " -> ";
-             });
+  llvm::interleave(
+      begin(), end(),
+      [&](const Entry &entry) {
+        entry.first.print(out);
+        out << ": " << entry.second->getName();
+      },
+      [&] { out << " -> "; });
 }
 
 void ConformanceAccessPath::dump() const {

lib/AST/GenericSignatureBuilder.cpp

@@ -2139,16 +2139,16 @@ void EquivalenceClass::dump(llvm::raw_ostream &out,
              },
              [&] { out << ", "; });
   out << "\nSame-type constraints:";
-  interleave(sameTypeConstraints,
-             [&](const Constraint<Type> &constraint) {
-               out << "\n  " << constraint.getSubjectDependentType({ })
-                   << " == " << constraint.value;
-
-               if (constraint.source->isDerivedRequirement())
-                 out << " [derived]";
-             }, [&] {
-               out << ", ";
-             });
+  llvm::interleave(
+      sameTypeConstraints,
+      [&](const Constraint<Type> &constraint) {
+        out << "\n  " << constraint.getSubjectDependentType({})
+            << " == " << constraint.value;
+
+        if (constraint.source->isDerivedRequirement())
+          out << " [derived]";
+      },
+      [&] { out << ", "; });
   if (concreteType)
     out << "\nConcrete type: " << concreteType.getString();
   if (superclass)
@@ -2922,15 +2922,15 @@ void RewritePath::print(llvm::raw_ostream &out) const {
     if (!getPath().empty()) out << " -> ";
   }
 
-  interleave(getPath().begin(), getPath().end(),
-             [&](AssociatedTypeDecl *assocType) {
-               out.changeColor(raw_ostream::BLUE);
-               out << assocType->getProtocol()->getName() << "."
-               << assocType->getName();
-               out.resetColor();
-             }, [&] {
-               out << " -> ";
-             });
+  llvm::interleave(
+      getPath().begin(), getPath().end(),
+      [&](AssociatedTypeDecl *assocType) {
+        out.changeColor(raw_ostream::BLUE);
+        out << assocType->getProtocol()->getName() << "."
+            << assocType->getName();
+        out.resetColor();
+      },
+      [&] { out << " -> "; });
   out << "]";
 }
 

lib/AST/IndexSubset.cpp

@@ -80,8 +80,9 @@ IndexSubset *IndexSubset::extendingCapacity(
 
 void IndexSubset::print(llvm::raw_ostream &s) const {
   s << '{';
-  interleave(range(capacity), [this, &s](unsigned i) { s << contains(i); },
-             [&s] { s << ", "; });
+  llvm::interleave(
+      range(capacity), [this, &s](unsigned i) { s << contains(i); },
+      [&s] { s << ", "; });
   s << '}';
 }
 

lib/AST/Module.cpp

@@ -1479,9 +1479,9 @@ void
 ModuleDecl::ReverseFullNameIterator::printForward(raw_ostream &out,
                                                   StringRef delim) const {
   SmallVector<StringRef, 8> elements(*this, {});
-  swift::interleave(llvm::reverse(elements),
-                    [&out](StringRef next) { out << next; },
-                    [&out, delim] { out << delim; });
+  llvm::interleave(
+      llvm::reverse(elements), [&out](StringRef next) { out << next; },
+      [&out, delim] { out << delim; });
 }
 
 void

lib/ClangImporter/ClangImporter.cpp

@@ -928,9 +928,9 @@ ClangImporter::create(ASTContext &ctx, const ClangImporterOptions &importerOpts,
 
   if (importerOpts.DumpClangDiagnostics) {
     llvm::errs() << "'";
-    interleave(invocationArgStrs,
-               [](StringRef arg) { llvm::errs() << arg; },
-               [] { llvm::errs() << "' '"; });
+    llvm::interleave(
+        invocationArgStrs, [](StringRef arg) { llvm::errs() << arg; },
+        [] { llvm::errs() << "' '"; });
     llvm::errs() << "'\n";
   }
 

lib/ClangImporter/SwiftLookupTable.cpp

@@ -973,37 +973,32 @@ void SwiftLookupTable::dump(raw_ostream &os) const {
       printStoredContext(entry.Context, os);
       os << ": ";
 
-      interleave(entry.DeclsOrMacros.begin(), entry.DeclsOrMacros.end(),
-                 [this, &os](uint64_t entry) {
-                   printStoredEntry(this, entry, os);
-                 },
-                 [&os] {
-                   os << ", ";
-                 });
+      llvm::interleave(
+          entry.DeclsOrMacros.begin(), entry.DeclsOrMacros.end(),
+          [this, &os](uint64_t entry) { printStoredEntry(this, entry, os); },
+          [&os] { os << ", "; });
       os << "\n";
     }
   }
 
   if (!Categories.empty()) {
     os << "Categories: ";
-    interleave(Categories.begin(), Categories.end(),
-               [&os](clang::ObjCCategoryDecl *category) {
-                 os << category->getClassInterface()->getName()
-                    << "(" << category->getName() << ")";
-               },
-               [&os] {
-                 os << ", ";
-               });
+    llvm::interleave(
+        Categories.begin(), Categories.end(),
+        [&os](clang::ObjCCategoryDecl *category) {
+          os << category->getClassInterface()->getName() << "("
+             << category->getName() << ")";
+        },
+        [&os] { os << ", "; });
     os << "\n";
   } else if (Reader && !Reader->categories().empty()) {
     os << "Categories: ";
-    interleave(Reader->categories().begin(), Reader->categories().end(),
-               [&os](clang::serialization::DeclID declID) {
-                 os << "decl ID #" << declID;
-               },
-               [&os] {
-                 os << ", ";
-               });
+    llvm::interleave(
+        Reader->categories().begin(), Reader->categories().end(),
+        [&os](clang::serialization::DeclID declID) {
+          os << "decl ID #" << declID;
+        },
+        [&os] { os << ", "; });
     os << "\n";
   }
 
@@ -1020,13 +1015,10 @@ void SwiftLookupTable::dump(raw_ostream &os) const {
       os << ": ";
 
       const auto &entries = GlobalsAsMembersIndex.find(context)->second;
-      interleave(entries.begin(), entries.end(),
-                 [this, &os](uint64_t entry) {
-                   printStoredEntry(this, entry, os);
-                 },
-                 [&os] {
-                   os << ", ";
-                 });
+      llvm::interleave(
+          entries.begin(), entries.end(),
+          [this, &os](uint64_t entry) { printStoredEntry(this, entry, os); },
+          [&os] { os << ", "; });
       os << "\n";
     }
   }

lib/Demangling/NodePrinter.cpp

@@ -706,29 +706,29 @@ class NodePrinter {
     bool hasLabels = LabelList && LabelList->getNumChildren() > 0;
 
     Printer << '(';
-    interleave(Parameters->begin(), Parameters->end(),
-               [&](NodePointer Param) {
-                 assert(Param->getKind() == Node::Kind::TupleElement);
-
-                 if (hasLabels) {
-                   Printer << getLabelFor(Param, ParamIndex) << ':';
-                 } else if (!showTypes) {
-                   if (auto Label = getChildIf(Param,
-                                               Node::Kind::TupleElementName))
-                     Printer << Label->getText() << ":";
-                   else
-                     Printer << "_:";
-                 }
-
-                 if (hasLabels && showTypes)
-                   Printer << ' ';
-
-                 ++ParamIndex;
-
-                 if (showTypes)
-                   print(Param);
-               },
-               [&]() { Printer << (showTypes ? ", " : ""); });
+    llvm::interleave(
+        Parameters->begin(), Parameters->end(),
+        [&](NodePointer Param) {
+          assert(Param->getKind() == Node::Kind::TupleElement);
+
+          if (hasLabels) {
+            Printer << getLabelFor(Param, ParamIndex) << ':';
+          } else if (!showTypes) {
+            if (auto Label = getChildIf(Param, Node::Kind::TupleElementName))
+              Printer << Label->getText() << ":";
+            else
+              Printer << "_:";
+          }
+
+          if (hasLabels && showTypes)
+            Printer << ' ';
+
+          ++ParamIndex;
+
+          if (showTypes)
+            print(Param);
+        },
+        [&]() { Printer << (showTypes ? ", " : ""); });
     Printer << ')';
   }
 

lib/Driver/Driver.cpp

@@ -2844,15 +2844,16 @@ Job *Driver::buildJobsForAction(Compilation &C, const JobAction *JA,
       << "\" - \"" << llvm::sys::path::filename(J->getExecutable())
       << "\", inputs: [";
 
-    interleave(InputActions.begin(), InputActions.end(),
-               [](const Action *A) {
-                 auto Input = cast<InputAction>(A);
-                 llvm::outs() << '"' << Input->getInputArg().getValue() << '"';
-               },
-               [] { llvm::outs() << ", "; });
+    llvm::interleave(
+        InputActions.begin(), InputActions.end(),
+        [](const Action *A) {
+          auto Input = cast<InputAction>(A);
+          llvm::outs() << '"' << Input->getInputArg().getValue() << '"';
+        },
+        [] { llvm::outs() << ", "; });
     if (!InputActions.empty() && !J->getInputs().empty())
       llvm::outs() << ", ";
-    interleave(
+    llvm::interleave(
         J->getInputs().begin(), J->getInputs().end(),
         [](const Job *Input) {
           auto FileNames = Input->getOutput().getPrimaryOutputFilenames();
@@ -3305,9 +3306,10 @@ static unsigned printActions(const Action *A,
     os << "\"" << IA->getInputArg().getValue() << "\"";
   } else {
     os << "{";
-    interleave(*cast<JobAction>(A),
-               [&](const Action *Input) { os << printActions(Input, Ids); },
-               [&] { os << ", "; });
+    llvm::interleave(
+        *cast<JobAction>(A),
+        [&](const Action *Input) { os << printActions(Input, Ids); },
+        [&] { os << ", "; });
     os << "}";
   }