Code review feedback from @davidungar

Author: slavapestov

include/swift/AST/SourceFile.h

@@ -236,9 +236,7 @@ class SourceFile final : public FileUnit {
   }
 
   /// Add a hoisted declaration. See Decl::isHoisted().
-  void addHoistedDecl(Decl *d) {
-    Hoisted.push_back(d);
-  }
+  void addHoistedDecl(Decl *d);
 
   /// Retrieves an immutable view of the list of top-level decls in this file.
   ArrayRef<Decl *> getTopLevelDecls() const;

lib/AST/Module.cpp

@@ -2337,6 +2337,12 @@ bool SourceFile::hasDelayedBodyParsing() const {
   return true;
 }
 
+/// Add a hoisted declaration. See Decl::isHoisted().
+void SourceFile::addHoistedDecl(Decl *d) {
+  assert(d->isHoisted());
+  Hoisted.push_back(d);
+}
+
 ArrayRef<Decl *> SourceFile::getTopLevelDecls() const {
   auto &ctx = getASTContext();
   auto *mutableThis = const_cast<SourceFile *>(this);

lib/Parse/ParseDecl.cpp

@@ -104,30 +104,24 @@ namespace {
     template <typename T>
     ParserResult<T>
     fixupParserResult(T *D) {
-      if (movedToTopLevel()) {
-        D->setHoisted();
-        SF->addHoistedDecl(D);
-        getDebuggerClient()->didGlobalize(D);
-      }
+      if (movedToTopLevel())
+        hoistDecl(D);
       return ParserResult<T>(D);
     }
 
     template <typename T>
     ParserResult<T>
     fixupParserResult(ParserStatus Status, T *D) {
-      if (movedToTopLevel()) {
-        D->setHoisted();
-        SF->addHoistedDecl(D);
-        getDebuggerClient()->didGlobalize(D);
-      }
+      if (movedToTopLevel())
+        hoistDecl(D);
       return makeParserResult(Status, D);
     }
 
     // The destructor doesn't need to do anything, the CC's destructor will
     // pop the context if we set it.
     ~DebuggerContextChange () {}
-  protected:
-  
+
+  private:
     DebuggerClient *getDebuggerClient() {
       ModuleDecl *M = P.CurDeclContext->getParentModule();
       return M->getDebugClient();
@@ -152,6 +146,13 @@ namespace {
       SF = P.CurDeclContext->getParentSourceFile();
       CC.emplace(P, SF);
     }
+
+    template<typename T>
+    void hoistDecl(T *D) {
+      D->setHoisted();
+      SF->addHoistedDecl(D);
+      getDebuggerClient()->didGlobalize(D);
+    }
   };
 } // end anonymous namespace