Skip to content

Commit f2d32dd

Browse files
committed
[lldb] Sink StreamFile into lldbHost
StreamFile subclasses Stream (from lldbUtility) and is backed by a File (from lldbHost). It does not depend on anything from lldbCore or any of its sibling libraries, so I think it makes sense for this to live in lldbHost instead. Differential Revision: https://reviews.llvm.org/D157460
1 parent 20c77a5 commit f2d32dd

File tree

59 files changed

+27
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+27
-71
lines changed

lldb/include/lldb/Core/Debugger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#include "lldb/Core/FormatEntity.h"
2020
#include "lldb/Core/IOHandler.h"
2121
#include "lldb/Core/SourceManager.h"
22-
#include "lldb/Core/StreamFile.h"
2322
#include "lldb/Core/UserSettingsController.h"
2423
#include "lldb/Host/HostThread.h"
24+
#include "lldb/Host/StreamFile.h"
2525
#include "lldb/Host/Terminal.h"
2626
#include "lldb/Target/ExecutionContext.h"
2727
#include "lldb/Target/Platform.h"

lldb/include/lldb/Core/StreamFile.h renamed to lldb/include/lldb/Host/StreamFile.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef LLDB_CORE_STREAMFILE_H
10-
#define LLDB_CORE_STREAMFILE_H
9+
#ifndef LLDB_HOST_STREAMFILE_H
10+
#define LLDB_HOST_STREAMFILE_H
1111

1212
#include "lldb/Host/File.h"
1313
#include "lldb/Utility/Stream.h"
@@ -54,4 +54,4 @@ class StreamFile : public Stream {
5454

5555
} // namespace lldb_private
5656

57-
#endif // LLDB_CORE_STREAMFILE_H
57+
#endif // LLDB_HOST_STREAMFILE_H

lldb/include/lldb/Interpreter/CommandReturnObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLDB_INTERPRETER_COMMANDRETURNOBJECT_H
1010
#define LLDB_INTERPRETER_COMMANDRETURNOBJECT_H
1111

12-
#include "lldb/Core/StreamFile.h"
12+
#include "lldb/Host/StreamFile.h"
1313
#include "lldb/Utility/StreamString.h"
1414
#include "lldb/Utility/StreamTee.h"
1515
#include "lldb/lldb-private.h"

lldb/include/lldb/Interpreter/ScriptInterpreter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "lldb/Breakpoint/BreakpointOptions.h"
1919
#include "lldb/Core/PluginInterface.h"
2020
#include "lldb/Core/SearchFilter.h"
21-
#include "lldb/Core/StreamFile.h"
2221
#include "lldb/Core/ThreadedCommunication.h"
2322
#include "lldb/Host/PseudoTerminal.h"
23+
#include "lldb/Host/StreamFile.h"
2424
#include "lldb/Interpreter/ScriptObject.h"
2525
#include "lldb/Interpreter/ScriptedPlatformInterface.h"
2626
#include "lldb/Interpreter/ScriptedProcessInterface.h"

lldb/source/API/SBBreakpoint.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "lldb/Breakpoint/StoppointCallbackContext.h"
2626
#include "lldb/Core/Address.h"
2727
#include "lldb/Core/Debugger.h"
28-
#include "lldb/Core/StreamFile.h"
2928
#include "lldb/Core/StructuredDataImpl.h"
3029
#include "lldb/Interpreter/CommandInterpreter.h"
3130
#include "lldb/Interpreter/ScriptInterpreter.h"

lldb/source/API/SBBreakpointLocation.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "lldb/Breakpoint/Breakpoint.h"
1919
#include "lldb/Breakpoint/BreakpointLocation.h"
2020
#include "lldb/Core/Debugger.h"
21-
#include "lldb/Core/StreamFile.h"
2221
#include "lldb/Core/StructuredDataImpl.h"
2322
#include "lldb/Interpreter/CommandInterpreter.h"
2423
#include "lldb/Interpreter/ScriptInterpreter.h"

lldb/source/API/SBBreakpointOptionCommon.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "lldb/Breakpoint/StoppointCallbackContext.h"
2020
#include "lldb/Core/Address.h"
2121
#include "lldb/Core/Debugger.h"
22-
#include "lldb/Core/StreamFile.h"
2322
#include "lldb/Interpreter/CommandInterpreter.h"
2423
#include "lldb/Interpreter/ScriptInterpreter.h"
2524
#include "lldb/Target/Process.h"

lldb/source/API/SBDebugger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
#include "lldb/Core/DebuggerEvents.h"
4040
#include "lldb/Core/PluginManager.h"
4141
#include "lldb/Core/Progress.h"
42-
#include "lldb/Core/StreamFile.h"
4342
#include "lldb/Core/StructuredDataImpl.h"
4443
#include "lldb/DataFormatters/DataVisualization.h"
4544
#include "lldb/Host/Config.h"
45+
#include "lldb/Host/StreamFile.h"
4646
#include "lldb/Host/XML.h"
4747
#include "lldb/Initialization/SystemLifetimeManager.h"
4848
#include "lldb/Interpreter/CommandInterpreter.h"

lldb/source/API/SBEvent.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "lldb/Utility/Instrumentation.h"
1313

1414
#include "lldb/Breakpoint/Breakpoint.h"
15-
#include "lldb/Core/StreamFile.h"
1615
#include "lldb/Interpreter/CommandInterpreter.h"
1716
#include "lldb/Target/Process.h"
1817
#include "lldb/Utility/ConstString.h"

lldb/source/API/SBFrame.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "Utils.h"
1818
#include "lldb/Core/Address.h"
1919
#include "lldb/Core/Debugger.h"
20-
#include "lldb/Core/StreamFile.h"
2120
#include "lldb/Core/ValueObjectRegister.h"
2221
#include "lldb/Core/ValueObjectVariable.h"
2322
#include "lldb/Core/ValueObjectConstResult.h"

0 commit comments

Comments
 (0)