charmitro updated this revision to Diff 527914. CHANGES SINCE LAST ACTION https://reviews.llvm.org/D151833/new/
https://reviews.llvm.org/D151833 Files: clang/lib/Frontend/TextDiagnostic.cpp clang/test/Frontend/absolute-paths-import.h clang/test/Frontend/absolute-paths.c Index: clang/test/Frontend/absolute-paths.c =================================================================== --- clang/test/Frontend/absolute-paths.c +++ clang/test/Frontend/absolute-paths.c @@ -1,5 +1,9 @@ // RUN: %clang_cc1 -fsyntax-only -I %S/Inputs/SystemHeaderPrefix/.. %s 2>&1 | FileCheck -check-prefix=NORMAL -check-prefix=CHECK %s -// RUN: %clang_cc1 -fsyntax-only -I %S/Inputs/SystemHeaderPrefix/.. -fdiagnostics-absolute-paths %s 2>&1 | FileCheck -check-prefix=ABSOLUTE -check-prefix=CHECK %s +// RUN: %clang_cc1 -fsyntax-only -I %S/Inputs/SystemHeaderPrefix/.. -fdiagnostics-absolute-paths %s 2>&1 | FileCheck -DROOT_ABSOLUTE=%s -check-prefix=ABSOLUTE -check-prefix=CHECK %s + +#include "absolute-paths-import.h" +// NORMAL: In file included from {{.*absolute-paths.c:4}}: +// ABSOLUTE: In file included from [[ROOT_ABSOLUTE]]:4: #include "absolute-paths.h" Index: clang/test/Frontend/absolute-paths-import.h =================================================================== --- /dev/null +++ clang/test/Frontend/absolute-paths-import.h @@ -0,0 +1 @@ +#warning abc Index: clang/lib/Frontend/TextDiagnostic.cpp =================================================================== --- clang/lib/Frontend/TextDiagnostic.cpp +++ clang/lib/Frontend/TextDiagnostic.cpp @@ -868,10 +868,11 @@ } void TextDiagnostic::emitIncludeLocation(FullSourceLoc Loc, PresumedLoc PLoc) { - if (DiagOpts->ShowLocation && PLoc.isValid()) - OS << "In file included from " << PLoc.getFilename() << ':' - << PLoc.getLine() << ":\n"; - else + if (DiagOpts->ShowLocation && PLoc.isValid()) { + OS << "In file included from "; + emitFilename(PLoc.getFilename(), Loc.getManager()); + OS << ':' << PLoc.getLine() << ":\n"; + } else OS << "In included file:\n"; }
Index: clang/test/Frontend/absolute-paths.c =================================================================== --- clang/test/Frontend/absolute-paths.c +++ clang/test/Frontend/absolute-paths.c @@ -1,5 +1,9 @@ // RUN: %clang_cc1 -fsyntax-only -I %S/Inputs/SystemHeaderPrefix/.. %s 2>&1 | FileCheck -check-prefix=NORMAL -check-prefix=CHECK %s -// RUN: %clang_cc1 -fsyntax-only -I %S/Inputs/SystemHeaderPrefix/.. -fdiagnostics-absolute-paths %s 2>&1 | FileCheck -check-prefix=ABSOLUTE -check-prefix=CHECK %s +// RUN: %clang_cc1 -fsyntax-only -I %S/Inputs/SystemHeaderPrefix/.. -fdiagnostics-absolute-paths %s 2>&1 | FileCheck -DROOT_ABSOLUTE=%s -check-prefix=ABSOLUTE -check-prefix=CHECK %s + +#include "absolute-paths-import.h" +// NORMAL: In file included from {{.*absolute-paths.c:4}}: +// ABSOLUTE: In file included from [[ROOT_ABSOLUTE]]:4: #include "absolute-paths.h" Index: clang/test/Frontend/absolute-paths-import.h =================================================================== --- /dev/null +++ clang/test/Frontend/absolute-paths-import.h @@ -0,0 +1 @@ +#warning abc Index: clang/lib/Frontend/TextDiagnostic.cpp =================================================================== --- clang/lib/Frontend/TextDiagnostic.cpp +++ clang/lib/Frontend/TextDiagnostic.cpp @@ -868,10 +868,11 @@ } void TextDiagnostic::emitIncludeLocation(FullSourceLoc Loc, PresumedLoc PLoc) { - if (DiagOpts->ShowLocation && PLoc.isValid()) - OS << "In file included from " << PLoc.getFilename() << ':' - << PLoc.getLine() << ":\n"; - else + if (DiagOpts->ShowLocation && PLoc.isValid()) { + OS << "In file included from "; + emitFilename(PLoc.getFilename(), Loc.getManager()); + OS << ':' << PLoc.getLine() << ":\n"; + } else OS << "In included file:\n"; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits