From c745cec17c8881f072a4a7aad7ffe27f6197c631 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 14 Apr 2010 04:28:50 +0000 Subject: [PATCH] Improve line marker directive locations, patch by Jordy Rose llvm-svn: 101226 --- clang/lib/Frontend/PrintPreprocessedOutput.cpp | 2 +- clang/lib/Lex/PPDirectives.cpp | 5 +++-- clang/test/Preprocessor/line-directive-output.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp index b4718e9ad499..b45188f3310f 100644 --- a/clang/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/clang/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/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 757ba9014df6..8033e475c8c4 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/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/clang/test/Preprocessor/line-directive-output.c b/clang/test/Preprocessor/line-directive-output.c index fc1a310bf0bd..290703a50e3b 100644 --- a/clang/test/Preprocessor/line-directive-output.c +++ b/clang/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"