Integrate the following from the 'objective-rewrite' branch:

http://llvm.org/viewvc/llvm-project?view=rev&revision=71473

llvm-svn: 90688
This commit is contained in:
Steve Naroff 2009-12-06 01:02:14 +00:00
parent 232324c5c0
commit 66aaa39568
1 changed files with 13 additions and 7 deletions

View File

@ -141,10 +141,15 @@ void PrintPPOutputPPCallbacks::WriteLineInfo(unsigned LineNo,
EmittedMacroOnThisLine = false;
}
OS << '#' << ' ' << LineNo << ' ' << '"';
OS << '#';
if (PP.getLangOptions().Microsoft)
OS << "line";
OS << ' ' << LineNo << ' ' << '"';
OS.write(&CurFilename[0], CurFilename.size());
OS << '"';
if (!PP.getLangOptions().Microsoft) {
if (ExtraLen)
OS.write(Extra, ExtraLen);
@ -152,6 +157,7 @@ void PrintPPOutputPPCallbacks::WriteLineInfo(unsigned LineNo,
OS.write(" 3", 2);
else if (FileType == SrcMgr::C_ExternCSystem)
OS.write(" 3 4", 4);
}
OS << '\n';
}