3 files changed, 26 insertions, 0 deletions
diff --git a/include/clang/Index/ASTLocation.h b/include/clang/Index/ASTLocation.h
index 3fd99289f5..954792d0f9 100644
--- a/include/clang/Index/ASTLocation.h
+++ b/include/clang/Index/ASTLocation.h
@@ -26,6 +26,7 @@ namespace clang {
   class SourceRange;
 
 namespace idx {
+  class TranslationUnit;
 
 /// \brief Represents a Decl or a Stmt and its immediate Decl parent. It's
 /// immutable.
@@ -84,6 +85,20 @@ public:
   void print(llvm::raw_ostream &OS) const;
 };
 
+/// \brief Like ASTLocation but also contains the TranslationUnit that the
+/// ASTLocation originated from.
+class TULocation : public ASTLocation {
+  TranslationUnit *TU;
+  
+public:
+  TULocation(TranslationUnit *tu, ASTLocation astLoc)
+    : ASTLocation(astLoc), TU(tu) {
+    assert(tu && "Passed null translation unit");
+  }
+  
+  TranslationUnit *getTU() const { return TU; }
+};
+
 } // namespace idx
 
 } // namespace clang
diff --git a/include/clang/Index/Handlers.h b/include/clang/Index/Handlers.h
index 4a7b855831..2fe83c7f8b 100644
--- a/include/clang/Index/Handlers.h
+++ b/include/clang/Index/Handlers.h
@@ -21,6 +21,7 @@ namespace clang {
 namespace idx {
   class Entity;
   class TranslationUnit;
+  class TULocation;
 
 /// \brief Abstract interface for receiving Entities.
 class EntityHandler {
@@ -40,6 +41,15 @@ public:
   virtual void Handle(TranslationUnit *TU) = 0;
 };
 
+/// \brief Abstract interface for receiving TULocations.
+class TULocationHandler {
+public:
+  typedef TULocation receiving_type;
+
+  virtual ~TULocationHandler();
+  virtual void Handle(TULocation TULoc) = 0;
+};
+
 /// \brief Helper for the Handler classes. Stores the objects into a vector.
 /// example:
 /// @code
diff --git a/lib/Index/Handlers.cpp b/lib/Index/Handlers.cpp
index c94314b295..1e9a27d297 100644
--- a/lib/Index/Handlers.cpp
+++ b/lib/Index/Handlers.cpp
@@ -19,3 +19,4 @@ using namespace idx;
 // Out-of-line to give the virtual tables a home.
 EntityHandler::~EntityHandler() { }
 TranslationUnitHandler::~TranslationUnitHandler() { }
+TULocationHandler::~TULocationHandler() { }