Make CIndex and c-index-test a little bit more robust. The only
substantive change is that clang_getCursorSource() now returns the
file in which a macro was instantiated when the cursor points into a
macro instantiation, rather than crashing.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@84275 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp
index 133a269..d0638d0 100644
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/CIndex/CIndex.cpp
@@ -22,11 +22,12 @@
#include "clang/Basic/FileManager.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Frontend/ASTUnit.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/System/Path.h"
#include <cstdio>
#include <dlfcn.h>
#include <sys/wait.h>
#include <vector>
-#include "llvm/System/Path.h"
using namespace clang;
using namespace idx;
@@ -823,7 +824,18 @@
SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
SourceLocation SLoc = getLocationFromCursor(C, SourceMgr, ND);
- return SourceMgr.getBufferName(SLoc);
+ if (SLoc.isFileID())
+ return SourceMgr.getBufferName(SLoc);
+
+ // Retrieve the file in which the macro was instantiated, then provide that
+ // buffer name.
+ // FIXME: Do we want to give specific macro-instantiation information?
+ const llvm::MemoryBuffer *Buffer
+ = SourceMgr.getBuffer(SourceMgr.getDecomposedSpellingLoc(SLoc).first);
+ if (!Buffer)
+ return 0;
+
+ return Buffer->getBufferIdentifier();
}
void clang_getDefinitionSpellingAndExtent(CXCursor C,