Remove include order dependency

Author: David Ungar

include/swift/AST/ASTScope.h

@@ -30,9 +30,7 @@
 
 #include "swift/AST/ASTNode.h"
 #include "swift/AST/NameLookup.h" // for DeclVisibilityKind
-// extractNearestSourceLoc, simple_display declarations must come before this
-// Alternatively, declare these in SimpleDisplay.h or elsewhere
-//#include "swift/AST/SimpleRequest.h"
+#include "swift/AST/SimpleRequest.h"
 #include "swift/Basic/Compiler.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/NullablePtr.h"
@@ -93,11 +91,13 @@ struct AnnotatedInsertionPoint {
 };
 } // namespace ast_scope
 
-SourceLoc extractNearestSourceLoc(
-    std::tuple<ast_scope::ASTScopeImpl *, ast_scope::ScopeCreator *>);
-
 namespace ast_scope {
 
+void simple_display(llvm::raw_ostream &out, const ASTScopeImpl *);
+void simple_display(llvm::raw_ostream &out, const ScopeCreator *);
+
+SourceLoc extractNearestSourceLoc(std::tuple<ASTScopeImpl *, ScopeCreator *>);
+
 #pragma mark the root ASTScopeImpl class
 
 /// Describes a lexical scope within a source file.

include/swift/Basic/SimpleDisplay.h

@@ -54,13 +54,6 @@ namespace swift {
 
 #undef HAS_TRIVIAL_DISPLAY
 
-  namespace ast_scope {
-  class ASTScopeImpl;
-  class ScopeCreator;
-  } // namespace ast_scope
-  void simple_display(llvm::raw_ostream &out, const ast_scope::ASTScopeImpl *);
-  void simple_display(llvm::raw_ostream &out, const ast_scope::ScopeCreator *);
-
   template<typename T>
   typename std::enable_if<HasTrivialDisplay<T>::value>::type
   simple_display(llvm::raw_ostream &out, const T &value) {

lib/AST/ASTScopeCreation.cpp

@@ -2088,7 +2088,7 @@ bool ASTSourceFileScope::crossCheckWithAST() {
   return scopeCreator->containsAllDeclContextsFromAST();
 }
 
-void swift::simple_display(llvm::raw_ostream &out,
-                           const ast_scope::ScopeCreator *scopeCreator) {
+void ast_scope::simple_display(llvm::raw_ostream &out,
+                               const ScopeCreator *scopeCreator) {
   scopeCreator->print(out);
 }

lib/AST/ASTScopePrinting.cpp

@@ -202,7 +202,7 @@ bool IterableTypeScope::doesDeclHaveABody() const {
   return getBraces().Start != getBraces().End;
 }
 
-void swift::simple_display(llvm::raw_ostream &out,
-                           const ast_scope::ASTScopeImpl *scope) {
+void ast_scope::simple_display(llvm::raw_ostream &out,
+                               const ASTScopeImpl *scope) {
   scope->print(out);
 }

lib/AST/ASTScopeSourceRange.cpp

@@ -757,7 +757,7 @@ SourceLoc getLocAfterExtendedNominal(const ExtensionDecl *const ext) {
       .getEnd();
 }
 
-SourceLoc swift::extractNearestSourceLoc(
+SourceLoc ast_scope::extractNearestSourceLoc(
     std::tuple<ASTScopeImpl *, ScopeCreator *> scopeAndCreator) {
   const ASTScopeImpl *scope = std::get<0>(scopeAndCreator);
   return scope->getSourceRangeOfThisASTNode().Start;