---

yaml
---
r: 278447
b: refs/heads/swift-5.1-old-llvm-branch
c: cd48cd6
h: refs/heads/master
i:
  278445: bcbc72d
  278443: f59f800
  278439: da50a4c
  278431: f6b73dc

Author: davidungar

[refs]

@@ -1241,7 +1241,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-01-24-a: b6f62823aa5010b2ae53f15f72a57
 refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e0
 refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
 refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
-refs/heads/swift-5.1-old-llvm-branch: 1595efe5e2dc5891aa617f4972c9c2f72d58346c
+refs/heads/swift-5.1-old-llvm-branch: cd48cd6eb35a7700b47cbb7d194bc3733f05c601
 refs/heads/swift-5.1-branch: 8060872acb4105d9655e020fe047e1ebcd77d0fb
 refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e

branches/swift-5.1-old-llvm-branch/include/swift/AST/NameLookup.h

@@ -445,28 +445,28 @@ void lookupInModule(ModuleDecl *module, ModuleDecl::AccessPathTy accessPath,
                     LazyResolver *typeResolver,
                     const DeclContext *moduleScopeContext,
                     ArrayRef<ModuleDecl::ImportedModule> extraImports = {});
-  
-  template <typename Fn>
-  void forAllVisibleModules(const DeclContext *DC, const Fn &fn) {
-    DeclContext *moduleScope = DC->getModuleScopeContext();
-    if (auto file = dyn_cast<FileUnit>(moduleScope))
-      file->forAllVisibleModules(fn);
-    else
-      cast<ModuleDecl>(moduleScope)->forAllVisibleModules(ModuleDecl::AccessPathTy(), fn);
-  }
-  
-  /// Only name lookup has gathered a set of results, perform any necessary
-  /// steps to prune the result set before returning it to the caller.
-  bool finishLookup(const DeclContext *dc, NLOptions options,
-                                SmallVectorImpl<ValueDecl *> &decls);
-  
-  template <typename Result>
-  void filterForDiscriminator(SmallVectorImpl<Result> &results,
-                              DebuggerClient *debugClient);
-  
-  void recordLookupOfTopLevelName(DeclContext *topLevelContext,
-                                  DeclName name,
-                                  bool isCascading);
+
+template <typename Fn>
+void forAllVisibleModules(const DeclContext *DC, const Fn &fn) {
+  DeclContext *moduleScope = DC->getModuleScopeContext();
+  if (auto file = dyn_cast<FileUnit>(moduleScope))
+    file->forAllVisibleModules(fn);
+  else
+    cast<ModuleDecl>(moduleScope)
+        ->forAllVisibleModules(ModuleDecl::AccessPathTy(), fn);
+}
+
+/// Only name lookup has gathered a set of results, perform any necessary
+/// steps to prune the result set before returning it to the caller.
+bool finishLookup(const DeclContext *dc, NLOptions options,
+                  SmallVectorImpl<ValueDecl *> &decls);
+
+template <typename Result>
+void filterForDiscriminator(SmallVectorImpl<Result> &results,
+                            DebuggerClient *debugClient);
+
+void recordLookupOfTopLevelName(DeclContext *topLevelContext, DeclName name,
+                                bool isCascading);
 
 } // end namespace namelookup
 

branches/swift-5.1-old-llvm-branch/lib/AST/NameLookup.cpp

@@ -513,7 +513,7 @@ matchDiscriminator(Identifier discriminator,
 
 template <typename Result>
 void namelookup::filterForDiscriminator(SmallVectorImpl<Result> &results,
-                                   DebuggerClient *debugClient) {
+                                        DebuggerClient *debugClient) {
   Identifier discriminator = debugClient->getPreferredPrivateDiscriminator();
   if (discriminator.empty())
     return;
@@ -537,16 +537,11 @@ void namelookup::filterForDiscriminator(SmallVectorImpl<Result> &results,
   results.push_back(lastMatch);
 }
 
-template
-void namelookup::filterForDiscriminator<LookupResultEntry>
-(SmallVectorImpl<LookupResultEntry> &results,
- DebuggerClient *debugClient);
-
-
+template void namelookup::filterForDiscriminator<LookupResultEntry>(
+    SmallVectorImpl<LookupResultEntry> &results, DebuggerClient *debugClient);
 
 void namelookup::recordLookupOfTopLevelName(DeclContext *topLevelContext,
-                                       DeclName name,
-                                       bool isCascading) {
+                                            DeclName name, bool isCascading) {
   auto SF = dyn_cast<SourceFile>(topLevelContext);
   if (!SF)
     return;
@@ -1378,7 +1373,7 @@ static bool isAcceptableLookupResult(const DeclContext *dc,
 }
 
 bool namelookup::finishLookup(const DeclContext *dc, NLOptions options,
-                         SmallVectorImpl<ValueDecl *> &decls) {
+                              SmallVectorImpl<ValueDecl *> &decls) {
   // If we're supposed to remove overridden declarations, do so now.
   if (options & NL_RemoveOverridden)
     removeOverriddenDecls(decls);