diff options
| -rw-r--r-- | lib/Basic/SourceManager.cpp | 6 | ||||
| -rw-r--r-- | tools/libclang/CIndex.cpp | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index c3e03933e5..ae7de2d3c9 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -961,6 +961,12 @@ static void ComputeLineNumbers(Diagnostic &Diag, ContentCache *FI, /// about to emit a diagnostic. unsigned SourceManager::getLineNumber(FileID FID, unsigned FilePos, bool *Invalid) const { + if (FID.isInvalid()) { + if (Invalid) + *Invalid = true; + return 1; + } + ContentCache *Content; if (LastLineNoFileIDQuery == FID) Content = LastLineNoContentCache; diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index f1a37d6906..00141184c7 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -2819,17 +2819,8 @@ void clang_getSpellingLocation(CXSourceLocation location, unsigned *offset) { SourceLocation Loc = SourceLocation::getFromRawEncoding(location.int_data); - if (!location.ptr_data[0] || Loc.isInvalid()) { - if (file) - *file = 0; - if (line) - *line = 0; - if (column) - *column = 0; - if (offset) - *offset = 0; - return; - } + if (!location.ptr_data[0] || Loc.isInvalid()) + return createNullLocation(file, line, column, offset); const SourceManager &SM = *static_cast<const SourceManager*>(location.ptr_data[0]); @@ -2847,6 +2838,9 @@ void clang_getSpellingLocation(CXSourceLocation location, FileID FID = LocInfo.first; unsigned FileOffset = LocInfo.second; + if (FID.isInvalid()) + return createNullLocation(file, line, column, offset); + if (file) *file = (void *)SM.getFileEntryForID(FID); if (line) |