Merge pull request #8482 from nkcsgexi/revert-index

Author: swift-ci

include/swift/Index/Index.h

@@ -25,7 +25,7 @@ void indexSourceFile(SourceFile *SF, StringRef hash,
                      IndexDataConsumer &consumer);
 void indexModule(ModuleDecl *module, StringRef hash,
                  IndexDataConsumer &consumer);
-bool shouldIndex(ValueDecl *D, bool IsRef);
+
 } // end namespace index
 } // end namespace swift
 

lib/Index/Index.cpp

@@ -403,6 +403,17 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
     return SrcMgr.getLineAndColumn(Loc, BufferID);
   }
 
+  bool shouldIndex(ValueDecl *D, bool IsRef) const {
+    if (D->isImplicit())
+      return false;
+    if (isLocalSymbol(D) && (!isa<ParamDecl>(D) || IsRef))
+      return false;
+    if (D->isPrivateStdlibDecl())
+      return false;
+
+    return true;
+  }
+
   void getModuleHash(SourceFileOrModule SFOrMod, llvm::raw_ostream &OS);
   llvm::hash_code hashModule(llvm::hash_code code, SourceFileOrModule SFOrMod);
   llvm::hash_code hashFileReference(llvm::hash_code code,
@@ -1249,13 +1260,3 @@ void index::indexModule(ModuleDecl *module, StringRef hash,
   walker.visitModule(*module, hash);
   consumer.finish();
 }
-
-bool index::shouldIndex(ValueDecl *D, bool IsRef) {
-  if (D->isImplicit())
-    return false;
-  if (isLocalSymbol(D) && (!isa<ParamDecl>(D) || IsRef))
-    return false;
-  if (D->isPrivateStdlibDecl())
-    return false;
-  return true;
-}