diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-04-14 04:28:50 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-04-14 04:28:50 +0000 |
| commit | 86d0ef74303e9164a0860ce849af597d34f937ab (patch) | |
| tree | d18c838540cad939a0f856be5d3e4a54ed10b597 | |
| parent | 270083146ffd71d4ba35c0cda0b7461dea99e031 (diff) | |
Improve line marker directive locations, patch by Jordy Rose
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101226 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Frontend/PrintPreprocessedOutput.cpp | 2 | ||||
| -rw-r--r-- | lib/Lex/PPDirectives.cpp | 5 | ||||
| -rw-r--r-- | test/Preprocessor/line-directive-output.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/Frontend/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp index b4718e9ad4..b45188f331 100644 --- a/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/lib/Frontend/PrintPreprocessedOutput.cpp @@ -219,7 +219,7 @@ void PrintPPOutputPPCallbacks::FileChanged(SourceLocation Loc, SourceManager &SourceMgr = SM; PresumedLoc UserLoc = SourceMgr.getPresumedLoc(Loc); - unsigned NewLine = UserLoc.getLine()+1; + unsigned NewLine = UserLoc.getLine(); if (Reason == PPCallbacks::EnterFile) { SourceLocation IncludeLoc = SourceMgr.getPresumedLoc(Loc).getIncludeLoc(); diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 757ba9014d..8033e475c8 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -716,7 +716,8 @@ void Preprocessor::HandleLineDirective(Token &Tok) { SourceMgr.AddLineNote(DigitTok.getLocation(), LineNo, FilenameID); if (Callbacks) - Callbacks->FileChanged(DigitTok.getLocation(), PPCallbacks::RenameFile, + Callbacks->FileChanged(CurPPLexer->getSourceLocation(), + PPCallbacks::RenameFile, SrcMgr::C_User); } @@ -865,7 +866,7 @@ void Preprocessor::HandleDigitDirective(Token &DigitTok) { else if (IsSystemHeader) FileKind = SrcMgr::C_System; - Callbacks->FileChanged(DigitTok.getLocation(), Reason, FileKind); + Callbacks->FileChanged(CurPPLexer->getSourceLocation(), Reason, FileKind); } } diff --git a/test/Preprocessor/line-directive-output.c b/test/Preprocessor/line-directive-output.c index fc1a310bf0..290703a50e 100644 --- a/test/Preprocessor/line-directive-output.c +++ b/test/Preprocessor/line-directive-output.c @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -E %s 2>&1 | FileCheck %s -strict-whitespace // PR6101 int a; -// CHECK: # 2 "{{.*}}line-directive-output.c" +// CHECK: # 1 "{{.*}}line-directive-output.c" // CHECK: int a; // CHECK-NEXT: # 50 "{{.*}}line-directive-output.c" |