[llvm] [Support] Add option to print SMDiagnostic into a buffer without the filename and location info (PR #92050)
via llvm-commits
llvm-commits at lists.llvm.org
Mon May 13 16:55:22 PDT 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-llvm-support
Author: Artem Chikin (artemcm)
<details>
<summary>Changes</summary>
---
Full diff: https://github.com/llvm/llvm-project/pull/92050.diff
3 Files Affected:
- (modified) llvm/include/llvm/Support/SourceMgr.h (+1-1)
- (modified) llvm/lib/Support/SourceMgr.cpp (+2-2)
- (modified) llvm/unittests/Support/SourceMgrTest.cpp (+10)
``````````diff
diff --git a/llvm/include/llvm/Support/SourceMgr.h b/llvm/include/llvm/Support/SourceMgr.h
index 6f5bee7f8cc22..7a4b6de1162da 100644
--- a/llvm/include/llvm/Support/SourceMgr.h
+++ b/llvm/include/llvm/Support/SourceMgr.h
@@ -317,7 +317,7 @@ class SMDiagnostic {
ArrayRef<SMFixIt> getFixIts() const { return FixIts; }
void print(const char *ProgName, raw_ostream &S, bool ShowColors = true,
- bool ShowKindLabel = true) const;
+ bool ShowKindLabel = true, bool ShowLocation = true) const;
};
} // end namespace llvm
diff --git a/llvm/lib/Support/SourceMgr.cpp b/llvm/lib/Support/SourceMgr.cpp
index ebeff87c39549..6eaa8783a5319 100644
--- a/llvm/lib/Support/SourceMgr.cpp
+++ b/llvm/lib/Support/SourceMgr.cpp
@@ -482,7 +482,7 @@ static void printSourceLine(raw_ostream &S, StringRef LineContents) {
static bool isNonASCII(char c) { return c & 0x80; }
void SMDiagnostic::print(const char *ProgName, raw_ostream &OS, bool ShowColors,
- bool ShowKindLabel) const {
+ bool ShowKindLabel, bool ShowLocation) const {
ColorMode Mode = ShowColors ? ColorMode::Auto : ColorMode::Disable;
{
@@ -491,7 +491,7 @@ void SMDiagnostic::print(const char *ProgName, raw_ostream &OS, bool ShowColors,
if (ProgName && ProgName[0])
S << ProgName << ": ";
- if (!Filename.empty()) {
+ if (ShowLocation && !Filename.empty()) {
if (Filename == "-")
S << "<stdin>";
else
diff --git a/llvm/unittests/Support/SourceMgrTest.cpp b/llvm/unittests/Support/SourceMgrTest.cpp
index cbd17ff476890..ebc8869c2fd3a 100644
--- a/llvm/unittests/Support/SourceMgrTest.cpp
+++ b/llvm/unittests/Support/SourceMgrTest.cpp
@@ -532,3 +532,13 @@ TEST_F(SourceMgrTest, FixitForTab) {
Output);
}
+TEST_F(SourceMgrTest, PrintWithoutLoc) {
+ raw_string_ostream OS(Output);
+ auto Diag = llvm::SMDiagnostic("file.in", llvm::SourceMgr::DK_Error, "message");
+ Diag.print(nullptr, OS);
+ OS.flush();
+ EXPECT_EQ("file.in: error: message\n", Output);
+ Output.clear();
+ Diag.print(nullptr, OS, false, false, false);
+ EXPECT_EQ("message\n", Output);
+}
``````````
</details>
https://github.com/llvm/llvm-project/pull/92050
More information about the llvm-commits
mailing list