Skip to content

[NFC][lldb] move DiagnosticsRendering to Host #168696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2025
+12 −12
Merged

[NFC][lldb] move DiagnosticsRendering to Host #168696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68d0638
[NFC][lldb] move DiagnosticsRendering to Host
charles-zablit Nov 19, 2025
578e450
fixup! [NFC][lldb] move DiagnosticsRendering to Host
charles-zablit Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lldb/include/lldb/Expression/DiagnosticManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "lldb/lldb-defines.h"
#include "lldb/lldb-types.h"

#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/Host/common/DiagnosticsRendering.h"
#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Status.h"

Expand Down
0 ...clude/lldb/Utility/DiagnosticsRendering.h → ...e/lldb/Host/common/DiagnosticsRendering.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lldb/include/lldb/Interpreter/CommandReturnObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define LLDB_INTERPRETER_COMMANDRETURNOBJECT_H

#include "lldb/Host/StreamFile.h"
#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/Host/common/DiagnosticsRendering.h"
Copy link
Member

@Michael137 Michael137 Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this PR, but I'm surprised to see that the subdirectories in Host are all lower-case 🤷‍♂️

Copy link
Contributor Author

@charles-zablit charles-zablit Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what's the reason (if there is one).

I assume it would be too cumbersome to change as well now?

#include "lldb/Utility/StreamString.h"
#include "lldb/Utility/StreamTee.h"
#include "lldb/Utility/StructuredData.h"
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/ValueObject/DILParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLDB_VALUEOBJECT_DILPARSER_H
#define LLDB_VALUEOBJECT_DILPARSER_H

#include "lldb/Host/common/DiagnosticsRendering.h"
#include "lldb/Target/ExecutionContextScope.h"
#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/Utility/Status.h"
#include "lldb/ValueObject/DILAST.h"
#include "lldb/ValueObject/DILLexer.h"
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Commands/CommandObjectExpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "lldb/Expression/UserExpression.h"
#include "lldb/Host/OptionParser.h"
#include "lldb/Host/StreamFile.h"
#include "lldb/Host/common/DiagnosticsRendering.h"
#include "lldb/Interpreter/CommandInterpreter.h"
#include "lldb/Interpreter/CommandOptionArgumentTable.h"
#include "lldb/Interpreter/CommandReturnObject.h"
Expand All @@ -21,7 +22,6 @@
#include "lldb/Target/Process.h"
#include "lldb/Target/StackFrame.h"
#include "lldb/Target/Target.h"
#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-forward.h"
#include "lldb/lldb-private-enumerations.h"
Expand Down
1 change: 1 addition & 0 deletions lldb/source/Host/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ macro(add_host_subdirectory group)
endmacro()

add_host_subdirectory(common
common/DiagnosticsRendering.cpp
common/FileAction.cpp
common/FileCache.cpp
common/File.cpp
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Utility/DiagnosticsRendering.cpp → ...urce/Host/common/DiagnosticsRendering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/Host/common/DiagnosticsRendering.h"
#include <cstdint>

using namespace lldb_private;
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Interpreter/CommandReturnObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "lldb/Interpreter/CommandReturnObject.h"

#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/Host/common/DiagnosticsRendering.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/StreamString.h"

Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Interpreter/Options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
#include <set>

#include "lldb/Host/OptionParser.h"
#include "lldb/Host/common/DiagnosticsRendering.h"
#include "lldb/Interpreter/CommandCompletions.h"
#include "lldb/Interpreter/CommandInterpreter.h"
#include "lldb/Interpreter/CommandObject.h"
#include "lldb/Interpreter/CommandReturnObject.h"
#include "lldb/Target/Target.h"
#include "lldb/Utility/AnsiTerminal.h"
#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/Utility/StreamString.h"
#include "llvm/ADT/STLExtras.h"

Expand Down
1 change: 0 additions & 1 deletion lldb/source/Utility/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ add_lldb_library(lldbUtility NO_INTERNAL_DEPENDENCIES
DataEncoder.cpp
DataExtractor.cpp
Diagnostics.cpp
DiagnosticsRendering.cpp
Environment.cpp
ErrorMessages.cpp
Event.cpp
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/ValueObject/DILParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
//===----------------------------------------------------------------------===//

#include "lldb/ValueObject/DILParser.h"
#include "lldb/Host/common/DiagnosticsRendering.h"
#include "lldb/Target/ExecutionContextScope.h"
#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/ValueObject/DILAST.h"
#include "lldb/ValueObject/DILEval.h"
#include "llvm/ADT/StringRef.h"
Expand Down
1 change: 1 addition & 0 deletions lldb/unittests/Host/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
set (FILES
DiagnosticsRenderingTest.cpp
ZipFileResolverTest.cpp
)

Expand Down
2 changes: 1 addition & 1 deletion ...ests/Utility/DiagnosticsRenderingTest.cpp → .../Host/common/DiagnosticsRenderingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "lldb/Utility/DiagnosticsRendering.h"
#include "lldb/Host/common/DiagnosticsRendering.h"
#include "lldb/Utility/StreamString.h"
#include "gtest/gtest.h"

Expand Down
1 change: 0 additions & 1 deletion lldb/unittests/Utility/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ add_lldb_unittest(UtilityTests
DataBufferTest.cpp
DataEncoderTest.cpp
DataExtractorTest.cpp
DiagnosticsRenderingTest.cpp
EnvironmentTest.cpp
EventTest.cpp
FileSpecListTest.cpp
Expand Down
1 change: 1 addition & 0 deletions llvm/utils/gn/secondary/lldb/source/Host/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ static_library("Host") {
]
public_deps = [ "//llvm/utils/gn/build/libs/xml" ]
sources = [
"common/DiagnosticsRendering.cpp",
"common/File.cpp",
"common/FileAction.cpp",
"common/FileCache.cpp",
Expand Down
1 change: 0 additions & 1 deletion llvm/utils/gn/secondary/lldb/source/Utility/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ static_library("Utility") {
"DataEncoder.cpp",
"DataExtractor.cpp",
"Diagnostics.cpp",
"DiagnosticsRendering.cpp",
"Environment.cpp",
"ErrorMessages.cpp",
"Event.cpp",
Expand Down
Loading