Index the selectors and provide the translation units that contain them

through the IndexProvider.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77543 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Index/IndexProvider.h b/include/clang/Index/IndexProvider.h
index f69945eb2b4e1c10516b4efdae30a86f5ae2b6be..187dd9393cbb9f114727cefe91f8c4f63cc73f19 100644 (file)
--- a/include/clang/Index/IndexProvider.h
+++ b/include/clang/Index/IndexProvider.h
@@ -19,6 +19,7 @@ namespace clang {
 namespace idx {
   class Entity;
   class TranslationUnitHandler;
+  class GlobalSelector;
 
 /// \brief Maps information to TranslationUnits.
 class IndexProvider {
@@ -26,6 +27,8 @@ public:
   virtual ~IndexProvider();
   virtual void GetTranslationUnitsFor(Entity Ent,
                                       TranslationUnitHandler &Handler) = 0;
+  virtual void GetTranslationUnitsFor(GlobalSelector Sel,
+                                      TranslationUnitHandler &Handler) = 0;
 };
 
 } // namespace idx

diff --git a/include/clang/Index/Indexer.h b/include/clang/Index/Indexer.h
index 4fa36160649c51353ce8d62069d13f0955a3a5de..98cce9e44ba4b2667b6a92640ff1ccdb79539717 100644 (file)
--- a/include/clang/Index/Indexer.h
+++ b/include/clang/Index/Indexer.h
@@ -15,6 +15,8 @@
 #define LLVM_CLANG_INDEX_INDEXER_H
 
 #include "clang/Index/IndexProvider.h"
+#include "clang/Index/Entity.h"
+#include "clang/Index/GlobalSelector.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/DenseMap.h"
 #include <map>
@@ -32,6 +34,7 @@ public:
   typedef llvm::SmallPtrSet<TranslationUnit *, 4> TUSetTy;
   typedef llvm::DenseMap<ASTContext *, TranslationUnit *> CtxTUMapTy;
   typedef std::map<Entity, TUSetTy> MapTy;
+  typedef std::map<GlobalSelector, TUSetTy> SelMapTy;
 
   explicit Indexer(Program &prog) : Prog(prog) { }
 
@@ -42,11 +45,14 @@ public:
 
   virtual void GetTranslationUnitsFor(Entity Ent,
                                       TranslationUnitHandler &Handler);
+  virtual void GetTranslationUnitsFor(GlobalSelector Sel,
+                                      TranslationUnitHandler &Handler);
 
 private:
   Program &Prog;
   MapTy Map;
   CtxTUMapTy CtxTUMap;
+  SelMapTy SelMap;
 };
 
 } // namespace idx

diff --git a/lib/Index/Indexer.cpp b/lib/Index/Indexer.cpp
index ddc22f7fbc02756264c621cfc760320974e23bcb..75dfbd584cc47a393a9d6a1d4a428d00014fd3d5 100644 (file)
--- a/lib/Index/Indexer.cpp
+++ b/lib/Index/Indexer.cpp
@@ -13,9 +13,9 @@
 
 #include "clang/Index/Indexer.h"
 #include "clang/Index/Program.h"
-#include "clang/Index/Entity.h"
 #include "clang/Index/Handlers.h"
 #include "clang/Index/TranslationUnit.h"
+#include "ASTVisitor.h"
 #include "clang/AST/DeclBase.h"
 using namespace clang;
 using namespace idx;
@@ -36,13 +36,37 @@ public:
   }
 };
 
+class SelectorIndexer : public ASTVisitor<SelectorIndexer> {
+  Program &Prog;
+  TranslationUnit *TU;
+  Indexer::SelMapTy &Map;
+
+public:
+  SelectorIndexer(Program &prog, TranslationUnit *tu, Indexer::SelMapTy &map)
+    : Prog(prog), TU(tu), Map(map) { }
+
+  void VisitObjCMethodDecl(ObjCMethodDecl *D) {
+    Map[GlobalSelector::get(D->getSelector(), Prog)].insert(TU);
+    Base::VisitObjCMethodDecl(D);
+  }
+
+  void VisitObjCMessageExpr(ObjCMessageExpr *Node) {
+    Map[GlobalSelector::get(Node->getSelector(), Prog)].insert(TU);
+    Base::VisitObjCMessageExpr(Node);
+  }
+};
+
 } // anonymous namespace
 
 void Indexer::IndexAST(TranslationUnit *TU) {
   assert(TU && "Passed null TranslationUnit");
-  CtxTUMap[&TU->getASTContext()] = TU;
+  ASTContext &Ctx = TU->getASTContext();
+  CtxTUMap[&Ctx] = TU;
   EntityIndexer Idx(TU, Map);
-  Prog.FindEntities(TU->getASTContext(), Idx);
+  Prog.FindEntities(Ctx, Idx);
+  
+  SelectorIndexer SelIdx(Prog, TU, SelMap);
+  SelIdx.Visit(Ctx.getTranslationUnitDecl());
 }
 
 void Indexer::GetTranslationUnitsFor(Entity Ent,
@@ -65,3 +89,16 @@ void Indexer::GetTranslationUnitsFor(Entity Ent,
   for (TUSetTy::iterator I = Set.begin(), E = Set.end(); I != E; ++I)
     Handler.Handle(*I);
 }
+
+void Indexer::GetTranslationUnitsFor(GlobalSelector Sel,
+                                    TranslationUnitHandler &Handler) {
+  assert(Sel.isValid() && "Expected valid GlobalSelector");
+
+  SelMapTy::iterator I = SelMap.find(Sel);
+  if (I == SelMap.end())
+    return;
+  
+  TUSetTy &Set = I->second;
+  for (TUSetTy::iterator I = Set.begin(), E = Set.end(); I != E; ++I)
+    Handler.Handle(*I);
+}