From 4526b46ee694b272c7b2cc949d8270a4e12471b1 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak@centrum.cz>
Date: Thu, 1 May 2014 21:11:57 +0000
Subject: write a line marker right before adding included file

Enclosing the original #include directive inside #if 0 adds lines,
so warning/errors messages would have the line number off in
"In file included from <file>:<line>:", so add line marker to fix this.

llvm-svn: 207795
---
 clang/lib/Rewrite/Frontend/InclusionRewriter.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'clang/lib/Rewrite/Frontend/InclusionRewriter.cpp')

diff --git a/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp b/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp
index d6a434d80ad..7700096a9af 100644
--- a/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp
+++ b/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp
@@ -390,6 +390,8 @@ bool InclusionRewriter::Process(FileID FileId,
           case tok::pp_import: {
             CommentOutDirective(RawLex, HashToken, FromFile, EOL, NextToWrite,
               Line);
+            if (FileId != PP.getPredefinesFileID())
+              WriteLineInfo(FileName, Line - 1, FileType, EOL, "");
             StringRef LineInfoExtra;
             if (const FileChange *Change = FindFileChangeLocation(
                 HashToken.getLocation())) {
-- 
cgit v1.2.3