diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CIndex/CIndex.cpp | 7 | ||||
| -rw-r--r-- | tools/c-index-test/c-index-test.c | 15 |
2 files changed, 16 insertions, 6 deletions
diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp index cf33d7d8cd..493d4f2de6 100644 --- a/tools/CIndex/CIndex.cpp +++ b/tools/CIndex/CIndex.cpp @@ -980,8 +980,11 @@ const char *clang_getCursorSource(CXCursor C) SourceManager &SourceMgr = ND->getASTContext().getSourceManager(); SourceLocation SLoc = getLocationFromCursor(C, SourceMgr, ND); - if (SLoc.isFileID()) - return SourceMgr.getBufferName(SLoc); + + if (SLoc.isFileID()) { + const char *bufferName = SourceMgr.getBufferName(SLoc); + return bufferName[0] == '<' ? NULL : bufferName; + } // Retrieve the file in which the macro was instantiated, then provide that // buffer name. diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c index 36deb2e6d9..3b0e4c8e9c 100644 --- a/tools/c-index-test/c-index-test.c +++ b/tools/c-index-test/c-index-test.c @@ -40,11 +40,18 @@ static void PrintCursor(CXCursor Cursor) { } } +static const char* GetCursorSource(CXCursor Cursor) { + const char *source = clang_getCursorSource(Cursor); + if (!source) + return "<invalid loc>"; + return basename(source); +} + static void DeclVisitor(CXDecl Dcl, CXCursor Cursor, CXClientData Filter) { if (!Filter || (Cursor.kind == *(enum CXCursorKind *)Filter)) { CXString string; - printf("// CHECK: %s:%d:%d: ", basename(clang_getCursorSource(Cursor)), + printf("// CHECK: %s:%d:%d: ", GetCursorSource(Cursor), clang_getCursorLine(Cursor), clang_getCursorColumn(Cursor)); PrintCursor(Cursor); @@ -58,7 +65,7 @@ static void TranslationUnitVisitor(CXTranslationUnit Unit, CXCursor Cursor, { if (!Filter || (Cursor.kind == *(enum CXCursorKind *)Filter)) { CXString string; - printf("// CHECK: %s:%d:%d: ", basename(clang_getCursorSource(Cursor)), + printf("// CHECK: %s:%d:%d: ", GetCursorSource(Cursor), clang_getCursorLine(Cursor), clang_getCursorColumn(Cursor)); PrintCursor(Cursor); @@ -94,8 +101,8 @@ static void TranslationUnitVisitor(CXTranslationUnit Unit, CXCursor Cursor, /* Nothing found here; that's fine. */ } else if (Ref.kind != CXCursor_FunctionDecl) { CXString string; - printf("// CHECK: %s:%d:%d: ", basename(clang_getCursorSource(Ref)), - curLine, curColumn); + printf("// CHECK: %s:%d:%d: ", GetCursorSource(Ref), + curLine, curColumn); PrintCursor(Ref); string = clang_getDeclSpelling(Ref.decl); printf(" [Context:%s]\n", clang_getCString(string)); |