"In file included from" lines don't respect -fdiagnostics-absolute-paths

[stk-ableton]

The "In file included from ..." lines of diagnostics contain relative paths even when -fdiagnostics-absolute-paths is given.

Reproduction:

mkdir /tmp/clang-test
cd /tmp/clang-test
echo '#include "x.h"' >x.cpp
echo '#warning abc' >x.h
clang++ -fdiagnostics-absolute-paths x.cpp

Current output:

In file included from x.cpp:1:
/tmp/clang-test/x.h:1:2: warning: abc [-W#warnings]

Expected output:

In file included from /tmp/clang-test/x.cpp:1:
/tmp/clang-test/x.h:1:2: warning: abc [-W#warnings]

[tbaederr]

Looking at the code:

llvm-project/clang/lib/Frontend/TextDiagnostic.cpp

Lines 871 to 896 in a806b3f

	void TextDiagnostic::emitIncludeLocation(FullSourceLoc Loc, PresumedLoc PLoc) {
	if (DiagOpts->ShowLocation && PLoc.isValid())
	OS << "In file included from " << PLoc.getFilename() << ':'
	<< PLoc.getLine() << ":\n";
	else
	OS << "In included file:\n";
	}
	void TextDiagnostic::emitImportLocation(FullSourceLoc Loc, PresumedLoc PLoc,
	StringRef ModuleName) {
	if (DiagOpts->ShowLocation && PLoc.isValid())
	OS << "In module '" << ModuleName << "' imported from "
	<< PLoc.getFilename() << ':' << PLoc.getLine() << ":\n";
	else
	OS << "In module '" << ModuleName << "':\n";
	}
	void TextDiagnostic::emitBuildingModuleLocation(FullSourceLoc Loc,
	PresumedLoc PLoc,
	StringRef ModuleName) {
	if (DiagOpts->ShowLocation && PLoc.isValid())
	OS << "While building module '" << ModuleName << "' imported from "
	<< PLoc.getFilename() << ':' << PLoc.getLine() << ":\n";
	else
	OS << "While building module '" << ModuleName << "':\n";
	}

this is also the case for the corresponding module output. DiagOpts->AbsolutePath is handled in this file as well.

[llvmbot]

Hi!

This issue may be a good introductory issue for people new to working on LLVM. If you would like to work on this issue, your first steps are:

1. Assign the issue to you.
2. Fix the issue locally.
3. Run the test suite locally.
   3.1) Remember that the subdirectories under test/ create fine-grained testing targets, so you can
   e.g. use make check-clang-ast to only run Clang's AST tests.
4. Create a git commit
5. Run git clang-format HEAD~1 to format your changes.
6. Submit the patch to Phabricator.
   6.1) Detailed instructions can be found here

For more instructions on how to submit a patch to LLVM, see our documentation.

If you have any further questions about this issue, don't hesitate to ask via a comment on this Github issue.

@llvm/issue-subscribers-good-first-issue

[charmitro]

Hello, I would like to work on this issue.

[charmitro]

Patch sent at https://reviews.llvm.org/D151833