diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Index/Entity.cpp | 3 | ||||
| -rw-r--r-- | lib/Index/Indexer.cpp | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/Index/Entity.cpp b/lib/Index/Entity.cpp index 85b4f2e196..d33110074f 100644 --- a/lib/Index/Entity.cpp +++ b/lib/Index/Entity.cpp @@ -59,11 +59,12 @@ Entity EntityGetter::VisitNamedDecl(NamedDecl *D) { return Entity(D); // FIXME: Only works for DeclarationNames that are identifiers. + // Treats other DeclarationNames as internal Decls for now.. DeclarationName Name = D->getDeclName(); if (!Name.isIdentifier()) - return Entity(); + return Entity(D); IdentifierInfo *II = Name.getAsIdentifierInfo(); if (!II) diff --git a/lib/Index/Indexer.cpp b/lib/Index/Indexer.cpp index 08e367a279..ddc22f7fbc 100644 --- a/lib/Index/Indexer.cpp +++ b/lib/Index/Indexer.cpp @@ -16,6 +16,7 @@ #include "clang/Index/Entity.h" #include "clang/Index/Handlers.h" #include "clang/Index/TranslationUnit.h" +#include "clang/AST/DeclBase.h" using namespace clang; using namespace idx; @@ -39,6 +40,7 @@ public: void Indexer::IndexAST(TranslationUnit *TU) { assert(TU && "Passed null TranslationUnit"); + CtxTUMap[&TU->getASTContext()] = TU; EntityIndexer Idx(TU, Map); Prog.FindEntities(TU->getASTContext(), Idx); } @@ -46,8 +48,14 @@ void Indexer::IndexAST(TranslationUnit *TU) { void Indexer::GetTranslationUnitsFor(Entity Ent, TranslationUnitHandler &Handler) { assert(Ent.isValid() && "Expected valid Entity"); - assert(!Ent.isInternalToTU() && - "Expected an Entity visible outside of its translation unit"); + + if (Ent.isInternalToTU()) { + Decl *D = Ent.getInternalDecl(); + CtxTUMapTy::iterator I = CtxTUMap.find(&D->getASTContext()); + if (I != CtxTUMap.end()) + Handler.Handle(I->second); + return; + } MapTy::iterator I = Map.find(Ent); if (I == Map.end()) |