[NFC] clang-format the patch

Reformatting everything now that we have `llvm` namespaces. I've
separated this from the main commit to help manage merge-conflicts and
for making it a bit easier to read the mega-patch.

Author: etcwilde

include/swift/APIDigester/ModuleAnalyzerNodes.h

@@ -180,6 +180,7 @@ class SDKContext {
   std::vector<BreakingAttributeInfo> BreakingAttrs;
   // The common version of two ABI/API descriptors under comparison.
   llvm::Optional<uint8_t> CommonVersion;
+
 public:
   // Define the set of known identifiers.
 #define IDENTIFIER_WITH_NAME(Name, IdStr) StringRef Id_##Name = IdStr;
@@ -586,11 +587,11 @@ class SDKNodeDeclType: public SDKNodeDecl {
     return InheritsConvenienceInitializers;
   };
 
-  llvm::Optional<SDKNodeDeclType*> getSuperclass() const;
+  llvm::Optional<SDKNodeDeclType *> getSuperclass() const;
 
   /// Finding the node through all children, including the inherited ones,
   /// whose printed name matches with the given name.
-  llvm::Optional<SDKNodeDecl*> lookupChildByPrintedName(StringRef Name) const;
+  llvm::Optional<SDKNodeDecl *> lookupChildByPrintedName(StringRef Name) const;
   SDKNodeType *getRawValueType() const;
   bool isConformingTo(KnownProtocolKind Kind) const;
   void jsonize(json::Output &out) override;

include/swift/AST/ASTContext.h

@@ -797,9 +797,9 @@ class ASTContext final {
   ///
   /// SIL analog of \c ASTContext::getClangFunctionType .
   const clang::Type *
-  getCanonicalClangFunctionType(
-    ArrayRef<SILParameterInfo> params, llvm::Optional<SILResultInfo> result,
-    SILFunctionType::Representation trueRep);
+  getCanonicalClangFunctionType(ArrayRef<SILParameterInfo> params,
+                                llvm::Optional<SILResultInfo> result,
+                                SILFunctionType::Representation trueRep);
 
   /// Instantiates "Impl.Converter" if needed, then translate Swift generic
   /// substitutions to equivalent C++ types using \p templateParams and \p
@@ -1020,25 +1020,24 @@ class ASTContext final {
 
   /// Retrieve the module dependencies for the module with the given name.
   ///
-  llvm::Optional<const ModuleDependencyInfo*> getModuleDependencies(
-      StringRef moduleName,
-      ModuleDependenciesCache &cache,
+  llvm::Optional<const ModuleDependencyInfo *> getModuleDependencies(
+      StringRef moduleName, ModuleDependenciesCache &cache,
       InterfaceSubContextDelegate &delegate,
-      bool optionalDependencyLookup = false,
-      bool isTestableImport = false,
-      llvm::Optional<std::pair<std::string, swift::ModuleDependencyKind>> dependencyOf = llvm::None);
+      bool optionalDependencyLookup = false, bool isTestableImport = false,
+      llvm::Optional<std::pair<std::string, swift::ModuleDependencyKind>>
+          dependencyOf = llvm::None);
 
   /// Retrieve the module dependencies for the Clang module with the given name.
-  llvm::Optional<const ModuleDependencyInfo*> getClangModuleDependencies(
-      StringRef moduleName,
-      ModuleDependenciesCache &cache,
-      InterfaceSubContextDelegate &delegate);
+  llvm::Optional<const ModuleDependencyInfo *>
+  getClangModuleDependencies(StringRef moduleName,
+                             ModuleDependenciesCache &cache,
+                             InterfaceSubContextDelegate &delegate);
 
   /// Retrieve the module dependencies for the Swift module with the given name.
-  llvm::Optional<const ModuleDependencyInfo*> getSwiftModuleDependencies(
-      StringRef moduleName,
-      ModuleDependenciesCache &cache,
-      InterfaceSubContextDelegate &delegate);
+  llvm::Optional<const ModuleDependencyInfo *>
+  getSwiftModuleDependencies(StringRef moduleName,
+                             ModuleDependenciesCache &cache,
+                             InterfaceSubContextDelegate &delegate);
 
   /// Compute the extra implicit framework search paths on Apple platforms:
   /// $SDKROOT/System/Library/Frameworks/ and $SDKROOT/Library/Frameworks/.

include/swift/AST/ASTDemangler.h

@@ -22,13 +22,13 @@
 #ifndef SWIFT_AST_ASTDEMANGLER_H
 #define SWIFT_AST_ASTDEMANGLER_H
 
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Optional.h"
 #include "swift/AST/Types.h"
 #include "swift/Demangling/Demangler.h"
 #include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Demangling/TypeDecoder.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/Optional.h"
+#include "llvm/ADT/StringRef.h"
 
 namespace swift {
 
@@ -138,11 +138,11 @@ class ASTBuilder {
       FunctionMetadataDifferentiabilityKind diffKind, Type globalActor);
 
   Type createImplFunctionType(
-    Demangle::ImplParameterConvention calleeConvention,
-    ArrayRef<Demangle::ImplFunctionParam<Type>> params,
-    ArrayRef<Demangle::ImplFunctionResult<Type>> results,
-    llvm::Optional<Demangle::ImplFunctionResult<Type>> errorResult,
-    ImplFunctionTypeFlags flags);
+      Demangle::ImplParameterConvention calleeConvention,
+      ArrayRef<Demangle::ImplFunctionParam<Type>> params,
+      ArrayRef<Demangle::ImplFunctionResult<Type>> results,
+      llvm::Optional<Demangle::ImplFunctionResult<Type>> errorResult,
+      ImplFunctionTypeFlags flags);
 
   Type createProtocolCompositionType(ArrayRef<ProtocolDecl *> protocols,
                                      Type superclass,
@@ -157,11 +157,13 @@ class ASTBuilder {
   Type createSymbolicExtendedExistentialType(NodePointer shapeNode,
                                              ArrayRef<Type> genArgs);
 
-  Type createExistentialMetatypeType(Type instance,
-                     llvm::Optional<Demangle::ImplMetatypeRepresentation> repr=llvm::None);
+  Type createExistentialMetatypeType(
+      Type instance,
+      llvm::Optional<Demangle::ImplMetatypeRepresentation> repr = llvm::None);
 
-  Type createMetatypeType(Type instance,
-                     llvm::Optional<Demangle::ImplMetatypeRepresentation> repr=llvm::None);
+  Type createMetatypeType(
+      Type instance,
+      llvm::Optional<Demangle::ImplMetatypeRepresentation> repr = llvm::None);
 
   Type createGenericTypeParameterType(unsigned depth, unsigned index);
 
@@ -237,8 +239,7 @@ class ASTBuilder {
     SynthesizedByImporter
   };
 
-  llvm::Optional<ForeignModuleKind>
-  getForeignModuleKind(NodePointer node);
+  llvm::Optional<ForeignModuleKind> getForeignModuleKind(NodePointer node);
 
   GenericTypeDecl *findTypeDecl(DeclContext *dc,
                                 Identifier name,

include/swift/AST/ASTMangler.h

@@ -13,10 +13,10 @@
 #ifndef SWIFT_AST_ASTMANGLER_H
 #define SWIFT_AST_ASTMANGLER_H
 
-#include "swift/Basic/Mangler.h"
-#include "swift/AST/Types.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/FreestandingMacroExpansion.h"
+#include "swift/AST/Types.h"
+#include "swift/Basic/Mangler.h"
 #include "swift/Basic/TaggedUnion.h"
 #include "llvm/ADT/Optional.h"
 
@@ -252,12 +252,10 @@ class ASTMangler : public Mangler {
   ///
   /// - If `predefined` is true, this mangles the symbol name of the completion handler
   /// predefined in the Swift runtime for the given type signature.
-  std::string mangleObjCAsyncCompletionHandlerImpl(CanSILFunctionType BlockType,
-                                                   CanType ResultType,
-                                                   CanGenericSignature Sig,
-                                                   llvm::Optional<bool> FlagParamIsZeroOnError,
-                                                   bool predefined);
-  
+  std::string mangleObjCAsyncCompletionHandlerImpl(
+      CanSILFunctionType BlockType, CanType ResultType, CanGenericSignature Sig,
+      llvm::Optional<bool> FlagParamIsZeroOnError, bool predefined);
+
   /// Mangle the derivative function (JVP/VJP), or optionally its vtable entry
   /// thunk, for the given:
   /// - Mangled original function declaration.
@@ -381,7 +379,7 @@ class ASTMangler : public Mangler {
     ObjCContext,
     ClangImporterContext,
   };
-  
+
   static llvm::Optional<SpecialContext>
   getSpecialManglingContext(const ValueDecl *decl, bool useObjCProtocolNames);
 

include/swift/AST/ASTPrinter.h

@@ -133,7 +133,8 @@ class ASTPrinter {
   /// Called before printing of a declaration.
   ///
   /// Callers should use callPrintDeclPre().
-  virtual void printDeclPre(const Decl *D, llvm::Optional<BracketOptions> Bracket) {}
+  virtual void printDeclPre(const Decl *D,
+                            llvm::Optional<BracketOptions> Bracket) {}
   /// Called before printing at the point which would be considered the location
   /// of the declaration (normally the name of the declaration).
   ///
@@ -147,7 +148,8 @@ class ASTPrinter {
   /// Called after finishing printing of a declaration.
   ///
   /// Callers should use callPrintDeclPost().
-  virtual void printDeclPost(const Decl *D, llvm::Optional<BracketOptions> Bracket) {}
+  virtual void printDeclPost(const Decl *D,
+                             llvm::Optional<BracketOptions> Bracket) {}
 
   /// Called before printing the result type of the declaration. Printer can
   /// replace \p TL to customize the input.
@@ -174,15 +176,15 @@ class ASTPrinter {
   virtual void printModuleRef(ModuleEntity Mod, Identifier Name);
 
   /// Called before printing a synthesized extension.
-  virtual void printSynthesizedExtensionPre(const ExtensionDecl *ED,
-                                            TypeOrExtensionDecl NTD,
-                                            llvm::Optional<BracketOptions> Bracket) {}
+  virtual void
+  printSynthesizedExtensionPre(const ExtensionDecl *ED, TypeOrExtensionDecl NTD,
+                               llvm::Optional<BracketOptions> Bracket) {}
 
   /// Called after printing a synthesized extension.
-  virtual void printSynthesizedExtensionPost(const ExtensionDecl *ED,
-                                             TypeOrExtensionDecl TargetDecl,
-                                             llvm::Optional<BracketOptions> Bracket) {
-  }
+  virtual void
+  printSynthesizedExtensionPost(const ExtensionDecl *ED,
+                                TypeOrExtensionDecl TargetDecl,
+                                llvm::Optional<BracketOptions> Bracket) {}
 
   /// Called before printing a structured entity.
   ///
@@ -307,7 +309,8 @@ class ASTPrinter {
   void callPrintDeclPre(const Decl *D, llvm::Optional<BracketOptions> Bracket);
 
   /// Make a callback to printDeclPost(), performing any necessary bookkeeping.
-  void callPrintDeclPost(const Decl *D, llvm::Optional<BracketOptions> Bracket) {
+  void callPrintDeclPost(const Decl *D,
+                         llvm::Optional<BracketOptions> Bracket) {
     printDeclPost(D, Bracket);
   }
 

include/swift/AST/ASTScope.h

@@ -36,10 +36,10 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/NullablePtr.h"
 #include "swift/Basic/SourceManager.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Optional.h"
 
 /// In case there's a bug in the ASTScope lookup system, suggest that the user
 /// try disabling it.

include/swift/AST/ASTWalker.h

@@ -53,13 +53,12 @@ struct ReferenceMetaData {
   /// When non-none, this is a custom attribute reference.
   llvm::Optional<std::pair<const CustomAttr *, Decl *>> CustomAttrRef;
 
-  ReferenceMetaData(
-      SemaReferenceKind Kind, llvm::Optional<AccessKind> AccKind,
-      bool isImplicit = false,
-      llvm::Optional<std::pair<const CustomAttr *, Decl *>> customAttrRef
-        = llvm::None
-  ) : Kind(Kind), AccKind(AccKind), isImplicit(isImplicit),
-      CustomAttrRef(customAttrRef) {}
+  ReferenceMetaData(SemaReferenceKind Kind, llvm::Optional<AccessKind> AccKind,
+                    bool isImplicit = false,
+                    llvm::Optional<std::pair<const CustomAttr *, Decl *>>
+                        customAttrRef = llvm::None)
+      : Kind(Kind), AccKind(AccKind), isImplicit(isImplicit),
+        CustomAttrRef(customAttrRef) {}
 };
 
 /// Specifies how the initialization expression of a \c lazy variable should be

include/swift/AST/AbstractSourceFileDepGraphFactory.h

@@ -91,9 +91,9 @@ class AbstractSourceFileDepGraphFactory {
 
   /// Add an external dependency node to the graph. If the provided fingerprint
   /// is not \c None, it is added to the def key.
-  void addAnExternalDependency(const DependencyKey &def,
-                               const DependencyKey &use,
-                               llvm::Optional<Fingerprint> dependencyFingerprint);
+  void
+  addAnExternalDependency(const DependencyKey &def, const DependencyKey &use,
+                          llvm::Optional<Fingerprint> dependencyFingerprint);
 
   static llvm::Optional<Fingerprint>
   getFingerprintIfAny(std::pair<const NominalTypeDecl *, const ValueDecl *>) {

include/swift/AST/AccessNotes.h

@@ -21,10 +21,10 @@
 #include "swift/AST/Identifier.h"
 #include "swift/AST/StorageImpl.h"
 #include "swift/Basic/NullablePtr.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/ADT/Optional.h"
 #include <set>
 #include <string>
 #include <vector>

include/swift/AST/AccessScope.h

@@ -16,9 +16,9 @@
 #include "swift/AST/AttrKind.h"
 #include "swift/AST/DeclContext.h"
 #include "swift/Basic/Debug.h"
-#include "llvm/ADT/PointerIntPair.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/None.h"
+#include "llvm/ADT/Optional.h"
+#include "llvm/ADT/PointerIntPair.h"
 
 namespace swift {
 
@@ -134,7 +134,8 @@ class AccessScope {
 
   /// Returns the narrowest access scope if this and the specified access scope
   /// have common intersection, or None if scopes don't intersect.
-  const llvm::Optional<AccessScope> intersectWith(AccessScope accessScope) const {
+  const llvm::Optional<AccessScope>
+  intersectWith(AccessScope accessScope) const {
     if (hasEqualDeclContextWith(accessScope)) {
       if (isPrivate())
         return *this;