diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2013-08-22 00:27:10 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2013-08-22 00:27:10 +0000 |
| commit | 5ba37d5282d05a6ca51267534f10eac4a0a479ad (patch) | |
| tree | 8d9092ab043ff8b84e479cdd4e7c97fe10edd254 /clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | |
| parent | 6a7a727174830d448cfcede4090ab7edc3b6d19a (diff) | |
| download | bcm5719-llvm-5ba37d5282d05a6ca51267534f10eac4a0a479ad.tar.gz bcm5719-llvm-5ba37d5282d05a6ca51267534f10eac4a0a479ad.zip | |
Split isFromMainFile into two functions.
Basically, isInMainFile considers line markers, and isWrittenInMainFile
doesn't. Distinguishing between the two is useful when dealing with
files which are preprocessed files or rewritten with -frewrite-includes
(so we don't, for example, print useless warnings).
llvm-svn: 188968
Diffstat (limited to 'clang/lib/Frontend/VerifyDiagnosticConsumer.cpp')
| -rw-r--r-- | clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp index efe6005ed78..f5555291a83 100644 --- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp +++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp @@ -628,11 +628,11 @@ static bool IsFromSameFile(SourceManager &SM, SourceLocation DirectiveLoc, while (DiagnosticLoc.isMacroID()) DiagnosticLoc = SM.getImmediateMacroCallerLoc(DiagnosticLoc); - if (SM.isFromSameFile(DirectiveLoc, DiagnosticLoc)) + if (SM.isWrittenInSameFile(DirectiveLoc, DiagnosticLoc)) return true; const FileEntry *DiagFile = SM.getFileEntryForID(SM.getFileID(DiagnosticLoc)); - if (!DiagFile && SM.isFromMainFile(DirectiveLoc)) + if (!DiagFile && SM.isWrittenInMainFile(DirectiveLoc)) return true; return (DiagFile == SM.getFileEntryForID(SM.getFileID(DirectiveLoc))); |
