summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp2
-rw-r--r--lldb/include/lldb/Core/Address.h12
-rw-r--r--lldb/include/lldb/Core/AddressRange.h6
-rw-r--r--lldb/include/lldb/Core/AddressResolver.h4
-rw-r--r--lldb/include/lldb/Core/AddressResolverFileLine.h8
-rw-r--r--lldb/include/lldb/Core/AddressResolverName.h6
-rw-r--r--lldb/include/lldb/Core/Broadcaster.h12
-rw-r--r--lldb/include/lldb/Core/Communication.h14
-rw-r--r--lldb/include/lldb/Core/Debugger.h34
-rw-r--r--lldb/include/lldb/Core/Disassembler.h26
-rw-r--r--lldb/include/lldb/Core/DumpDataExtractor.h6
-rw-r--r--lldb/include/lldb/Core/EmulateInstruction.h18
-rw-r--r--lldb/include/lldb/Core/Event.h10
-rw-r--r--lldb/include/lldb/Core/FileLineResolver.h8
-rw-r--r--lldb/include/lldb/Core/FileSpecList.h2
-rw-r--r--lldb/include/lldb/Core/FormatEntity.h12
-rw-r--r--lldb/include/lldb/Core/IOHandler.h10
-rw-r--r--lldb/include/lldb/Core/Listener.h14
-rw-r--r--lldb/include/lldb/Core/Module.h22
-rw-r--r--lldb/include/lldb/Core/ModuleList.h12
-rw-r--r--lldb/include/lldb/Core/Opcode.h6
-rw-r--r--lldb/include/lldb/Core/PluginManager.h16
-rw-r--r--lldb/include/lldb/Core/SearchFilter.h6
-rw-r--r--lldb/include/lldb/Core/Section.h16
-rw-r--r--lldb/include/lldb/Core/SourceManager.h10
-rw-r--r--lldb/include/lldb/Core/StreamAsynchronousIO.h2
-rw-r--r--lldb/include/lldb/Core/StreamFile.h8
-rw-r--r--lldb/include/lldb/Core/UserSettingsController.h12
-rw-r--r--lldb/include/lldb/Core/Value.h12
-rw-r--r--lldb/include/lldb/Core/ValueObject.h24
-rw-r--r--lldb/include/lldb/Core/ValueObjectCast.h12
-rw-r--r--lldb/include/lldb/Core/ValueObjectChild.h16
-rw-r--r--lldb/include/lldb/Core/ValueObjectConstResult.h24
-rw-r--r--lldb/include/lldb/Core/ValueObjectConstResultCast.h16
-rw-r--r--lldb/include/lldb/Core/ValueObjectConstResultChild.h16
-rw-r--r--lldb/include/lldb/Core/ValueObjectConstResultImpl.h16
-rw-r--r--lldb/include/lldb/Core/ValueObjectDynamicValue.h24
-rw-r--r--lldb/include/lldb/Core/ValueObjectList.h6
-rw-r--r--lldb/include/lldb/Core/ValueObjectMemory.h18
-rw-r--r--lldb/include/lldb/Core/ValueObjectRegister.h16
-rw-r--r--lldb/include/lldb/Core/ValueObjectSyntheticFilter.h18
-rw-r--r--lldb/include/lldb/Core/ValueObjectVariable.h18
-rw-r--r--lldb/include/lldb/Host/TaskPool.h8
-rw-r--r--lldb/include/lldb/Target/DynamicLoader.h14
-rw-r--r--lldb/include/lldb/Utility/ArchSpec.h8
-rw-r--r--lldb/include/lldb/Utility/Baton.h4
-rw-r--r--lldb/include/lldb/Utility/Connection.h12
-rw-r--r--lldb/include/lldb/Utility/ConstString.h4
-rw-r--r--lldb/include/lldb/Utility/DataBufferHeap.h6
-rw-r--r--lldb/include/lldb/Utility/DataBufferLLVM.h4
-rw-r--r--lldb/include/lldb/Utility/DataEncoder.h10
-rw-r--r--lldb/include/lldb/Utility/DataExtractor.h4
-rw-r--r--lldb/include/lldb/Utility/FileSpec.h4
-rw-r--r--lldb/include/lldb/Utility/Log.h10
-rw-r--r--lldb/include/lldb/Utility/RegisterValue.h10
-rw-r--r--lldb/include/lldb/Utility/RegularExpression.h2
-rw-r--r--lldb/include/lldb/Utility/Scalar.h10
-rw-r--r--lldb/include/lldb/Utility/SelectHelper.h4
-rw-r--r--lldb/include/lldb/Utility/State.h8
-rw-r--r--lldb/include/lldb/Utility/Status.h10
-rw-r--r--lldb/include/lldb/Utility/Stream.h10
-rw-r--r--lldb/include/lldb/Utility/StreamCallback.h4
-rw-r--r--lldb/include/lldb/Utility/StreamGDBRemote.h8
-rw-r--r--lldb/include/lldb/Utility/StreamString.h12
-rw-r--r--lldb/include/lldb/Utility/StringExtractor.h2
-rw-r--r--lldb/include/lldb/Utility/StringExtractorGDBRemote.h6
-rw-r--r--lldb/include/lldb/Utility/StringLexer.h6
-rw-r--r--lldb/include/lldb/Utility/StringList.h2
-rw-r--r--lldb/include/lldb/Utility/StructuredData.h12
-rw-r--r--lldb/include/lldb/Utility/Timer.h4
-rw-r--r--lldb/include/lldb/Utility/UserID.h4
-rw-r--r--lldb/include/lldb/Utility/VMRange.h6
-rw-r--r--lldb/source/API/SBData.cpp2
-rw-r--r--lldb/source/API/SBFileSpec.cpp2
-rw-r--r--lldb/source/Core/Address.cpp48
-rw-r--r--lldb/source/Core/AddressRange.cpp12
-rw-r--r--lldb/source/Core/AddressResolverFileLine.cpp20
-rw-r--r--lldb/source/Core/AddressResolverName.cpp28
-rw-r--r--lldb/source/Core/Broadcaster.cpp14
-rw-r--r--lldb/source/Core/Communication.cpp24
-rw-r--r--lldb/source/Core/Debugger.cpp52
-rw-r--r--lldb/source/Core/Disassembler.cpp34
-rw-r--r--lldb/source/Core/DumpDataExtractor.cpp34
-rw-r--r--lldb/source/Core/DynamicLoader.cpp14
-rw-r--r--lldb/source/Core/EmulateInstruction.cpp18
-rw-r--r--lldb/source/Core/Event.cpp6
-rw-r--r--lldb/source/Core/FileLineResolver.cpp8
-rw-r--r--lldb/source/Core/FileSpecList.cpp6
-rw-r--r--lldb/source/Core/FormatEntity.cpp54
-rw-r--r--lldb/source/Core/IOHandler.cpp36
-rw-r--r--lldb/source/Core/Listener.cpp10
-rw-r--r--lldb/source/Core/Module.cpp52
-rw-r--r--lldb/source/Core/ModuleList.cpp32
-rw-r--r--lldb/source/Core/Opcode.cpp6
-rw-r--r--lldb/source/Core/PluginManager.cpp18
-rw-r--r--lldb/source/Core/SearchFilter.cpp28
-rw-r--r--lldb/source/Core/Section.cpp14
-rw-r--r--lldb/source/Core/SourceManager.cpp24
-rw-r--r--lldb/source/Core/StreamAsynchronousIO.cpp2
-rw-r--r--lldb/source/Core/UserSettingsController.cpp2
-rw-r--r--lldb/source/Core/Value.cpp20
-rw-r--r--lldb/source/Core/ValueObject.cpp56
-rw-r--r--lldb/source/Core/ValueObjectCast.cpp4
-rw-r--r--lldb/source/Core/ValueObjectChild.cpp20
-rw-r--r--lldb/source/Core/ValueObjectConstResult.cpp8
-rw-r--r--lldb/source/Core/ValueObjectConstResultChild.cpp2
-rw-r--r--lldb/source/Core/ValueObjectConstResultImpl.cpp14
-rw-r--r--lldb/source/Core/ValueObjectDynamicValue.cpp12
-rw-r--r--lldb/source/Core/ValueObjectList.cpp8
-rw-r--r--lldb/source/Core/ValueObjectMemory.cpp16
-rw-r--r--lldb/source/Core/ValueObjectRegister.cpp20
-rw-r--r--lldb/source/Core/ValueObjectSyntheticFilter.cpp10
-rw-r--r--lldb/source/Core/ValueObjectVariable.cpp24
-rw-r--r--lldb/source/Host/common/File.cpp2
-rw-r--r--lldb/source/Host/common/TaskPool.cpp6
-rw-r--r--lldb/source/Host/linux/HostInfoLinux.cpp2
-rw-r--r--lldb/source/Host/windows/HostInfoWindows.cpp2
-rw-r--r--lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h2
-rw-r--r--lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp2
-rw-r--r--lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp3
-rw-r--r--lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp3
-rw-r--r--lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp2
-rw-r--r--lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp2
-rw-r--r--lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp2
-rw-r--r--lldb/source/Plugins/Process/Utility/ARMUtils.h2
-rw-r--r--lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp2
-rw-r--r--lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp4
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp2
-rw-r--r--lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h2
-rw-r--r--lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp2
-rw-r--r--lldb/source/Utility/ArchSpec.cpp10
-rw-r--r--lldb/source/Utility/ConstString.cpp18
-rw-r--r--lldb/source/Utility/DataBufferLLVM.cpp4
-rw-r--r--lldb/source/Utility/DataEncoder.cpp2
-rw-r--r--lldb/source/Utility/DataExtractor.cpp20
-rw-r--r--lldb/source/Utility/FileSpec.cpp16
-rw-r--r--lldb/source/Utility/JSON.cpp8
-rw-r--r--lldb/source/Utility/Log.cpp14
-rw-r--r--lldb/source/Utility/Logging.cpp4
-rw-r--r--lldb/source/Utility/RegisterValue.cpp16
-rw-r--r--lldb/source/Utility/Scalar.cpp2
-rw-r--r--lldb/source/Utility/SelectHelper.cpp10
-rw-r--r--lldb/source/Utility/Status.cpp14
-rw-r--r--lldb/source/Utility/Stream.cpp2
-rw-r--r--lldb/source/Utility/StreamGDBRemote.cpp4
-rw-r--r--lldb/source/Utility/StringExtractor.cpp4
-rw-r--r--lldb/source/Utility/StringExtractorGDBRemote.cpp2
-rw-r--r--lldb/source/Utility/StringList.cpp10
-rw-r--r--lldb/source/Utility/StructuredData.cpp6
-rw-r--r--lldb/source/Utility/TildeExpressionResolver.cpp10
-rw-r--r--lldb/source/Utility/Timer.cpp6
-rw-r--r--lldb/source/Utility/VASprintf.cpp10
-rw-r--r--lldb/source/Utility/VMRange.cpp10
-rw-r--r--lldb/tools/darwin-debug/darwin-debug.cpp2
-rw-r--r--lldb/tools/debugserver/source/RNBRemote.cpp2
-rw-r--r--lldb/tools/debugserver/source/debugserver.cpp4
-rw-r--r--lldb/tools/lldb-mi/MICmdBase.h2
-rw-r--r--lldb/tools/lldb-mi/MICmdCmdData.cpp4
-rw-r--r--lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp2
-rw-r--r--lldb/tools/lldb-mi/MICmnBase.cpp2
-rw-r--r--lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp6
-rw-r--r--lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp6
-rw-r--r--lldb/tools/lldb-mi/MICmnResources.cpp2
-rw-r--r--lldb/tools/lldb-mi/MICmnStreamStdin.cpp2
-rw-r--r--lldb/tools/lldb-mi/MIDataTypes.h2
-rw-r--r--lldb/tools/lldb-mi/MIDriverMain.cpp2
-rw-r--r--lldb/tools/lldb-mi/MIUtilFileStd.cpp2
-rw-r--r--lldb/tools/lldb-mi/MIUtilString.cpp12
168 files changed, 932 insertions, 936 deletions
diff --git a/lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp b/lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp
index 105251c9574..b414064109e 100644
--- a/lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp
+++ b/lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp
@@ -65,7 +65,7 @@
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <tr1/memory> // for std::tr1::shared_ptr
+#include <tr1/memory>
#include <unistd.h>
#include <vector>
diff --git a/lldb/include/lldb/Core/Address.h b/lldb/include/lldb/Core/Address.h
index e371f3e66a2..a02a0d45a08 100644
--- a/lldb/include/lldb/Core/Address.h
+++ b/lldb/include/lldb/Core/Address.h
@@ -10,13 +10,13 @@
#ifndef liblldb_Address_h_
#define liblldb_Address_h_
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h" // for SectionWP, SectionSP, ModuleSP
-#include "lldb/lldb-private-enumerations.h" // for AddressClass
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, UINT32_MAX, int64_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class Block;
diff --git a/lldb/include/lldb/Core/AddressRange.h b/lldb/include/lldb/Core/AddressRange.h
index 9f69c87ee35..e3c820782aa 100644
--- a/lldb/include/lldb/Core/AddressRange.h
+++ b/lldb/include/lldb/Core/AddressRange.h
@@ -11,10 +11,10 @@
#define liblldb_AddressRange_h_
#include "lldb/Core/Address.h"
-#include "lldb/lldb-forward.h" // for SectionSP
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
-#include <stddef.h> // for size_t
+#include <stddef.h>
namespace lldb_private {
class SectionList;
diff --git a/lldb/include/lldb/Core/AddressResolver.h b/lldb/include/lldb/Core/AddressResolver.h
index cfd103e0be0..32751d64d6b 100644
--- a/lldb/include/lldb/Core/AddressResolver.h
+++ b/lldb/include/lldb/Core/AddressResolver.h
@@ -12,9 +12,9 @@
#include "lldb/Core/AddressRange.h"
#include "lldb/Core/SearchFilter.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/lldb-defines.h"
-#include <stddef.h> // for size_t
+#include <stddef.h>
#include <vector>
namespace lldb_private {
diff --git a/lldb/include/lldb/Core/AddressResolverFileLine.h b/lldb/include/lldb/Core/AddressResolverFileLine.h
index 5d846e3be72..bee72245ee6 100644
--- a/lldb/include/lldb/Core/AddressResolverFileLine.h
+++ b/lldb/include/lldb/Core/AddressResolverFileLine.h
@@ -11,11 +11,11 @@
#define liblldb_AddressResolverFileLine_h_
#include "lldb/Core/AddressResolver.h"
-#include "lldb/Core/SearchFilter.h" // for Searcher, Searcher::CallbackR...
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/Core/SearchFilter.h"
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/lldb-defines.h"
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
namespace lldb_private {
class Address;
diff --git a/lldb/include/lldb/Core/AddressResolverName.h b/lldb/include/lldb/Core/AddressResolverName.h
index ec8cf6d18d5..b4291938b29 100644
--- a/lldb/include/lldb/Core/AddressResolverName.h
+++ b/lldb/include/lldb/Core/AddressResolverName.h
@@ -11,10 +11,10 @@
#define liblldb_AddressResolverName_h_
#include "lldb/Core/AddressResolver.h"
-#include "lldb/Core/SearchFilter.h" // for Searcher, Searcher::Call...
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Core/SearchFilter.h"
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/RegularExpression.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/lldb-defines.h"
namespace lldb_private {
class Address;
diff --git a/lldb/include/lldb/Core/Broadcaster.h b/lldb/include/lldb/Core/Broadcaster.h
index 4851007c9a2..bf2b84d8e19 100644
--- a/lldb/include/lldb/Core/Broadcaster.h
+++ b/lldb/include/lldb/Core/Broadcaster.h
@@ -11,18 +11,18 @@
#define liblldb_Broadcaster_h_
#include "lldb/Utility/ConstString.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for ListenerSP, EventSP, Broadcast...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
#include "llvm/ADT/SmallVector.h"
-#include <cstdint> // for uint32_t, UINT32_MAX
+#include <cstdint>
#include <map>
-#include <memory> // for shared_ptr, operator==, enable...
+#include <memory>
#include <mutex>
-#include <set> // for set
+#include <set>
#include <string>
-#include <utility> // for pair
+#include <utility>
#include <vector>
namespace lldb_private {
diff --git a/lldb/include/lldb/Core/Communication.h b/lldb/include/lldb/Core/Communication.h
index 3e29307039e..0d5b2842032 100644
--- a/lldb/include/lldb/Core/Communication.h
+++ b/lldb/include/lldb/Core/Communication.h
@@ -13,18 +13,18 @@
#include "lldb/Core/Broadcaster.h"
#include "lldb/Host/HostThread.h"
#include "lldb/Utility/Timeout.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ConnectionStatus, FLAGS_ANONYMOU...
-#include "lldb/lldb-forward.h" // for ConnectionSP
-#include "lldb/lldb-types.h" // for thread_arg_t, thread_result_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
#include <atomic>
#include <mutex>
-#include <ratio> // for micro
+#include <ratio>
#include <string>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint8_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class Connection;
diff --git a/lldb/include/lldb/Core/Debugger.h b/lldb/include/lldb/Core/Debugger.h
index 3da8ea14825..82ad61dbd96 100644
--- a/lldb/include/lldb/Core/Debugger.h
+++ b/lldb/include/lldb/Core/Debugger.h
@@ -26,28 +26,28 @@
#include "lldb/Core/UserSettingsController.h"
#include "lldb/Host/HostThread.h"
#include "lldb/Host/Terminal.h"
-#include "lldb/Target/ExecutionContext.h" // for ExecutionContext
+#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Platform.h"
#include "lldb/Target/TargetList.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/Utility/Status.h"
#include "lldb/Utility/UserID.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ScriptLanguage, Langua...
-#include "lldb/lldb-forward.h" // for StreamFileSP, DebuggerSP
-#include "lldb/lldb-private-enumerations.h" // for VarSetOperationType
-#include "lldb/lldb-private-types.h" // for LoadPluginCallbackType
-#include "lldb/lldb-types.h" // for LogOutputCallback, thr...
-
-#include "llvm/ADT/ArrayRef.h" // for ArrayRef
-#include "llvm/ADT/StringMap.h" // for StringMap
-#include "llvm/ADT/StringRef.h" // for StringRef
-#include "llvm/Support/DynamicLibrary.h" // for DynamicLibrary
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-private-types.h"
+#include "lldb/lldb-types.h"
+
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Support/Threading.h"
-#include <assert.h> // for assert
-#include <stddef.h> // for size_t
+#include <assert.h>
+#include <stddef.h>
#include <stdio.h>
namespace lldb_private {
diff --git a/lldb/include/lldb/Core/Disassembler.h b/lldb/include/lldb/Core/Disassembler.h
index ef1f2ee54dd..7cec837e71f 100644
--- a/lldb/include/lldb/Core/Disassembler.h
+++ b/lldb/include/lldb/Core/Disassembler.h
@@ -12,32 +12,32 @@
#include "lldb/Core/Address.h"
#include "lldb/Core/EmulateInstruction.h"
-#include "lldb/Core/FormatEntity.h" // for FormatEntity
+#include "lldb/Core/FormatEntity.h"
#include "lldb/Core/Opcode.h"
#include "lldb/Core/PluginInterface.h"
#include "lldb/Interpreter/OptionValue.h"
#include "lldb/Symbol/LineEntry.h"
-#include "lldb/Target/ExecutionContext.h" // for ExecutionContext
+#include "lldb/Target/ExecutionContext.h"
#include "lldb/Utility/ArchSpec.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/FileSpec.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for InstructionSP, DisassemblerSP
-#include "lldb/lldb-private-enumerations.h" // for AddressClass
-#include "lldb/lldb-types.h" // for addr_t, offset_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
-#include <functional> // for function
+#include <functional>
#include <map>
-#include <memory> // for enable_shared_from_this
+#include <memory>
#include <set>
#include <string>
#include <vector>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, int64_t
-#include <stdio.h> // for FILE
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
namespace lldb_private {
class AddressRange;
diff --git a/lldb/include/lldb/Core/DumpDataExtractor.h b/lldb/include/lldb/Core/DumpDataExtractor.h
index 46e676c239d..88446d48fa6 100644
--- a/lldb/include/lldb/Core/DumpDataExtractor.h
+++ b/lldb/include/lldb/Core/DumpDataExtractor.h
@@ -10,11 +10,11 @@
#ifndef LLDB_CORE_DUMPDATAEXTRACTOR_H
#define LLDB_CORE_DUMPDATAEXTRACTOR_H
-#include "lldb/lldb-enumerations.h" // for Format
+#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-types.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/include/lldb/Core/EmulateInstruction.h b/lldb/include/lldb/Core/EmulateInstruction.h
index 5d23bcd7b96..5198f3eac92 100644
--- a/lldb/include/lldb/Core/EmulateInstruction.h
+++ b/lldb/include/lldb/Core/EmulateInstruction.h
@@ -12,18 +12,18 @@
#include <string>
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
#include "lldb/Core/Opcode.h"
#include "lldb/Core/PluginInterface.h"
#include "lldb/Utility/ArchSpec.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for RegisterKind, ByteOrder
-#include "lldb/lldb-private-enumerations.h" // for InstructionType
-#include "lldb/lldb-private-types.h" // for RegisterInfo
-#include "lldb/lldb-types.h" // for addr_t
-
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t, int64_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-private-types.h"
+#include "lldb/lldb-types.h"
+
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class OptionValueDictionary;
}
diff --git a/lldb/include/lldb/Core/Event.h b/lldb/include/lldb/Core/Event.h
index f9c5179682e..2a61b7a8861 100644
--- a/lldb/include/lldb/Core/Event.h
+++ b/lldb/include/lldb/Core/Event.h
@@ -14,17 +14,17 @@
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Predicate.h"
#include "lldb/Utility/StructuredData.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for EventDataSP, ProcessSP, Struct...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
#include <chrono>
#include <memory>
#include <string>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class Event;
diff --git a/lldb/include/lldb/Core/FileLineResolver.h b/lldb/include/lldb/Core/FileLineResolver.h
index 61a06d499fe..6de99bc0c4d 100644
--- a/lldb/include/lldb/Core/FileLineResolver.h
+++ b/lldb/include/lldb/Core/FileLineResolver.h
@@ -10,12 +10,12 @@
#ifndef liblldb_FileLineResolver_h_
#define liblldb_FileLineResolver_h_
-#include "lldb/Core/SearchFilter.h" // for Searcher, Searcher::CallbackR...
+#include "lldb/Core/SearchFilter.h"
#include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/lldb-defines.h"
-#include <stdint.h> // for uint32_t, UINT32_MAX
+#include <stdint.h>
namespace lldb_private {
class Address;
diff --git a/lldb/include/lldb/Core/FileSpecList.h b/lldb/include/lldb/Core/FileSpecList.h
index 713ed2aaffc..db6490ef713 100644
--- a/lldb/include/lldb/Core/FileSpecList.h
+++ b/lldb/include/lldb/Core/FileSpecList.h
@@ -15,7 +15,7 @@
#include <vector>
-#include <stddef.h> // for size_t
+#include <stddef.h>
namespace lldb_private {
class Stream;
diff --git a/lldb/include/lldb/Core/FormatEntity.h b/lldb/include/lldb/Core/FormatEntity.h
index 7090ee9c58e..b58f3b104e4 100644
--- a/lldb/include/lldb/Core/FormatEntity.h
+++ b/lldb/include/lldb/Core/FormatEntity.h
@@ -11,13 +11,13 @@
#define liblldb_FormatEntity_h_
#include "lldb/Utility/CompletionRequest.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Status.h"
-#include "lldb/lldb-enumerations.h" // for Format::eFormatDefault, Format
-#include "lldb/lldb-types.h" // for addr_t
-#include <algorithm> // for min
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-types.h"
+#include <algorithm>
+#include <stddef.h>
+#include <stdint.h>
#include <string>
#include <vector>
diff --git a/lldb/include/lldb/Core/IOHandler.h b/lldb/include/lldb/Core/IOHandler.h
index d3d0b6abccb..4bd577390b2 100644
--- a/lldb/include/lldb/Core/IOHandler.h
+++ b/lldb/include/lldb/Core/IOHandler.h
@@ -16,17 +16,17 @@
#include "lldb/Utility/Predicate.h"
#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StringList.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for IOHandlerSP, StreamFileSP
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "llvm/ADT/StringRef.h"
#include <memory>
#include <mutex>
#include <string>
#include <vector>
-#include <stdint.h> // for uint32_t
-#include <stdio.h> // for FILE
+#include <stdint.h>
+#include <stdio.h>
namespace lldb_private {
class Debugger;
diff --git a/lldb/include/lldb/Core/Listener.h b/lldb/include/lldb/Core/Listener.h
index 3d12f8fb339..5f8d5def016 100644
--- a/lldb/include/lldb/Core/Listener.h
+++ b/lldb/include/lldb/Core/Listener.h
@@ -10,22 +10,22 @@
#ifndef liblldb_Select_h_
#define liblldb_Select_h_
-#include "lldb/Core/Broadcaster.h" // for Broadcaster::BroadcasterImplWP
+#include "lldb/Core/Broadcaster.h"
#include "lldb/Utility/Timeout.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for BroadcasterManagerWP, EventSP
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
#include <condition_variable>
#include <list>
#include <map>
-#include <memory> // for owner_less, enable_shared_from_this
+#include <memory>
#include <mutex>
-#include <ratio> // for micro
+#include <ratio>
#include <string>
#include <vector>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class ConstString;
diff --git a/lldb/include/lldb/Core/Module.h b/lldb/include/lldb/Core/Module.h
index d759e709525..86502ad3c1b 100644
--- a/lldb/include/lldb/Core/Module.h
+++ b/lldb/include/lldb/Core/Module.h
@@ -10,31 +10,31 @@
#ifndef liblldb_Module_h_
#define liblldb_Module_h_
-#include "lldb/Core/Address.h" // for Address
-#include "lldb/Core/ModuleSpec.h" // for ModuleSpec
-#include "lldb/Symbol/ObjectFile.h" // for ObjectFile
+#include "lldb/Core/Address.h"
+#include "lldb/Core/ModuleSpec.h"
+#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContextScope.h"
#include "lldb/Symbol/TypeSystem.h"
#include "lldb/Target/PathMappingList.h"
#include "lldb/Utility/ArchSpec.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/FileSpec.h"
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/Status.h"
#include "lldb/Utility/UUID.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for LanguageType, SymbolType
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-forward.h"
-#include "lldb/lldb-types.h" // for addr_t, offset_t
+#include "lldb/lldb-types.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Chrono.h"
#include <atomic>
-#include <memory> // for enable_shared_from_this
+#include <memory>
#include <mutex>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
#include <string>
#include <vector>
diff --git a/lldb/include/lldb/Core/ModuleList.h b/lldb/include/lldb/Core/ModuleList.h
index 856639d0479..c1c2c78680c 100644
--- a/lldb/include/lldb/Core/ModuleList.h
+++ b/lldb/include/lldb/Core/ModuleList.h
@@ -10,12 +10,12 @@
#ifndef liblldb_ModuleList_h_
#define liblldb_ModuleList_h_
-#include "lldb/Core/Address.h" // for Address
-#include "lldb/Core/ModuleSpec.h" // for ModuleSpec
+#include "lldb/Core/Address.h"
+#include "lldb/Core/ModuleSpec.h"
#include "lldb/Core/UserSettingsController.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Iterable.h"
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/Status.h"
#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-forward.h"
#include "lldb/lldb-types.h"
@@ -27,8 +27,8 @@
#include <mutex>
#include <vector>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class ConstString;
diff --git a/lldb/include/lldb/Core/Opcode.h b/lldb/include/lldb/Core/Opcode.h
index 33857457b2c..fb6cc825abd 100644
--- a/lldb/include/lldb/Core/Opcode.h
+++ b/lldb/include/lldb/Core/Opcode.h
@@ -11,12 +11,12 @@
#define lldb_Opcode_h
#include "lldb/Utility/Endian.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder, ByteOrder::eByteOrde...
+#include "lldb/lldb-enumerations.h"
#include "llvm/Support/MathExtras.h"
-#include <assert.h> // for assert
-#include <stdint.h> // for uint32_t, uint8_t, uint16_t
+#include <assert.h>
+#include <stdint.h>
#include <string.h>
namespace lldb_private {
diff --git a/lldb/include/lldb/Core/PluginManager.h b/lldb/include/lldb/Core/PluginManager.h
index b782294f1f6..598ee9a8d8e 100644
--- a/lldb/include/lldb/Core/PluginManager.h
+++ b/lldb/include/lldb/Core/PluginManager.h
@@ -12,14 +12,14 @@
#include "lldb/Core/Architecture.h"
#include "lldb/Utility/FileSpec.h"
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-enumerations.h" // for ScriptLanguage
-#include "lldb/lldb-forward.h" // for OptionValuePropertiesSP
-#include "lldb/lldb-private-interfaces.h" // for DebuggerInitializeCallback
-#include "llvm/ADT/StringRef.h" // for StringRef
-
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-interfaces.h"
+#include "llvm/ADT/StringRef.h"
+
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class CommandInterpreter;
diff --git a/lldb/include/lldb/Core/SearchFilter.h b/lldb/include/lldb/Core/SearchFilter.h
index 57b383103da..f53ef658fd3 100644
--- a/lldb/include/lldb/Core/SearchFilter.h
+++ b/lldb/include/lldb/Core/SearchFilter.h
@@ -13,10 +13,10 @@
#include "lldb/Core/FileSpecList.h"
#include "lldb/Utility/StructuredData.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/lldb-forward.h" // for SearchFilterSP, TargetSP, Modu...
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/lldb-forward.h"
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
namespace lldb_private {
class Address;
diff --git a/lldb/include/lldb/Core/Section.h b/lldb/include/lldb/Core/Section.h
index 8e275ce3199..4157bb877b4 100644
--- a/lldb/include/lldb/Core/Section.h
+++ b/lldb/include/lldb/Core/Section.h
@@ -14,16 +14,16 @@
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Flags.h"
#include "lldb/Utility/UserID.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for SectionType
-#include "lldb/lldb-forward.h" // for SectionSP, ModuleSP, SectionWP
-#include "lldb/lldb-types.h" // for addr_t, offset_t, user_id_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
-#include <memory> // for enable_shared_from_this
-#include <vector> // for vector
+#include <memory>
+#include <vector>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, UINT32_MAX
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class Address;
diff --git a/lldb/include/lldb/Core/SourceManager.h b/lldb/include/lldb/Core/SourceManager.h
index 06ff74bd276..d31ba037c5d 100644
--- a/lldb/include/lldb/Core/SourceManager.h
+++ b/lldb/include/lldb/Core/SourceManager.h
@@ -11,16 +11,16 @@
#define liblldb_SourceManager_h_
#include "lldb/Utility/FileSpec.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for DebuggerSP, DebuggerWP, DataBufferSP
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
#include "llvm/Support/Chrono.h"
-#include <cstdint> // for uint32_t, UINT32_MAX
+#include <cstdint>
#include <map>
#include <memory>
-#include <stddef.h> // for size_t
-#include <string> // for string
+#include <stddef.h>
+#include <string>
#include <vector>
namespace lldb_private {
diff --git a/lldb/include/lldb/Core/StreamAsynchronousIO.h b/lldb/include/lldb/Core/StreamAsynchronousIO.h
index 8791315dbeb..89667be0587 100644
--- a/lldb/include/lldb/Core/StreamAsynchronousIO.h
+++ b/lldb/include/lldb/Core/StreamAsynchronousIO.h
@@ -14,7 +14,7 @@
#include <string>
-#include <stddef.h> // for size_t
+#include <stddef.h>
namespace lldb_private {
class Debugger;
diff --git a/lldb/include/lldb/Core/StreamFile.h b/lldb/include/lldb/Core/StreamFile.h
index 250876bdefb..86db3e4ae48 100644
--- a/lldb/include/lldb/Core/StreamFile.h
+++ b/lldb/include/lldb/Core/StreamFile.h
@@ -12,11 +12,11 @@
#include "lldb/Host/File.h"
#include "lldb/Utility/Stream.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for FilePermissions::eFilePermission...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
-#include <stdint.h> // for uint32_t
-#include <stdio.h> // for size_t, FILE
+#include <stdint.h>
+#include <stdio.h>
namespace lldb_private {
diff --git a/lldb/include/lldb/Core/UserSettingsController.h b/lldb/include/lldb/Core/UserSettingsController.h
index aefd42e751a..350b5babb47 100644
--- a/lldb/include/lldb/Core/UserSettingsController.h
+++ b/lldb/include/lldb/Core/UserSettingsController.h
@@ -10,16 +10,16 @@
#ifndef liblldb_UserSettingsController_h_
#define liblldb_UserSettingsController_h_
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-forward.h" // for OptionValuePropertiesSP
-#include "lldb/lldb-private-enumerations.h" // for VarSetOperationType
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
#include <vector>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class CommandInterpreter;
diff --git a/lldb/include/lldb/Core/Value.h b/lldb/include/lldb/Core/Value.h
index fbb58d7ce69..249adb24fbc 100644
--- a/lldb/include/lldb/Core/Value.h
+++ b/lldb/include/lldb/Core/Value.h
@@ -14,16 +14,16 @@
#include "lldb/Utility/DataBufferHeap.h"
#include "lldb/Utility/Scalar.h"
#include "lldb/Utility/Status.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder, ByteOrder::eB...
-#include "lldb/lldb-private-enumerations.h" // for AddressType
-#include "lldb/lldb-private-types.h" // for type128, RegisterInfo
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-private-types.h"
-#include "llvm/ADT/APInt.h" // for APInt
+#include "llvm/ADT/APInt.h"
#include <vector>
-#include <stdint.h> // for uint8_t, uint32_t, uint64_t
-#include <string.h> // for size_t, memcpy
+#include <stdint.h>
+#include <string.h>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/Core/ValueObject.h
index fddc0641319..856156a75f2 100644
--- a/lldb/include/lldb/Core/ValueObject.h
+++ b/lldb/include/lldb/Core/ValueObject.h
@@ -12,7 +12,7 @@
#include "lldb/Core/Value.h"
#include "lldb/Symbol/CompilerType.h"
-#include "lldb/Symbol/Type.h" // for TypeImpl
+#include "lldb/Symbol/Type.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Process.h"
#include "lldb/Utility/ConstString.h"
@@ -20,26 +20,26 @@
#include "lldb/Utility/SharedCluster.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/UserID.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID...
-#include "lldb/lldb-enumerations.h" // for DynamicValue...
-#include "lldb/lldb-forward.h" // for ValueObjectSP
-#include "lldb/lldb-private-enumerations.h" // for AddressType
-#include "lldb/lldb-types.h" // for addr_t, offs...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
#include <functional>
#include <initializer_list>
#include <map>
-#include <mutex> // for recursive_mutex
-#include <string> // for string
-#include <utility> // for pair
+#include <mutex>
+#include <string>
+#include <utility>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class Declaration;
}
diff --git a/lldb/include/lldb/Core/ValueObjectCast.h b/lldb/include/lldb/Core/ValueObjectCast.h
index aaa1ecb67db..34814d9b17b 100644
--- a/lldb/include/lldb/Core/ValueObjectCast.h
+++ b/lldb/include/lldb/Core/ValueObjectCast.h
@@ -11,13 +11,13 @@
#define liblldb_ValueObjectCast_h_
#include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ValueType
-#include "lldb/lldb-forward.h" // for ValueObjectSP
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class ConstString;
diff --git a/lldb/include/lldb/Core/ValueObjectChild.h b/lldb/include/lldb/Core/ValueObjectChild.h
index ec8c9e805cd..6800775dc8f 100644
--- a/lldb/include/lldb/Core/ValueObjectChild.h
+++ b/lldb/include/lldb/Core/ValueObjectChild.h
@@ -12,17 +12,17 @@
#include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ValueType
-#include "lldb/lldb-private-enumerations.h" // for LazyBool, AddressType
-#include "lldb/lldb-types.h" // for offset_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
#include "llvm/ADT/Optional.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t, int32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
diff --git a/lldb/include/lldb/Core/ValueObjectConstResult.h b/lldb/include/lldb/Core/ValueObjectConstResult.h
index 1f56129df24..c1c56d8dcb2 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResult.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResult.h
@@ -10,20 +10,20 @@
#ifndef liblldb_ValueObjectConstResult_h_
#define liblldb_ValueObjectConstResult_h_
-#include "lldb/Core/Value.h" // for Value
+#include "lldb/Core/Value.h"
#include "lldb/Core/ValueObject.h"
#include "lldb/Core/ValueObjectConstResultImpl.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-enumerations.h" // for ByteOrder, Dynamic...
-#include "lldb/lldb-forward.h" // for ValueObjectSP, Dat...
-#include "lldb/lldb-private-enumerations.h" // for AddressType, Addre...
-#include "lldb/lldb-types.h" // for addr_t
-
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
+
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/include/lldb/Core/ValueObjectConstResultCast.h b/lldb/include/lldb/Core/ValueObjectConstResultCast.h
index 442cce42085..bb2b4e6f092 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResultCast.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultCast.h
@@ -12,14 +12,14 @@
#include "lldb/Core/ValueObjectCast.h"
#include "lldb/Core/ValueObjectConstResultImpl.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_...
-#include "lldb/lldb-forward.h" // for ValueObjectSP
-#include "lldb/lldb-types.h" // for addr_t
-
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, int32_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
+
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/include/lldb/Core/ValueObjectConstResultChild.h b/lldb/include/lldb/Core/ValueObjectConstResultChild.h
index a74da0013ab..9ff62d167ef 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResultChild.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultChild.h
@@ -12,14 +12,14 @@
#include "lldb/Core/ValueObjectChild.h"
#include "lldb/Core/ValueObjectConstResultImpl.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_...
-#include "lldb/lldb-forward.h" // for ValueObjectSP
-#include "lldb/lldb-types.h" // for addr_t
-
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, int32_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
+
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class DataExtractor;
}
diff --git a/lldb/include/lldb/Core/ValueObjectConstResultImpl.h b/lldb/include/lldb/Core/ValueObjectConstResultImpl.h
index d86f25e3057..5ea47bb3b3f 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResultImpl.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultImpl.h
@@ -10,14 +10,14 @@
#ifndef liblldb_ValueObjectConstResultImpl_h_
#define liblldb_ValueObjectConstResultImpl_h_
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h" // for ValueObjectSP
-#include "lldb/lldb-private-enumerations.h" // for AddressType, AddressType...
-#include "lldb/lldb-types.h" // for addr_t
-
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, int32_t
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
+
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class CompilerType;
}
diff --git a/lldb/include/lldb/Core/ValueObjectDynamicValue.h b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
index 018ee2c764b..0c9ec8cce06 100644
--- a/lldb/include/lldb/Core/ValueObjectDynamicValue.h
+++ b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
@@ -10,20 +10,20 @@
#ifndef liblldb_ValueObjectDynamicValue_h_
#define liblldb_ValueObjectDynamicValue_h_
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
#include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/Type.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/SharingPtr.h" // for operator==
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for DynamicValueType, Langua...
-#include "lldb/lldb-forward.h" // for ValueObjectSP, VariableSP
-#include "lldb/lldb-private-enumerations.h" // for LazyBool, LazyBool::eLaz...
-
-#include <assert.h> // for assert
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint64_t, uint32_t
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/SharingPtr.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/include/lldb/Core/ValueObjectList.h b/lldb/include/lldb/Core/ValueObjectList.h
index a0d2e681ded..d17510f7f58 100644
--- a/lldb/include/lldb/Core/ValueObjectList.h
+++ b/lldb/include/lldb/Core/ValueObjectList.h
@@ -10,12 +10,12 @@
#ifndef liblldb_ValueObjectList_h_
#define liblldb_ValueObjectList_h_
-#include "lldb/lldb-forward.h" // for ValueObjectSP
-#include "lldb/lldb-types.h" // for user_id_t
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
#include <vector>
-#include <stddef.h> // for size_t
+#include <stddef.h>
namespace lldb_private {
class ValueObject;
diff --git a/lldb/include/lldb/Core/ValueObjectMemory.h b/lldb/include/lldb/Core/ValueObjectMemory.h
index 8bb649cc3c5..c4b946af98c 100644
--- a/lldb/include/lldb/Core/ValueObjectMemory.h
+++ b/lldb/include/lldb/Core/ValueObjectMemory.h
@@ -10,17 +10,17 @@
#ifndef liblldb_ValueObjectMemory_h_
#define liblldb_ValueObjectMemory_h_
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
#include "lldb/Core/ValueObject.h"
#include "lldb/Symbol/CompilerType.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ValueType
-#include "lldb/lldb-forward.h" // for TypeSP, ValueObjectSP, ModuleSP
-#include "llvm/ADT/StringRef.h" // for StringRef
-
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "llvm/ADT/StringRef.h"
+
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class ExecutionContextScope;
diff --git a/lldb/include/lldb/Core/ValueObjectRegister.h b/lldb/include/lldb/Core/ValueObjectRegister.h
index 86310bd545b..fb10c259e7d 100644
--- a/lldb/include/lldb/Core/ValueObjectRegister.h
+++ b/lldb/include/lldb/Core/ValueObjectRegister.h
@@ -11,16 +11,16 @@
#define liblldb_ValueObjectRegister_h_
#include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/RegisterValue.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ValueType, ValueType::eValueTy...
-#include "lldb/lldb-forward.h" // for RegisterContextSP, ValueObjectSP
-#include "lldb/lldb-private-types.h" // for RegisterInfo, RegisterSet (ptr...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-types.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t, int32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
index b3af6c0ae82..9495d4ca5e2 100644
--- a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
+++ b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
@@ -13,17 +13,17 @@
#include "lldb/Core/ThreadSafeSTLMap.h"
#include "lldb/Core/ThreadSafeSTLVector.h"
#include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h" // for ThreadSafeSTLMap::operator=
-#include "lldb/lldb-enumerations.h" // for DynamicValueType, Langua...
-#include "lldb/lldb-forward.h" // for ValueObjectSP, Synthetic...
-#include "lldb/lldb-private-enumerations.h" // for LazyBool, LazyBool::eLaz...
-
-#include <cstdint> // for uint32_t, uint64_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+
+#include <cstdint>
#include <memory>
-#include <stddef.h> // for size_t
+#include <stddef.h>
namespace lldb_private {
class Declaration;
diff --git a/lldb/include/lldb/Core/ValueObjectVariable.h b/lldb/include/lldb/Core/ValueObjectVariable.h
index 9dd140a84f4..81a8eabdacb 100644
--- a/lldb/include/lldb/Core/ValueObjectVariable.h
+++ b/lldb/include/lldb/Core/ValueObjectVariable.h
@@ -12,15 +12,15 @@
#include "lldb/Core/ValueObject.h"
-#include "lldb/Core/Value.h" // for Value
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ValueType
-#include "lldb/lldb-forward.h" // for VariableSP, ModuleSP, ValueObj...
-
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include "lldb/Core/Value.h"
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/include/lldb/Host/TaskPool.h b/lldb/include/lldb/Host/TaskPool.h
index fe171415107..4001d187a2a 100644
--- a/lldb/include/lldb/Host/TaskPool.h
+++ b/lldb/include/lldb/Host/TaskPool.h
@@ -11,12 +11,12 @@
#define utility_TaskPool_h_
#include "llvm/ADT/STLExtras.h"
-#include <functional> // for bind, function
+#include <functional>
#include <future>
#include <list>
-#include <memory> // for make_shared
-#include <mutex> // for mutex, unique_lock, condition_variable
-#include <type_traits> // for forward, result_of, move
+#include <memory>
+#include <mutex>
+#include <type_traits>
namespace lldb_private {
diff --git a/lldb/include/lldb/Target/DynamicLoader.h b/lldb/include/lldb/Target/DynamicLoader.h
index de9c4e233b0..9e22289badf 100644
--- a/lldb/include/lldb/Target/DynamicLoader.h
+++ b/lldb/include/lldb/Target/DynamicLoader.h
@@ -12,16 +12,16 @@
// Project includes
#include "lldb/Core/PluginInterface.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/UUID.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h" // for ModuleSP, ThreadPlanSP
-#include "lldb/lldb-private-enumerations.h" // for LazyBool, LazyBool::eLaz...
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for int64_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class ModuleList;
}
diff --git a/lldb/include/lldb/Utility/ArchSpec.h b/lldb/include/lldb/Utility/ArchSpec.h
index 680e9b1b9ea..c13b4f70b57 100644
--- a/lldb/include/lldb/Utility/ArchSpec.h
+++ b/lldb/include/lldb/Utility/ArchSpec.h
@@ -15,11 +15,11 @@
#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-forward.h"
#include "lldb/lldb-private-enumerations.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Triple.h"
-#include <cstddef> // for size_t
-#include <cstdint> // for uint32_t
-#include <string> // for string
+#include <cstddef>
+#include <cstdint>
+#include <string>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/Baton.h b/lldb/include/lldb/Utility/Baton.h
index 59999e4697f..7477846be48 100644
--- a/lldb/include/lldb/Utility/Baton.h
+++ b/lldb/include/lldb/Utility/Baton.h
@@ -10,10 +10,10 @@
#ifndef lldb_Baton_h_
#define lldb_Baton_h_
-#include "lldb/lldb-enumerations.h" // for DescriptionLevel
+#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-public.h"
-#include <memory> // for unique_ptr
+#include <memory>
namespace lldb_private {
class Stream;
diff --git a/lldb/include/lldb/Utility/Connection.h b/lldb/include/lldb/Utility/Connection.h
index 1b0801378f8..074b44b3686 100644
--- a/lldb/include/lldb/Utility/Connection.h
+++ b/lldb/include/lldb/Utility/Connection.h
@@ -10,16 +10,16 @@
#ifndef liblldb_Connection_h_
#define liblldb_Connection_h_
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ConnectionStatus
-#include "lldb/lldb-forward.h" // for IOObjectSP
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
-#include <ratio> // for micro
+#include <ratio>
#include <string>
-#include <stddef.h> // for size_t
+#include <stddef.h>
namespace lldb_private {
class Status;
diff --git a/lldb/include/lldb/Utility/ConstString.h b/lldb/include/lldb/Utility/ConstString.h
index db9256f588e..41f6717edee 100644
--- a/lldb/include/lldb/Utility/ConstString.h
+++ b/lldb/include/lldb/Utility/ConstString.h
@@ -11,9 +11,9 @@
#define liblldb_ConstString_h_
#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/FormatVariadic.h" // for format_provider
+#include "llvm/Support/FormatVariadic.h"
-#include <stddef.h> // for size_t
+#include <stddef.h>
namespace lldb_private {
class Stream;
diff --git a/lldb/include/lldb/Utility/DataBufferHeap.h b/lldb/include/lldb/Utility/DataBufferHeap.h
index 59c3f64a422..5a1e98803f0 100644
--- a/lldb/include/lldb/Utility/DataBufferHeap.h
+++ b/lldb/include/lldb/Utility/DataBufferHeap.h
@@ -11,10 +11,10 @@
#define liblldb_DataBufferHeap_h_
#include "lldb/Utility/DataBuffer.h"
-#include "lldb/lldb-types.h" // for offset_t
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/lldb-types.h"
+#include "llvm/ADT/StringRef.h"
-#include <cstdint> // for uint8_t, uint64_t
+#include <cstdint>
#include <vector>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/DataBufferLLVM.h b/lldb/include/lldb/Utility/DataBufferLLVM.h
index 533b7777083..947ddb54da4 100644
--- a/lldb/include/lldb/Utility/DataBufferLLVM.h
+++ b/lldb/include/lldb/Utility/DataBufferLLVM.h
@@ -11,10 +11,10 @@
#define LLDB_CORE_DATABUFFERLLVM_H
#include "lldb/Utility/DataBuffer.h"
-#include "lldb/lldb-types.h" // for offset_t
+#include "lldb/lldb-types.h"
#include <memory>
-#include <stdint.h> // for uint8_t, uint64_t
+#include <stdint.h>
namespace llvm {
class WritableMemoryBuffer;
diff --git a/lldb/include/lldb/Utility/DataEncoder.h b/lldb/include/lldb/Utility/DataEncoder.h
index c1214705c72..b1ee5a59998 100644
--- a/lldb/include/lldb/Utility/DataEncoder.h
+++ b/lldb/include/lldb/Utility/DataEncoder.h
@@ -12,12 +12,12 @@
#if defined(__cplusplus)
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ByteOrder
-#include "lldb/lldb-forward.h" // for DataBufferSP
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
-#include <stddef.h> // for size_t
+#include <stddef.h>
#include <stdint.h>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/DataExtractor.h b/lldb/include/lldb/Utility/DataExtractor.h
index 50c88db8e35..b7debefcb15 100644
--- a/lldb/include/lldb/Utility/DataExtractor.h
+++ b/lldb/include/lldb/Utility/DataExtractor.h
@@ -11,8 +11,8 @@
#define LLDB_UTILITY_DATAEXTRACTOR_H
#include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder
-#include "lldb/lldb-forward.h" // for DataBufferSP
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
#include "lldb/lldb-types.h"
#include <cassert>
diff --git a/lldb/include/lldb/Utility/FileSpec.h b/lldb/include/lldb/Utility/FileSpec.h
index 232ecda5edb..fdb474ae8cc 100644
--- a/lldb/include/lldb/Utility/FileSpec.h
+++ b/lldb/include/lldb/Utility/FileSpec.h
@@ -24,8 +24,8 @@
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/Path.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
class Stream;
diff --git a/lldb/include/lldb/Utility/Log.h b/lldb/include/lldb/Utility/Log.h
index 62776bdb281..30b97f0137e 100644
--- a/lldb/include/lldb/Utility/Log.h
+++ b/lldb/include/lldb/Utility/Log.h
@@ -15,8 +15,8 @@
#include "lldb/lldb-defines.h"
#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringMap.h" // for StringMap
-#include "llvm/ADT/StringRef.h" // for StringRef, StringLiteral
+#include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/ManagedStatic.h"
@@ -25,9 +25,9 @@
#include <atomic>
#include <cstdarg>
#include <cstdint>
-#include <memory> // for shared_ptr
-#include <string> // for string
-#include <type_traits> // for forward
+#include <memory>
+#include <string>
+#include <type_traits>
namespace llvm {
class raw_ostream;
diff --git a/lldb/include/lldb/Utility/RegisterValue.h b/lldb/include/lldb/Utility/RegisterValue.h
index 015747a1df9..c025a26fb25 100644
--- a/lldb/include/lldb/Utility/RegisterValue.h
+++ b/lldb/include/lldb/Utility/RegisterValue.h
@@ -12,12 +12,12 @@
#include "lldb/Utility/Endian.h"
#include "lldb/Utility/Scalar.h"
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-enumerations.h" // for ByteOrder, Format
-#include "lldb/lldb-types.h" // for offset_t
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-types.h"
#include "llvm/ADT/APInt.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
-#include <cstdint> // for uint32_t, uint8_t, uint64_t, uin...
+#include "llvm/ADT/StringRef.h"
+#include <cstdint>
#include <cstring>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/RegularExpression.h b/lldb/include/lldb/Utility/RegularExpression.h
index 6048fcc610a..b379c6e8bea 100644
--- a/lldb/include/lldb/Utility/RegularExpression.h
+++ b/lldb/include/lldb/Utility/RegularExpression.h
@@ -40,7 +40,7 @@ inline void regfree(llvm_regex_t *a) { llvm_regfree(a); }
#include <string>
#include <vector>
-#include <stddef.h> // for size_t
+#include <stddef.h>
#include <stdint.h>
namespace llvm {
diff --git a/lldb/include/lldb/Utility/Scalar.h b/lldb/include/lldb/Utility/Scalar.h
index 74c9b879b20..c23b2f8be25 100644
--- a/lldb/include/lldb/Utility/Scalar.h
+++ b/lldb/include/lldb/Utility/Scalar.h
@@ -10,13 +10,13 @@
#ifndef LLDB_UTILITY_SCALAR_H
#define LLDB_UTILITY_SCALAR_H
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-enumerations.h" // for Encoding, ByteOrder
-#include "lldb/lldb-private-types.h" // for type128
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-private-types.h"
#include "llvm/ADT/APFloat.h"
#include "llvm/ADT/APInt.h"
-#include <cstddef> // for size_t
-#include <cstdint> // for uint32_t, uint64_t, int64_t
+#include <cstddef>
+#include <cstdint>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/include/lldb/Utility/SelectHelper.h b/lldb/include/lldb/Utility/SelectHelper.h
index 004952f1c59..f2dac7cf53d 100644
--- a/lldb/include/lldb/Utility/SelectHelper.h
+++ b/lldb/include/lldb/Utility/SelectHelper.h
@@ -10,8 +10,8 @@
#ifndef liblldb_SelectHelper_h_
#define liblldb_SelectHelper_h_
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-types.h" // for socket_t
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-types.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/Optional.h"
diff --git a/lldb/include/lldb/Utility/State.h b/lldb/include/lldb/Utility/State.h
index efe901ae595..7b3c0f1c17a 100644
--- a/lldb/include/lldb/Utility/State.h
+++ b/lldb/include/lldb/Utility/State.h
@@ -10,11 +10,11 @@
#ifndef LLDB_UTILITY_STATE_H
#define LLDB_UTILITY_STATE_H
-#include "lldb/lldb-enumerations.h" // for StateType
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/FormatProviders.h"
-#include "llvm/Support/raw_ostream.h" // for raw_ostream
-#include <cstdint> // for uint32_t
+#include "llvm/Support/raw_ostream.h"
+#include <cstdint>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/Status.h b/lldb/include/lldb/Utility/Status.h
index 3bd2cd5b3b4..9395ea86090 100644
--- a/lldb/include/lldb/Utility/Status.h
+++ b/lldb/include/lldb/Utility/Status.h
@@ -11,15 +11,15 @@
#define LLDB_UTILITY_STATUS_H
#include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h" // for ErrorType, ErrorType...
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/FormatVariadic.h"
#include <cstdarg>
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
#include <string>
-#include <system_error> // for error_code
-#include <type_traits> // for forward
+#include <system_error>
+#include <type_traits>
namespace llvm {
class raw_ostream;
diff --git a/lldb/include/lldb/Utility/Stream.h b/lldb/include/lldb/Utility/Stream.h
index 3ef42b52790..bd4283edf8a 100644
--- a/lldb/include/lldb/Utility/Stream.h
+++ b/lldb/include/lldb/Utility/Stream.h
@@ -12,15 +12,15 @@
#include "lldb/Utility/Flags.h"
#include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderInvalid
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/raw_ostream.h"
#include <stdarg.h>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t, uint8_t
-#include <type_traits> // for forward
+#include <stddef.h>
+#include <stdint.h>
+#include <type_traits>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/StreamCallback.h b/lldb/include/lldb/Utility/StreamCallback.h
index 0aa9d5d57b2..63a86eeece7 100644
--- a/lldb/include/lldb/Utility/StreamCallback.h
+++ b/lldb/include/lldb/Utility/StreamCallback.h
@@ -13,8 +13,8 @@
#include "lldb/lldb-types.h"
#include "llvm/Support/raw_ostream.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint64_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/StreamGDBRemote.h b/lldb/include/lldb/Utility/StreamGDBRemote.h
index 79234cc03d8..dfc4a39de79 100644
--- a/lldb/include/lldb/Utility/StreamGDBRemote.h
+++ b/lldb/include/lldb/Utility/StreamGDBRemote.h
@@ -10,11 +10,11 @@
#ifndef liblldb_StreamGDBRemote_h_
#define liblldb_StreamGDBRemote_h_
-#include "lldb/Utility/StreamString.h" // for StreamString
-#include "lldb/lldb-enumerations.h" // for ByteOrder
+#include "lldb/Utility/StreamString.h"
+#include "lldb/lldb-enumerations.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/StreamString.h b/lldb/include/lldb/Utility/StreamString.h
index 28c11fcc0f8..dd2f9f67466 100644
--- a/lldb/include/lldb/Utility/StreamString.h
+++ b/lldb/include/lldb/Utility/StreamString.h
@@ -10,14 +10,14 @@
#ifndef liblldb_StreamString_h_
#define liblldb_StreamString_h_
-#include "lldb/Utility/Stream.h" // for Stream
-#include "lldb/lldb-enumerations.h" // for ByteOrder
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/Utility/Stream.h"
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/StringRef.h"
-#include <string> // for string
+#include <string>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
namespace lldb_private {
diff --git a/lldb/include/lldb/Utility/StringExtractor.h b/lldb/include/lldb/Utility/StringExtractor.h
index 4b75d5c5484..6260b0e3fb4 100644
--- a/lldb/include/lldb/Utility/StringExtractor.h
+++ b/lldb/include/lldb/Utility/StringExtractor.h
@@ -15,7 +15,7 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h"
-#include <stddef.h> // for size_t
+#include <stddef.h>
#include <stdint.h>
#include <string>
diff --git a/lldb/include/lldb/Utility/StringExtractorGDBRemote.h b/lldb/include/lldb/Utility/StringExtractorGDBRemote.h
index 93e760b8811..8c2eca898e6 100644
--- a/lldb/include/lldb/Utility/StringExtractorGDBRemote.h
+++ b/lldb/include/lldb/Utility/StringExtractorGDBRemote.h
@@ -12,12 +12,12 @@
#include "lldb/Utility/Status.h"
#include "lldb/Utility/StringExtractor.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
#include <string>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint8_t
+#include <stddef.h>
+#include <stdint.h>
class StringExtractorGDBRemote : public StringExtractor {
public:
diff --git a/lldb/include/lldb/Utility/StringLexer.h b/lldb/include/lldb/Utility/StringLexer.h
index d779ef42948..32cfa4e3f6f 100644
--- a/lldb/include/lldb/Utility/StringLexer.h
+++ b/lldb/include/lldb/Utility/StringLexer.h
@@ -10,9 +10,9 @@
#ifndef utility_StringLexer_h_
#define utility_StringLexer_h_
-#include <initializer_list> // for initializer_list
-#include <string> // for string
-#include <utility> // for pair
+#include <initializer_list>
+#include <string>
+#include <utility>
namespace lldb_utility {
diff --git a/lldb/include/lldb/Utility/StringList.h b/lldb/include/lldb/Utility/StringList.h
index 1cb68885e77..c080230249d 100644
--- a/lldb/include/lldb/Utility/StringList.h
+++ b/lldb/include/lldb/Utility/StringList.h
@@ -12,7 +12,7 @@
#include "llvm/ADT/StringRef.h"
-#include <stddef.h> // for size_t
+#include <stddef.h>
#include <string>
#include <vector>
diff --git a/lldb/include/lldb/Utility/StructuredData.h b/lldb/include/lldb/Utility/StructuredData.h
index d3ebab16f51..d4b589f5ba7 100644
--- a/lldb/include/lldb/Utility/StructuredData.h
+++ b/lldb/include/lldb/Utility/StructuredData.h
@@ -13,17 +13,17 @@
#include "llvm/ADT/StringRef.h"
#include "lldb/Utility/ConstString.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/lldb-enumerations.h" // for StructuredDataType
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/lldb-enumerations.h"
-#include <cassert> // for assert
-#include <cstddef> // for size_t
-#include <cstdint> // for uint64_t
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
#include <functional>
#include <map>
#include <memory>
#include <string>
-#include <type_traits> // for move
+#include <type_traits>
#include <utility>
#include <vector>
diff --git a/lldb/include/lldb/Utility/Timer.h b/lldb/include/lldb/Utility/Timer.h
index 2c1e984837c..7c41c625725 100644
--- a/lldb/include/lldb/Utility/Timer.h
+++ b/lldb/include/lldb/Utility/Timer.h
@@ -10,10 +10,10 @@
#ifndef liblldb_Timer_h_
#define liblldb_Timer_h_
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/lldb-defines.h"
#include "llvm/Support/Chrono.h"
#include <atomic>
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
namespace lldb_private {
class Stream;
diff --git a/lldb/include/lldb/Utility/UserID.h b/lldb/include/lldb/Utility/UserID.h
index 9e15e6a43c6..8560274bdea 100644
--- a/lldb/include/lldb/Utility/UserID.h
+++ b/lldb/include/lldb/Utility/UserID.h
@@ -10,8 +10,8 @@
#ifndef liblldb_UserID_h_
#define liblldb_UserID_h_
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_UID
-#include "lldb/lldb-types.h" // for user_id_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-types.h"
namespace lldb_private {
class Stream;
}
diff --git a/lldb/include/lldb/Utility/VMRange.h b/lldb/include/lldb/Utility/VMRange.h
index 0e696907baa..a70b0cb6118 100644
--- a/lldb/include/lldb/Utility/VMRange.h
+++ b/lldb/include/lldb/Utility/VMRange.h
@@ -10,10 +10,10 @@
#ifndef liblldb_VMRange_h_
#define liblldb_VMRange_h_
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-types.h"
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
#include <vector>
namespace lldb_private {
diff --git a/lldb/source/API/SBData.cpp b/lldb/source/API/SBData.cpp
index a8ba5808d4f..a30a778a19d 100644
--- a/lldb/source/API/SBData.cpp
+++ b/lldb/source/API/SBData.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include <inttypes.h> // PRIu64
+#include <inttypes.h>
#include "lldb/API/SBData.h"
#include "lldb/API/SBError.h"
diff --git a/lldb/source/API/SBFileSpec.cpp b/lldb/source/API/SBFileSpec.cpp
index 0a8a281c1a2..9fedeecaf7c 100644
--- a/lldb/source/API/SBFileSpec.cpp
+++ b/lldb/source/API/SBFileSpec.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include <inttypes.h> // PRIu64
+#include <inttypes.h>
#include <limits.h>
#include "lldb/API/SBFileSpec.h"
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index 88b530ee08b..0705ac7e177 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -10,43 +10,43 @@
#include "lldb/Core/Address.h"
#include "lldb/Core/DumpDataExtractor.h"
#include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
#include "lldb/Core/Section.h"
#include "lldb/Symbol/Block.h"
-#include "lldb/Symbol/Declaration.h" // for Declaration
-#include "lldb/Symbol/LineEntry.h" // for LineEntry
+#include "lldb/Symbol/Declaration.h"
+#include "lldb/Symbol/LineEntry.h"
#include "lldb/Symbol/ObjectFile.h"
-#include "lldb/Symbol/Symbol.h" // for Symbol
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/Symbol.h"
+#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/SymbolVendor.h"
-#include "lldb/Symbol/Symtab.h" // for Symtab
-#include "lldb/Symbol/Type.h" // for Type
+#include "lldb/Symbol/Symtab.h"
+#include "lldb/Symbol/Type.h"
#include "lldb/Symbol/Variable.h"
#include "lldb/Symbol/VariableList.h"
#include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/ExecutionContextScope.h" // for ExecutionContextScope
+#include "lldb/Target/ExecutionContextScope.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/SectionLoadList.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
-#include "lldb/Utility/Endian.h" // for InlHostByteOrder
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/Utility/Stream.h" // for Stream
-#include "lldb/Utility/StreamString.h" // for StreamString
-
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/DataExtractor.h"
+#include "lldb/Utility/Endian.h"
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/StreamString.h"
+
+#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Triple.h"
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/Support/Compiler.h"
-#include <cstdint> // for uint8_t, uint32_t
-#include <memory> // for shared_ptr, operator!=
-#include <vector> // for vector
+#include <cstdint>
+#include <memory>
+#include <vector>
-#include <assert.h> // for assert
-#include <inttypes.h> // for PRIu64, PRIx64
-#include <string.h> // for size_t, strlen
+#include <assert.h>
+#include <inttypes.h>
+#include <string.h>
namespace lldb_private {
class CompileUnit;
diff --git a/lldb/source/Core/AddressRange.cpp b/lldb/source/Core/AddressRange.cpp
index e125b693d6f..1afe4fa223d 100644
--- a/lldb/source/Core/AddressRange.cpp
+++ b/lldb/source/Core/AddressRange.cpp
@@ -10,16 +10,16 @@
#include "lldb/Core/AddressRange.h"
#include "lldb/Core/Module.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Stream.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
+#include "lldb/lldb-defines.h"
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/Support/Compiler.h"
-#include <memory> // for shared_ptr
+#include <memory>
-#include <inttypes.h> // for PRIx64
+#include <inttypes.h>
namespace lldb_private {
class SectionList;
diff --git a/lldb/source/Core/AddressResolverFileLine.cpp b/lldb/source/Core/AddressResolverFileLine.cpp
index 3295ef174a7..203ab2787fe 100644
--- a/lldb/source/Core/AddressResolverFileLine.cpp
+++ b/lldb/source/Core/AddressResolverFileLine.cpp
@@ -9,21 +9,21 @@
#include "lldb/Core/AddressResolverFileLine.h"
-#include "lldb/Core/Address.h" // for Address
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
#include "lldb/Symbol/CompileUnit.h"
-#include "lldb/Symbol/LineEntry.h" // for LineEntry
+#include "lldb/Symbol/LineEntry.h"
#include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCategoriesSet, LIB...
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
-#include "lldb/lldb-enumerations.h" // for SymbolContextItem::eSymbolCon...
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-types.h"
-#include <inttypes.h> // for PRIx64
-#include <vector> // for vector
+#include <inttypes.h>
+#include <vector>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/AddressResolverName.cpp b/lldb/source/Core/AddressResolverName.cpp
index ec03815cf5f..7683e391e0c 100644
--- a/lldb/source/Core/AddressResolverName.cpp
+++ b/lldb/source/Core/AddressResolverName.cpp
@@ -9,25 +9,25 @@
#include "lldb/Core/AddressResolverName.h"
-#include "lldb/Core/Address.h" // for Address, operator==
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
#include "lldb/Core/Module.h"
#include "lldb/Symbol/Function.h"
#include "lldb/Symbol/Symbol.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCategoriesSet, LIB...
-#include "lldb/Utility/Stream.h" // for Stream
-#include "lldb/lldb-enumerations.h" // for SymbolType::eSymbolTypeCode
-#include "lldb/lldb-forward.h" // for ModuleSP
-#include "lldb/lldb-types.h" // for addr_t
-#include "llvm/ADT/StringRef.h" // for StringRef
-
-#include <memory> // for shared_ptr
-#include <string> // for string
-#include <vector> // for vector
-
-#include <stdint.h> // for uint32_t
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
+#include "llvm/ADT/StringRef.h"
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <stdint.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/Broadcaster.cpp b/lldb/source/Core/Broadcaster.cpp
index 198434b46c2..d2eff1341ab 100644
--- a/lldb/source/Core/Broadcaster.cpp
+++ b/lldb/source/Core/Broadcaster.cpp
@@ -12,16 +12,16 @@
#include "lldb/Core/Event.h"
#include "lldb/Core/Listener.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAnyCategoriesSet, Get...
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
-#include <algorithm> // for find_if
-#include <memory> // for make_shared
-#include <type_traits> // for move
+#include <algorithm>
+#include <memory>
+#include <type_traits>
-#include <assert.h> // for assert
-#include <stddef.h> // for size_t
+#include <assert.h>
+#include <stddef.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp
index 5ca338639de..3f678c45efe 100644
--- a/lldb/source/Core/Communication.cpp
+++ b/lldb/source/Core/Communication.cpp
@@ -14,23 +14,23 @@
#include "lldb/Host/HostThread.h"
#include "lldb/Host/ThreadLauncher.h"
#include "lldb/Utility/Connection.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for LogIfAnyCategoriesSet, LIBLLDB...
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Status.h"
-#include "llvm/ADT/None.h" // for None
-#include "llvm/ADT/Optional.h" // for Optional
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/ADT/None.h"
+#include "llvm/ADT/Optional.h"
+#include "llvm/Support/Compiler.h"
-#include <algorithm> // for min
-#include <chrono> // for duration, seconds
+#include <algorithm>
+#include <chrono>
#include <cstring>
-#include <memory> // for shared_ptr
+#include <memory>
-#include <errno.h> // for EIO
-#include <inttypes.h> // for PRIu64
-#include <stdio.h> // for snprintf
+#include <errno.h>
+#include <inttypes.h>
+#include <stdio.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 16924d5a14e..9fcc3e82499 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -9,70 +9,70 @@
#include "lldb/Core/Debugger.h"
-#include "lldb/Breakpoint/Breakpoint.h" // for Breakpoint, Brea...
-#include "lldb/Core/Event.h" // for Event, EventData...
+#include "lldb/Breakpoint/Breakpoint.h"
+#include "lldb/Core/Event.h"
#include "lldb/Core/FormatEntity.h"
-#include "lldb/Core/Listener.h" // for Listener
-#include "lldb/Core/Mangled.h" // for Mangled
-#include "lldb/Core/ModuleList.h" // for Mangled
+#include "lldb/Core/Listener.h"
+#include "lldb/Core/Mangled.h"
+#include "lldb/Core/ModuleList.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/StreamAsynchronousIO.h"
#include "lldb/Core/StreamFile.h"
#include "lldb/DataFormatters/DataVisualization.h"
#include "lldb/Expression/REPL.h"
-#include "lldb/Host/File.h" // for File, File::kInv...
+#include "lldb/Host/File.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/HostInfo.h"
#include "lldb/Host/Terminal.h"
#include "lldb/Host/ThreadLauncher.h"
#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Interpreter/OptionValue.h" // for OptionValue, Opt...
+#include "lldb/Interpreter/OptionValue.h"
#include "lldb/Interpreter/OptionValueProperties.h"
#include "lldb/Interpreter/OptionValueSInt64.h"
#include "lldb/Interpreter/OptionValueString.h"
-#include "lldb/Interpreter/Property.h" // for PropertyDefinition
-#include "lldb/Interpreter/ScriptInterpreter.h" // for ScriptInterpreter
+#include "lldb/Interpreter/Property.h"
+#include "lldb/Interpreter/ScriptInterpreter.h"
#include "lldb/Symbol/Function.h"
#include "lldb/Symbol/Symbol.h"
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Target/Language.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/StructuredDataPlugin.h"
#include "lldb/Target/Target.h"
#include "lldb/Target/TargetList.h"
#include "lldb/Target/Thread.h"
-#include "lldb/Target/ThreadList.h" // for ThreadList
+#include "lldb/Target/ThreadList.h"
#include "lldb/Utility/AnsiTerminal.h"
-#include "lldb/Utility/Log.h" // for LLDB_LOG_OPTION_...
+#include "lldb/Utility/Log.h"
#include "lldb/Utility/State.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamCallback.h"
#include "lldb/Utility/StreamString.h"
#if defined(_WIN32)
-#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX
+#include "lldb/Host/windows/PosixApi.h"
#include "lldb/Host/windows/windows.h"
#endif
-#include "llvm/ADT/None.h" // for None
-#include "llvm/ADT/STLExtras.h" // for make_unique
+#include "llvm/ADT/None.h"
+#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/iterator.h" // for iterator_facade_...
+#include "llvm/ADT/iterator.h"
#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/Threading.h"
-#include "llvm/Support/raw_ostream.h" // for raw_fd_ostream
+#include "llvm/Support/raw_ostream.h"
-#include <list> // for list
-#include <memory> // for make_shared
+#include <list>
+#include <memory>
#include <mutex>
-#include <set> // for set
-#include <stdio.h> // for size_t, NULL
-#include <stdlib.h> // for getenv
-#include <string.h> // for strcmp
-#include <string> // for string
-#include <system_error> // for error_code
+#include <set>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <system_error>
namespace lldb_private {
class Address;
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index 413aff277a5..f957a5c695b 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -9,14 +9,14 @@
#include "lldb/Core/Disassembler.h"
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/AddressRange.h"
#include "lldb/Core/Debugger.h"
#include "lldb/Core/EmulateInstruction.h"
-#include "lldb/Core/Mangled.h" // for Mangled, Mangled...
+#include "lldb/Core/Mangled.h"
#include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
#include "lldb/Core/PluginManager.h"
-#include "lldb/Core/SourceManager.h" // for SourceManager
+#include "lldb/Core/SourceManager.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Interpreter/OptionValue.h"
#include "lldb/Interpreter/OptionValueArray.h"
@@ -25,31 +25,31 @@
#include "lldb/Interpreter/OptionValueString.h"
#include "lldb/Interpreter/OptionValueUInt64.h"
#include "lldb/Symbol/Function.h"
-#include "lldb/Symbol/Symbol.h" // for Symbol
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/Symbol.h"
+#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/SectionLoadList.h"
#include "lldb/Target/StackFrame.h"
#include "lldb/Target/Target.h"
-#include "lldb/Target/Thread.h" // for Thread
+#include "lldb/Target/Thread.h"
#include "lldb/Utility/DataBufferHeap.h"
#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/RegularExpression.h"
#include "lldb/Utility/Status.h"
-#include "lldb/Utility/Stream.h" // for Stream
-#include "lldb/Utility/StreamString.h" // for StreamString
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/StreamString.h"
#include "lldb/Utility/Timer.h"
-#include "lldb/lldb-private-enumerations.h" // for InstructionType:...
-#include "lldb/lldb-private-interfaces.h" // for DisassemblerCrea...
-#include "lldb/lldb-private-types.h" // for RegisterInfo
-#include "llvm/ADT/Triple.h" // for Triple, Triple::...
-#include "llvm/Support/Compiler.h" // for LLVM_PRETTY_FUNC...
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-private-interfaces.h"
+#include "lldb/lldb-private-types.h"
+#include "llvm/ADT/Triple.h"
+#include "llvm/Support/Compiler.h"
-#include <cstdint> // for uint32_t, UINT32...
+#include <cstdint>
#include <cstring>
-#include <utility> // for pair
+#include <utility>
-#include <assert.h> // for assert
+#include <assert.h>
#define DEFAULT_DISASM_BYTE_SIZE 32
diff --git a/lldb/source/Core/DumpDataExtractor.cpp b/lldb/source/Core/DumpDataExtractor.cpp
index 049f4d3805a..43a026d0dcb 100644
--- a/lldb/source/Core/DumpDataExtractor.cpp
+++ b/lldb/source/Core/DumpDataExtractor.cpp
@@ -9,12 +9,12 @@
#include "lldb/Core/DumpDataExtractor.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h" // for TargetSP, DisassemblerSP
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
#include "lldb/Core/Disassembler.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/ExecutionContextScope.h"
@@ -23,22 +23,22 @@
#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/Stream.h"
-#include "clang/AST/ASTContext.h" // for ASTContext
-#include "clang/AST/CanonicalType.h" // for CanQualType
+#include "clang/AST/ASTContext.h"
+#include "clang/AST/CanonicalType.h"
-#include "llvm/ADT/APFloat.h" // for APFloat, APFloatBase:...
-#include "llvm/ADT/APInt.h" // for APInt
-#include "llvm/ADT/ArrayRef.h" // for ArrayRef
-#include "llvm/ADT/SmallVector.h" // for SmallVector
+#include "llvm/ADT/APFloat.h"
+#include "llvm/ADT/APInt.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/SmallVector.h"
-#include <limits> // for numeric_limits, numer...
-#include <memory> // for shared_ptr
-#include <string> // for string, basic_string
+#include <limits>
+#include <memory>
+#include <string>
-#include <assert.h> // for assert
-#include <ctype.h> // for isprint
-#include <inttypes.h> // for PRIu64, PRIx64, PRIX64
-#include <math.h> // for ldexpf
+#include <assert.h>
+#include <ctype.h>
+#include <inttypes.h>
+#include <math.h>
#include <bitset>
#include <sstream>
diff --git a/lldb/source/Core/DynamicLoader.cpp b/lldb/source/Core/DynamicLoader.cpp
index 51f34ef94c1..72ee3cfd6d5 100644
--- a/lldb/source/Core/DynamicLoader.cpp
+++ b/lldb/source/Core/DynamicLoader.cpp
@@ -10,22 +10,22 @@
#include "lldb/Target/DynamicLoader.h"
#include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/Section.h"
-#include "lldb/Symbol/ObjectFile.h" // for ObjectFile
+#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Target/MemoryRegionInfo.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-private-interfaces.h" // for DynamicLoaderCreateInstance
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-private-interfaces.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
-#include <memory> // for shared_ptr, unique_ptr
+#include <memory>
-#include <assert.h> // for assert
+#include <assert.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp
index 71f65aa830f..0fcb2eb7e8c 100644
--- a/lldb/source/Core/EmulateInstruction.cpp
+++ b/lldb/source/Core/EmulateInstruction.cpp
@@ -16,23 +16,23 @@
#include "lldb/Symbol/UnwindPlan.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/RegisterContext.h"
-#include "lldb/Target/StackFrame.h" // for StackFrame
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Target/StackFrame.h"
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/RegisterValue.h"
#include "lldb/Utility/Status.h"
-#include "lldb/Utility/Stream.h" // for Stream, Stream::::eBinary
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
-#include "lldb/lldb-forward.h" // for ProcessSP
-#include "lldb/lldb-private-interfaces.h" // for EmulateInstructionCreateIn...
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-interfaces.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
#include <cstring>
-#include <memory> // for shared_ptr
+#include <memory>
-#include <inttypes.h> // for PRIx64, PRId64, PRIu64
-#include <stdio.h> // for stdout
+#include <inttypes.h>
+#include <stdio.h>
namespace lldb_private {
class Target;
diff --git a/lldb/source/Core/Event.cpp b/lldb/source/Core/Event.cpp
index 3ebad7acdef..6ae52c082c1 100644
--- a/lldb/source/Core/Event.cpp
+++ b/lldb/source/Core/Event.cpp
@@ -13,12 +13,12 @@
#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/Endian.h"
#include "lldb/Utility/Stream.h"
-#include "lldb/Utility/StreamString.h" // for StreamString
-#include "lldb/lldb-enumerations.h" // for Format::eFormatBytes
+#include "lldb/Utility/StreamString.h"
+#include "lldb/lldb-enumerations.h"
#include <algorithm>
-#include <ctype.h> // for isprint
+#include <ctype.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/FileLineResolver.cpp b/lldb/source/Core/FileLineResolver.cpp
index 083377692ed..e861ba6c906 100644
--- a/lldb/source/Core/FileLineResolver.cpp
+++ b/lldb/source/Core/FileLineResolver.cpp
@@ -10,13 +10,13 @@
#include "lldb/Core/FileLineResolver.h"
// Project includes
-#include "lldb/Core/FileSpecList.h" // for FileSpecList
+#include "lldb/Core/FileSpecList.h"
#include "lldb/Symbol/CompileUnit.h"
#include "lldb/Symbol/LineTable.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Stream.h"
-#include <string> // for string
+#include <string>
namespace lldb_private {
class Address;
diff --git a/lldb/source/Core/FileSpecList.cpp b/lldb/source/Core/FileSpecList.cpp
index 66e27b19744..ae4831b6efa 100644
--- a/lldb/source/Core/FileSpecList.cpp
+++ b/lldb/source/Core/FileSpecList.cpp
@@ -9,12 +9,12 @@
#include "lldb/Core/FileSpecList.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Stream.h"
-#include <utility> // for find
+#include <utility>
-#include <stdint.h> // for UINT32_MAX
+#include <stdint.h>
using namespace lldb_private;
using namespace std;
diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp
index 3cc5b756b1f..200008dcff5 100644
--- a/lldb/source/Core/FormatEntity.cpp
+++ b/lldb/source/Core/FormatEntity.cpp
@@ -10,28 +10,28 @@
#include "lldb/Core/FormatEntity.h"
#include "lldb/Core/Address.h"
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/AddressRange.h"
#include "lldb/Core/Debugger.h"
#include "lldb/Core/DumpRegisterValue.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/ValueObject.h"
#include "lldb/Core/ValueObjectVariable.h"
#include "lldb/DataFormatters/DataVisualization.h"
-#include "lldb/DataFormatters/FormatClasses.h" // for TypeNameSpecifier...
+#include "lldb/DataFormatters/FormatClasses.h"
#include "lldb/DataFormatters/FormatManager.h"
-#include "lldb/DataFormatters/TypeSummary.h" // for TypeSummaryImpl::...
+#include "lldb/DataFormatters/TypeSummary.h"
#include "lldb/Expression/ExpressionVariable.h"
#include "lldb/Interpreter/CommandInterpreter.h"
#include "lldb/Symbol/Block.h"
#include "lldb/Symbol/CompileUnit.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/Function.h"
#include "lldb/Symbol/LineEntry.h"
#include "lldb/Symbol/Symbol.h"
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/VariableList.h"
#include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/ExecutionContextScope.h" // for ExecutionContextS...
+#include "lldb/Target/ExecutionContextScope.h"
#include "lldb/Target/Language.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/RegisterContext.h"
@@ -41,32 +41,32 @@
#include "lldb/Target/Target.h"
#include "lldb/Target/Thread.h"
#include "lldb/Utility/AnsiTerminal.h"
-#include "lldb/Utility/ArchSpec.h" // for ArchSpec
-#include "lldb/Utility/ConstString.h" // for ConstString, oper...
+#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/FileSpec.h"
-#include "lldb/Utility/Log.h" // for Log
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCatego...
-#include "lldb/Utility/RegisterValue.h" // for RegisterValue
-#include "lldb/Utility/SharingPtr.h" // for SharingPtr
+#include "lldb/Utility/Log.h"
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/RegisterValue.h"
+#include "lldb/Utility/SharingPtr.h"
#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
-#include "lldb/Utility/StringList.h" // for StringList
-#include "lldb/Utility/StructuredData.h" // for StructuredData::O...
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h" // for ValueObjectSP
+#include "lldb/Utility/StringList.h"
+#include "lldb/Utility/StructuredData.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h" // for Triple, Triple::O...
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
-
-#include <ctype.h> // for isxdigit
-#include <inttypes.h> // for PRIu64, PRIx64
-#include <memory> // for shared_ptr, opera...
-#include <stdio.h> // for sprintf
-#include <stdlib.h> // for strtoul
-#include <string.h> // for size_t, strchr
-#include <type_traits> // for move
-#include <utility> // for pair
+#include "llvm/ADT/Triple.h"
+#include "llvm/Support/Compiler.h"
+
+#include <ctype.h>
+#include <inttypes.h>
+#include <memory>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <type_traits>
+#include <utility>
namespace lldb_private {
class ScriptInterpreter;
diff --git a/lldb/source/Core/IOHandler.cpp b/lldb/source/Core/IOHandler.cpp
index 4c29cedbfe6..784ad9021f8 100644
--- a/lldb/source/Core/IOHandler.cpp
+++ b/lldb/source/Core/IOHandler.cpp
@@ -25,12 +25,12 @@
// Project includes
#include "lldb/Core/Debugger.h"
#include "lldb/Core/StreamFile.h"
-#include "lldb/Host/File.h" // for File
-#include "lldb/Utility/Predicate.h" // for Predicate, ::eBroad...
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/Utility/StreamString.h" // for StreamString
-#include "lldb/Utility/StringList.h" // for StringList
-#include "lldb/lldb-forward.h" // for StreamFileSP
+#include "lldb/Host/File.h"
+#include "lldb/Utility/Predicate.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/Utility/StreamString.h"
+#include "lldb/Utility/StringList.h"
+#include "lldb/lldb-forward.h"
#ifndef LLDB_DISABLE_LIBEDIT
#include "lldb/Host/Editline.h"
@@ -55,23 +55,23 @@
#include "lldb/Utility/State.h"
#endif
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
#ifdef _MSC_VER
#include "lldb/Host/windows/windows.h"
#endif
-#include <memory> // for shared_ptr
-#include <mutex> // for recursive_mutex
-
-#include <assert.h> // for assert
-#include <ctype.h> // for isspace
-#include <errno.h> // for EINTR, errno
-#include <locale.h> // for setlocale
-#include <stdint.h> // for uint32_t, UINT32_MAX
-#include <stdio.h> // for size_t, fprintf, feof
-#include <string.h> // for strlen
-#include <type_traits> // for move
+#include <memory>
+#include <mutex>
+
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <type_traits>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/Listener.cpp b/lldb/source/Core/Listener.cpp
index a39ce6121b3..24813418b80 100644
--- a/lldb/source/Core/Listener.cpp
+++ b/lldb/source/Core/Listener.cpp
@@ -11,15 +11,15 @@
#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/Event.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCategoriesSet, LIBL...
+#include "lldb/Utility/Logging.h"
-#include "llvm/ADT/Optional.h" // for Optional
+#include "llvm/ADT/Optional.h"
#include <algorithm>
-#include <memory> // for make_shared
-#include <utility> // for pair, make_pair
+#include <memory>
+#include <utility>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index 714349d25d4..76c898fc0cd 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -9,65 +9,65 @@
#include "lldb/Core/Module.h"
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/AddressRange.h"
#include "lldb/Core/AddressResolverFileLine.h"
-#include "lldb/Core/Debugger.h" // for Debugger
-#include "lldb/Core/FileSpecList.h" // for FileSpecList
-#include "lldb/Core/Mangled.h" // for Mangled
+#include "lldb/Core/Debugger.h"
+#include "lldb/Core/FileSpecList.h"
+#include "lldb/Core/Mangled.h"
#include "lldb/Core/ModuleSpec.h"
-#include "lldb/Core/SearchFilter.h" // for SearchFilt...
+#include "lldb/Core/SearchFilter.h"
#include "lldb/Core/Section.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/Host.h"
#include "lldb/Interpreter/CommandInterpreter.h"
#include "lldb/Interpreter/ScriptInterpreter.h"
#include "lldb/Symbol/CompileUnit.h"
-#include "lldb/Symbol/Function.h" // for Function
+#include "lldb/Symbol/Function.h"
#include "lldb/Symbol/ObjectFile.h"
-#include "lldb/Symbol/Symbol.h" // for Symbol
+#include "lldb/Symbol/Symbol.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/SymbolFile.h"
#include "lldb/Symbol/SymbolVendor.h"
-#include "lldb/Symbol/Symtab.h" // for Symtab
-#include "lldb/Symbol/Type.h" // for Type
-#include "lldb/Symbol/TypeList.h" // for TypeList
+#include "lldb/Symbol/Symtab.h"
+#include "lldb/Symbol/Type.h"
+#include "lldb/Symbol/TypeList.h"
#include "lldb/Symbol/TypeMap.h"
#include "lldb/Symbol/TypeSystem.h"
#include "lldb/Target/Language.h"
-#include "lldb/Target/Platform.h" // for Platform
+#include "lldb/Target/Platform.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/Target.h"
#include "lldb/Utility/DataBufferHeap.h"
#include "lldb/Utility/LLDBAssert.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAn...
+#include "lldb/Utility/Logging.h"
#include "lldb/Utility/RegularExpression.h"
#include "lldb/Utility/Status.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
#include "lldb/Utility/Timer.h"
#if defined(_WIN32)
-#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX
+#include "lldb/Host/windows/PosixApi.h"
#endif
#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
#include "Plugins/Language/ObjC/ObjCLanguage.h"
-#include "llvm/ADT/STLExtras.h" // for make_unique
-#include "llvm/Support/Compiler.h" // for LLVM_PRETT...
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/Compiler.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Signals.h"
-#include "llvm/Support/raw_ostream.h" // for raw_string...
-
-#include <assert.h> // for assert
-#include <cstdint> // for uint32_t
-#include <inttypes.h> // for PRIx64
-#include <map> // for map
-#include <stdarg.h> // for va_end
-#include <string.h> // for size_t
-#include <type_traits> // for move
-#include <utility> // for find, pair
+#include "llvm/Support/raw_ostream.h"
+
+#include <assert.h>
+#include <cstdint>
+#include <inttypes.h>
+#include <map>
+#include <stdarg.h>
+#include <string.h>
+#include <type_traits>
+#include <utility>
namespace lldb_private {
class CompilerDeclContext;
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index 9cff6c8218d..1030bba00e0 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -8,39 +8,39 @@
//===----------------------------------------------------------------------===//
#include "lldb/Core/ModuleList.h"
-#include "lldb/Core/FileSpecList.h" // for FileSpecList
+#include "lldb/Core/FileSpecList.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/Symbols.h"
-#include "lldb/Interpreter/OptionValueProperties.h"
#include "lldb/Interpreter/OptionValueFileSpec.h"
+#include "lldb/Interpreter/OptionValueProperties.h"
#include "lldb/Interpreter/Property.h"
#include "lldb/Symbol/ObjectFile.h"
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContextList, SymbolCon...
+#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/VariableList.h"
-#include "lldb/Utility/ArchSpec.h" // for ArchSpec
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAnyCategoriesSet
-#include "lldb/Utility/UUID.h" // for UUID, operator!=, operator==
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_INDEX32
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/UUID.h"
+#include "lldb/lldb-defines.h"
#if defined(_WIN32)
-#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX
+#include "lldb/Host/windows/PosixApi.h"
#endif
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "clang/Driver/Driver.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Threading.h"
-#include "llvm/Support/raw_ostream.h" // for fs
-#include "clang/Driver/Driver.h"
+#include "llvm/Support/raw_ostream.h"
-#include <chrono> // for operator!=, time_point
-#include <memory> // for shared_ptr
+#include <chrono>
+#include <memory>
#include <mutex>
-#include <string> // for string
-#include <utility> // for distance
+#include <string>
+#include <utility>
namespace lldb_private {
class Function;
diff --git a/lldb/source/Core/Opcode.cpp b/lldb/source/Core/Opcode.cpp
index e8b8bb96786..ed8be78a6d6 100644
--- a/lldb/source/Core/Opcode.cpp
+++ b/lldb/source/Core/Opcode.cpp
@@ -13,11 +13,11 @@
#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/Endian.h"
#include "lldb/Utility/Stream.h"
-#include "lldb/lldb-forward.h" // for DataBufferSP
+#include "lldb/lldb-forward.h"
-#include <memory> // for make_shared
+#include <memory>
-#include <inttypes.h> // for PRIx64
+#include <inttypes.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp
index de1a64e62c2..a0a9e9f0216 100644
--- a/lldb/source/Core/PluginManager.cpp
+++ b/lldb/source/Core/PluginManager.cpp
@@ -13,28 +13,28 @@
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/HostInfo.h"
#include "lldb/Interpreter/OptionValueProperties.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Status.h"
-#include "lldb/Utility/StringList.h" // for StringList
+#include "lldb/Utility/StringList.h"
#if defined(_WIN32)
-#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX
+#include "lldb/Host/windows/PosixApi.h"
#endif
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/DynamicLibrary.h"
-#include "llvm/Support/FileSystem.h" // for file_type, file_...
-#include "llvm/Support/raw_ostream.h" // for fs
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/raw_ostream.h"
-#include <map> // for map<>::const_ite...
-#include <memory> // for shared_ptr
+#include <map>
+#include <memory>
#include <mutex>
#include <string>
-#include <utility> // for pair
+#include <utility>
#include <vector>
-#include <assert.h> // for assert
+#include <assert.h>
namespace lldb_private {
class CommandInterpreter;
diff --git a/lldb/source/Core/SearchFilter.cpp b/lldb/source/Core/SearchFilter.cpp
index a858a21fc8d..df1b6d30804 100644
--- a/lldb/source/Core/SearchFilter.cpp
+++ b/lldb/source/Core/SearchFilter.cpp
@@ -9,27 +9,27 @@
#include "lldb/Core/SearchFilter.h"
-#include "lldb/Breakpoint/Breakpoint.h" // for Breakpoint
+#include "lldb/Breakpoint/Breakpoint.h"
#include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
#include "lldb/Symbol/CompileUnit.h"
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/SymbolVendor.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/Utility/Stream.h" // for Stream
-#include "lldb/lldb-enumerations.h" // for SymbolContextItem::eSymbolCo...
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/lldb-enumerations.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
-#include "llvm/Support/ErrorHandling.h" // for llvm_unreachable
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/ErrorHandling.h"
-#include <memory> // for shared_ptr
-#include <mutex> // for recursive_mutex, lock_guard
-#include <string> // for string
+#include <memory>
+#include <mutex>
+#include <string>
-#include <inttypes.h> // for PRIu64
-#include <string.h> // for size_t, strcmp
+#include <inttypes.h>
+#include <string.h>
namespace lldb_private {
class Address;
diff --git a/lldb/source/Core/Section.cpp b/lldb/source/Core/Section.cpp
index 24dbb428a07..62687817509 100644
--- a/lldb/source/Core/Section.cpp
+++ b/lldb/source/Core/Section.cpp
@@ -8,18 +8,18 @@
//===----------------------------------------------------------------------===//
#include "lldb/Core/Section.h"
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
#include "lldb/Core/Module.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Target/SectionLoadList.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/Utility/Stream.h" // for Stream
-#include "lldb/Utility/VMRange.h" // for VMRange
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/VMRange.h"
-#include <inttypes.h> // for PRIx64
-#include <limits> // for numeric_limits
-#include <utility> // for distance
+#include <inttypes.h>
+#include <limits>
+#include <utility>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/source/Core/SourceManager.cpp b/lldb/source/Core/SourceManager.cpp
index 41bc0d85792..16cc1b805b5 100644
--- a/lldb/source/Core/SourceManager.cpp
+++ b/lldb/source/Core/SourceManager.cpp
@@ -9,34 +9,34 @@
#include "lldb/Core/SourceManager.h"
-#include "lldb/Core/Address.h" // for Address
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
#include "lldb/Core/Debugger.h"
-#include "lldb/Core/FormatEntity.h" // for FormatEntity
+#include "lldb/Core/FormatEntity.h"
#include "lldb/Core/Highlighter.h"
#include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Symbol/CompileUnit.h"
#include "lldb/Symbol/Function.h"
-#include "lldb/Symbol/LineEntry.h" // for LineEntry
+#include "lldb/Symbol/LineEntry.h"
#include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Target/PathMappingList.h" // for PathMappingList
+#include "lldb/Target/PathMappingList.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/DataBuffer.h"
#include "lldb/Utility/DataBufferLLVM.h"
#include "lldb/Utility/RegularExpression.h"
#include "lldb/Utility/Stream.h"
-#include "lldb/lldb-enumerations.h" // for StopShowColumn::eStopSho...
+#include "lldb/lldb-enumerations.h"
-#include "llvm/ADT/Twine.h" // for Twine
+#include "llvm/ADT/Twine.h"
#include <memory>
-#include <utility> // for pair
+#include <utility>
-#include <assert.h> // for assert
-#include <stdio.h> // for size_t, NULL, snprintf
+#include <assert.h>
+#include <stdio.h>
namespace lldb_private {
class ExecutionContext;
diff --git a/lldb/source/Core/StreamAsynchronousIO.cpp b/lldb/source/Core/StreamAsynchronousIO.cpp
index eb8bf3620af..b8938bd3fc4 100644
--- a/lldb/source/Core/StreamAsynchronousIO.cpp
+++ b/lldb/source/Core/StreamAsynchronousIO.cpp
@@ -10,7 +10,7 @@
#include "lldb/Core/StreamAsynchronousIO.h"
#include "lldb/Core/Debugger.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderBig
+#include "lldb/lldb-enumerations.h"
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp
index a4661a6c9e8..4406057ca6b 100644
--- a/lldb/source/Core/UserSettingsController.cpp
+++ b/lldb/source/Core/UserSettingsController.cpp
@@ -13,7 +13,7 @@
#include "lldb/Utility/Status.h"
#include "lldb/Utility/Stream.h"
-#include <memory> // for shared_ptr
+#include <memory>
namespace lldb_private {
class CommandInterpreter;
diff --git a/lldb/source/Core/Value.cpp b/lldb/source/Core/Value.cpp
index a3cf8318a38..1ce6ea55a2a 100644
--- a/lldb/source/Core/Value.cpp
+++ b/lldb/source/Core/Value.cpp
@@ -9,7 +9,7 @@
#include "lldb/Core/Value.h"
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
#include "lldb/Core/Module.h"
#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ObjectFile.h"
@@ -20,21 +20,21 @@
#include "lldb/Target/Process.h"
#include "lldb/Target/SectionLoadList.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/DataBufferHeap.h"
#include "lldb/Utility/DataExtractor.h"
-#include "lldb/Utility/Endian.h" // for InlHostByteOrder
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/Endian.h"
+#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/State.h"
#include "lldb/Utility/Stream.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h" // for DataBufferSP, ModuleSP
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
-#include <memory> // for make_shared
-#include <string> // for string
+#include <memory>
+#include <string>
-#include <inttypes.h> // for PRIx64
+#include <inttypes.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 10e3ddb41f6..3fcd68e15fd 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -9,7 +9,7 @@
#include "lldb/Core/ValueObject.h"
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/ValueObjectCast.h"
#include "lldb/Core/ValueObjectChild.h"
@@ -18,52 +18,52 @@
#include "lldb/Core/ValueObjectMemory.h"
#include "lldb/Core/ValueObjectSyntheticFilter.h"
#include "lldb/DataFormatters/DataVisualization.h"
-#include "lldb/DataFormatters/DumpValueObjectOptions.h" // for DumpValueObj...
-#include "lldb/DataFormatters/FormatManager.h" // for FormatManager
+#include "lldb/DataFormatters/DumpValueObjectOptions.h"
+#include "lldb/DataFormatters/FormatManager.h"
#include "lldb/DataFormatters/StringPrinter.h"
-#include "lldb/DataFormatters/TypeFormat.h" // for TypeFormatImpl_F...
-#include "lldb/DataFormatters/TypeSummary.h" // for TypeSummaryOptions
-#include "lldb/DataFormatters/TypeValidator.h" // for TypeValidatorImp...
+#include "lldb/DataFormatters/TypeFormat.h"
+#include "lldb/DataFormatters/TypeSummary.h"
+#include "lldb/DataFormatters/TypeValidator.h"
#include "lldb/DataFormatters/ValueObjectPrinter.h"
-#include "lldb/Expression/ExpressionVariable.h" // for ExpressionVariable
+#include "lldb/Expression/ExpressionVariable.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/CompileUnit.h"
#include "lldb/Symbol/CompilerType.h"
-#include "lldb/Symbol/Declaration.h" // for Declaration
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/Declaration.h"
+#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/Type.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Language.h"
#include "lldb/Target/LanguageRuntime.h"
#include "lldb/Target/ObjCLanguageRuntime.h"
#include "lldb/Target/Process.h"
-#include "lldb/Target/StackFrame.h" // for StackFrame
+#include "lldb/Target/StackFrame.h"
#include "lldb/Target/Target.h"
#include "lldb/Target/Thread.h"
-#include "lldb/Target/ThreadList.h" // for ThreadList
-#include "lldb/Utility/DataBuffer.h" // for DataBuffer
+#include "lldb/Target/ThreadList.h"
+#include "lldb/Utility/DataBuffer.h"
#include "lldb/Utility/DataBufferHeap.h"
-#include "lldb/Utility/Flags.h" // for Flags
+#include "lldb/Utility/Flags.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCateg...
-#include "lldb/Utility/Scalar.h" // for Scalar
-#include "lldb/Utility/SharingPtr.h" // for SharingPtr
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/SharingPtr.h"
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
-#include "lldb/lldb-private-types.h" // for RegisterInfo
+#include "lldb/lldb-private-types.h"
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/Support/Compiler.h"
-#include <algorithm> // for min
-#include <cstdint> // for uint32_t, uint64_t
-#include <cstdlib> // for size_t, NULL
-#include <memory> // for shared_ptr, oper...
-#include <tuple> // for tie, tuple
+#include <algorithm>
+#include <cstdint>
+#include <cstdlib>
+#include <memory>
+#include <tuple>
-#include <assert.h> // for assert
-#include <inttypes.h> // for PRIu64, PRIx64
-#include <stdio.h> // for snprintf
-#include <string.h> // for memcpy, memcmp
+#include <assert.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
namespace lldb_private {
class ExecutionContextScope;
diff --git a/lldb/source/Core/ValueObjectCast.cpp b/lldb/source/Core/ValueObjectCast.cpp
index da71141178a..fb0b55b6efd 100644
--- a/lldb/source/Core/ValueObjectCast.cpp
+++ b/lldb/source/Core/ValueObjectCast.cpp
@@ -13,8 +13,8 @@
#include "lldb/Core/ValueObject.h"
#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/ExecutionContext.h"
-#include "lldb/Utility/Scalar.h" // for operator!=, Scalar
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
namespace lldb_private {
class ConstString;
diff --git a/lldb/source/Core/ValueObjectChild.cpp b/lldb/source/Core/ValueObjectChild.cpp
index 174fd92fa72..42b31cc11d6 100644
--- a/lldb/source/Core/ValueObjectChild.cpp
+++ b/lldb/source/Core/ValueObjectChild.cpp
@@ -9,21 +9,21 @@
#include "lldb/Core/ValueObjectChild.h"
-#include "lldb/Core/Value.h" // for Value, Value::ValueType::e...
+#include "lldb/Core/Value.h"
#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Process.h"
-#include "lldb/Utility/Flags.h" // for Flags
-#include "lldb/Utility/Scalar.h" // for Scalar
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-forward.h" // for ProcessSP, ModuleSP
+#include "lldb/Utility/Flags.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-forward.h"
-#include <functional> // for _Func_impl<>::_Mybase
-#include <memory> // for shared_ptr
-#include <vector> // for vector
+#include <functional>
+#include <memory>
+#include <vector>
-#include <stdio.h> // for snprintf, size_t
-#include <string.h> // for strlen
+#include <stdio.h>
+#include <string.h>
using namespace lldb_private;
diff --git a/lldb/source/Core/ValueObjectConstResult.cpp b/lldb/source/Core/ValueObjectConstResult.cpp
index 2364a0e38ff..e857702653e 100644
--- a/lldb/source/Core/ValueObjectConstResult.cpp
+++ b/lldb/source/Core/ValueObjectConstResult.cpp
@@ -12,12 +12,12 @@
#include "lldb/Core/ValueObjectDynamicValue.h"
#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/ExecutionContextScope.h" // for ExecutionContextScope
+#include "lldb/Target/ExecutionContextScope.h"
#include "lldb/Target/Process.h"
-#include "lldb/Utility/DataBuffer.h" // for DataBuffer
-#include "lldb/Utility/DataBufferHeap.h" // for DataBufferHeap
+#include "lldb/Utility/DataBuffer.h"
+#include "lldb/Utility/DataBufferHeap.h"
#include "lldb/Utility/DataExtractor.h"
-#include "lldb/Utility/Scalar.h" // for Scalar
+#include "lldb/Utility/Scalar.h"
namespace lldb_private {
class Module;
diff --git a/lldb/source/Core/ValueObjectConstResultChild.cpp b/lldb/source/Core/ValueObjectConstResultChild.cpp
index 3e9f8768416..bbfbd8ef2aa 100644
--- a/lldb/source/Core/ValueObjectConstResultChild.cpp
+++ b/lldb/source/Core/ValueObjectConstResultChild.cpp
@@ -9,7 +9,7 @@
#include "lldb/Core/ValueObjectConstResultChild.h"
-#include "lldb/lldb-private-enumerations.h" // for AddressType::eAddressType
+#include "lldb/lldb-private-enumerations.h"
namespace lldb_private {
class DataExtractor;
}
diff --git a/lldb/source/Core/ValueObjectConstResultImpl.cpp b/lldb/source/Core/ValueObjectConstResultImpl.cpp
index bc24afcc60e..789f388d218 100644
--- a/lldb/source/Core/ValueObjectConstResultImpl.cpp
+++ b/lldb/source/Core/ValueObjectConstResultImpl.cpp
@@ -9,19 +9,19 @@
#include "lldb/Core/ValueObjectConstResultImpl.h"
-#include "lldb/Core/Value.h" // for Value, Value::Val...
-#include "lldb/Core/ValueObject.h" // for ValueObject
+#include "lldb/Core/Value.h"
+#include "lldb/Core/ValueObject.h"
#include "lldb/Core/ValueObjectConstResult.h"
#include "lldb/Core/ValueObjectConstResultCast.h"
#include "lldb/Core/ValueObjectConstResultChild.h"
#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/ExecutionContext.h"
-#include "lldb/Utility/DataBufferHeap.h" // for DataBufferHeap
-#include "lldb/Utility/Endian.h" // for InlHostByteOrder
-#include "lldb/Utility/Scalar.h" // for Scalar
-#include "lldb/Utility/SharingPtr.h" // for SharingPtr
+#include "lldb/Utility/DataBufferHeap.h"
+#include "lldb/Utility/Endian.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/SharingPtr.h"
-#include <string> // for string
+#include <string>
namespace lldb_private {
class DataExtractor;
diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp b/lldb/source/Core/ValueObjectDynamicValue.cpp
index e13170ed200..161b6e49e0d 100644
--- a/lldb/source/Core/ValueObjectDynamicValue.cpp
+++ b/lldb/source/Core/ValueObjectDynamicValue.cpp
@@ -16,14 +16,14 @@
#include "lldb/Target/LanguageRuntime.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
+#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCategoriesSet
-#include "lldb/Utility/Scalar.h" // for Scalar, operator!=
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-types.h" // for addr_t, offset_t
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-types.h"
-#include <string.h> // for strcmp, size_t
+#include <string.h>
namespace lldb_private {
class Declaration;
}
diff --git a/lldb/source/Core/ValueObjectList.cpp b/lldb/source/Core/ValueObjectList.cpp
index 0dd07252888..7a7e0d8417b 100644
--- a/lldb/source/Core/ValueObjectList.cpp
+++ b/lldb/source/Core/ValueObjectList.cpp
@@ -9,11 +9,11 @@
#include "lldb/Core/ValueObjectList.h"
-#include "lldb/Core/ValueObject.h" // for ValueObject
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/SharingPtr.h" // for SharingPtr
+#include "lldb/Core/ValueObject.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/SharingPtr.h"
-#include <utility> // for back_insert_iterator, back_ins...
+#include <utility>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Core/ValueObjectMemory.cpp b/lldb/source/Core/ValueObjectMemory.cpp
index 466eae7e960..c6c95ee9aa2 100644
--- a/lldb/source/Core/ValueObjectMemory.cpp
+++ b/lldb/source/Core/ValueObjectMemory.cpp
@@ -13,14 +13,14 @@
#include "lldb/Symbol/Type.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
-#include "lldb/Utility/Scalar.h" // for Scalar, operator!=
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-types.h" // for addr_t
-#include "llvm/Support/ErrorHandling.h" // for llvm_unreachable
-
-#include <assert.h> // for assert
-#include <memory> // for shared_ptr
+#include "lldb/Utility/DataExtractor.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-types.h"
+#include "llvm/Support/ErrorHandling.h"
+
+#include <assert.h>
+#include <memory>
namespace lldb_private {
class ExecutionContextScope;
diff --git a/lldb/source/Core/ValueObjectRegister.cpp b/lldb/source/Core/ValueObjectRegister.cpp
index 3f76fd50193..41d1c27f736 100644
--- a/lldb/source/Core/ValueObjectRegister.cpp
+++ b/lldb/source/Core/ValueObjectRegister.cpp
@@ -10,23 +10,23 @@
#include "lldb/Core/ValueObjectRegister.h"
#include "lldb/Core/Module.h"
-#include "lldb/Core/Value.h" // for Value, Value::ContextType:...
+#include "lldb/Core/Value.h"
#include "lldb/Symbol/CompilerType.h"
-#include "lldb/Symbol/TypeSystem.h" // for TypeSystem
+#include "lldb/Symbol/TypeSystem.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/RegisterContext.h"
-#include "lldb/Target/StackFrame.h" // for StackFrame
+#include "lldb/Target/StackFrame.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
-#include "lldb/Utility/Scalar.h" // for Scalar
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/DataExtractor.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/Utility/Stream.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
-#include <assert.h> // for assert
-#include <memory> // for shared_ptr
+#include <assert.h>
+#include <memory>
namespace lldb_private {
class ExecutionContextScope;
diff --git a/lldb/source/Core/ValueObjectSyntheticFilter.cpp b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
index 044387a4ae1..1da142f7b4f 100644
--- a/lldb/source/Core/ValueObjectSyntheticFilter.cpp
+++ b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
@@ -9,14 +9,14 @@
#include "lldb/Core/ValueObjectSyntheticFilter.h"
-#include "lldb/Core/Value.h" // for Value
+#include "lldb/Core/Value.h"
#include "lldb/Core/ValueObject.h"
#include "lldb/DataFormatters/TypeSynthetic.h"
-#include "lldb/Target/ExecutionContext.h" // for ExecutionContext
+#include "lldb/Target/ExecutionContext.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCategoriesSet
-#include "lldb/Utility/SharingPtr.h" // for SharingPtr
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/SharingPtr.h"
+#include "lldb/Utility/Status.h"
#include "llvm/ADT/STLExtras.h"
diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/Core/ValueObjectVariable.cpp
index 2f017aa36f7..4f52ec8ccab 100644
--- a/lldb/source/Core/ValueObjectVariable.cpp
+++ b/lldb/source/Core/ValueObjectVariable.cpp
@@ -9,12 +9,12 @@
#include "lldb/Core/ValueObjectVariable.h"
-#include "lldb/Core/Address.h" // for Address
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/Value.h"
-#include "lldb/Expression/DWARFExpression.h" // for DWARFExpression
-#include "lldb/Symbol/Declaration.h" // for Declaration
+#include "lldb/Expression/DWARFExpression.h"
+#include "lldb/Symbol/Declaration.h"
#include "lldb/Symbol/Function.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContext.h"
@@ -25,17 +25,17 @@
#include "lldb/Target/Process.h"
#include "lldb/Target/RegisterContext.h"
#include "lldb/Target/Target.h"
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
+#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/RegisterValue.h"
-#include "lldb/Utility/Scalar.h" // for Scalar, operator!=
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-private-enumerations.h" // for AddressType::eAddressTy...
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
-#include <assert.h> // for assert
-#include <memory> // for shared_ptr
+#include <assert.h>
+#include <memory>
namespace lldb_private {
class ExecutionContextScope;
diff --git a/lldb/source/Host/common/File.cpp b/lldb/source/Host/common/File.cpp
index 57e0706e024..810c1558840 100644
--- a/lldb/source/Host/common/File.cpp
+++ b/lldb/source/Host/common/File.cpp
@@ -27,7 +27,7 @@
#include "llvm/Support/ConvertUTF.h"
#include "llvm/Support/Errno.h"
#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Process.h" // for llvm::sys::Process::FileDescriptorHasColors()
+#include "llvm/Support/Process.h"
#include "lldb/Host/Config.h"
#include "lldb/Host/FileSystem.h"
diff --git a/lldb/source/Host/common/TaskPool.cpp b/lldb/source/Host/common/TaskPool.cpp
index c54b9a8ae56..ba1362a46f3 100644
--- a/lldb/source/Host/common/TaskPool.cpp
+++ b/lldb/source/Host/common/TaskPool.cpp
@@ -10,9 +10,9 @@
#include "lldb/Host/TaskPool.h"
#include "lldb/Host/ThreadLauncher.h"
-#include <cstdint> // for uint32_t
-#include <queue> // for queue
-#include <thread> // for thread
+#include <cstdint>
+#include <queue>
+#include <thread>
namespace lldb_private {
diff --git a/lldb/source/Host/linux/HostInfoLinux.cpp b/lldb/source/Host/linux/HostInfoLinux.cpp
index e0bf49f430a..f5a6b2c97a0 100644
--- a/lldb/source/Host/linux/HostInfoLinux.cpp
+++ b/lldb/source/Host/linux/HostInfoLinux.cpp
@@ -21,7 +21,7 @@
#include <unistd.h>
#include <algorithm>
-#include <mutex> // std::once
+#include <mutex>
using namespace lldb_private;
diff --git a/lldb/source/Host/windows/HostInfoWindows.cpp b/lldb/source/Host/windows/HostInfoWindows.cpp
index 2fde54b9f53..81392d9a85b 100644
--- a/lldb/source/Host/windows/HostInfoWindows.cpp
+++ b/lldb/source/Host/windows/HostInfoWindows.cpp
@@ -11,7 +11,7 @@
#include <objbase.h>
-#include <mutex> // std::once
+#include <mutex>
#include "lldb/Host/windows/HostInfoWindows.h"
#include "lldb/Host/windows/PosixApi.h"
diff --git a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h
index bdf6bae7519..acfb702d137 100644
--- a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h
+++ b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h
@@ -11,7 +11,7 @@
#define liblldb_HexagonDYLDRendezvous_H_
// C Includes
-#include <limits.h> // for PATH_MAX
+#include <limits.h>
// C++ Includes
#include <list>
#include <map>
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
index eb124509057..00c6acb87e3 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
@@ -9,7 +9,7 @@
// C Includes
// C++ Includes
-#include <cctype> // for alnum
+#include <cctype>
// Other libraries and framework includes
#include "clang/AST/ASTContext.h"
#include "clang/AST/ASTDiagnostic.h"
diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
index 708d6d1c318..d11cc1ed107 100644
--- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
+++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
@@ -26,8 +26,7 @@
#include "Utility/ARM_DWARF_Registers.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/MathExtras.h" // for SignExtend32 template function
- // and countTrailingZeros function
+#include "llvm/Support/MathExtras.h"
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
index ef0630ee5ab..bab24931197 100644
--- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
@@ -41,8 +41,7 @@
#include "Plugins/Process/Utility/RegisterInfos_arm64.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/MathExtras.h" // for SignExtend32 template function
- // and CountTrailingZeros_32 function
+#include "llvm/Support/MathExtras.h"
#include "Plugins/Process/Utility/InstructionUtils.h"
diff --git a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
index fe8dbd2bc5b..9b5cc704ce3 100644
--- a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
+++ b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
@@ -35,7 +35,7 @@
#include "llvm/ADT/STLExtras.h"
#include "Plugins/Process/Utility/InstructionUtils.h"
-#include "Plugins/Process/Utility/RegisterContext_mips.h" //mips32 has same registers nos as mips64
+#include "Plugins/Process/Utility/RegisterContext_mips.h"
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
index d6553f6e514..e77888c871b 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
@@ -16,7 +16,7 @@
#ifdef _WIN32
#include "lldb/Host/windows/windows.h"
-#include <dbghelp.h> // for MiniDumpWriteDump
+#include <dbghelp.h>
#endif
namespace lldb_private {
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
index 597bbf2c7de..f4a9eeb96cc 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
@@ -42,7 +42,7 @@
#include "llvm/Support/VersionTuple.h"
#if defined(__APPLE__)
-#include <TargetConditionals.h> // for TARGET_OS_TV, TARGET_OS_WATCH
+#include <TargetConditionals.h>
#endif
using namespace lldb;
diff --git a/lldb/source/Plugins/Process/Utility/ARMUtils.h b/lldb/source/Plugins/Process/Utility/ARMUtils.h
index 2bbd519b246..2c14dc936cb 100644
--- a/lldb/source/Plugins/Process/Utility/ARMUtils.h
+++ b/lldb/source/Plugins/Process/Utility/ARMUtils.h
@@ -12,7 +12,7 @@
#include "ARMDefines.h"
#include "InstructionUtils.h"
-#include "llvm/Support/MathExtras.h" // for SignExtend64 template function
+#include "llvm/Support/MathExtras.h"
// Common utilities for the ARM/Thumb Instruction Set Architecture.
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
index 466a83bdce7..88ed60e6164 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
// C Includes
-#include <stddef.h> // offsetof
+#include <stddef.h>
// C++ Includes
// Other libraries and framework includes
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
index a4619bba27d..3f5340213ff 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
@@ -8,9 +8,9 @@
//===----------------------------------------------------------------------===//
// C Includes
-#include <inttypes.h> // PRIx64
+#include <inttypes.h>
#include <stdarg.h>
-#include <stddef.h> // offsetof
+#include <stddef.h>
// C++ Includes
// Other libraries and framework includes
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 1a21ddf1333..54395fc8415 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -14,7 +14,7 @@
#include <stdlib.h>
#ifndef LLDB_DISABLE_POSIX
#include <netinet/in.h>
-#include <sys/mman.h> // for mmap
+#include <sys/mman.h>
#include <sys/socket.h>
#include <unistd.h>
#endif
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
index 3fd725cf944..0890f0c1bfc 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
@@ -11,7 +11,7 @@
#define SymbolFileDWARF_DWARFFormValue_h_
#include "DWARFDataExtractor.h"
-#include <stddef.h> // for NULL
+#include <stddef.h>
class DWARFUnit;
class SymbolFileDWARF;
diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
index 2779aee341d..93ff6e205f2 100644
--- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
@@ -48,7 +48,7 @@
#include "llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h"
#include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
-#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h" // For IsCPPMangledName
+#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
#include "Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.h"
#include "Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h"
diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp
index df1029e7c6d..761d6068ff6 100644
--- a/lldb/source/Utility/ArchSpec.cpp
+++ b/lldb/source/Utility/ArchSpec.cpp
@@ -11,15 +11,15 @@
#include "lldb/Utility/Log.h"
#include "lldb/Utility/NameMatches.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StringList.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_C...
+#include "lldb/lldb-defines.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/Twine.h" // for Twine
+#include "llvm/ADT/Twine.h"
#include "llvm/BinaryFormat/COFF.h"
#include "llvm/BinaryFormat/ELF.h"
-#include "llvm/BinaryFormat/MachO.h" // for CPUType::CPU_T...
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/BinaryFormat/MachO.h"
+#include "llvm/Support/Compiler.h"
#include "llvm/Support/Host.h"
using namespace lldb;
diff --git a/lldb/source/Utility/ConstString.cpp b/lldb/source/Utility/ConstString.cpp
index 3344710e204..9b8bea71e2a 100644
--- a/lldb/source/Utility/ConstString.cpp
+++ b/lldb/source/Utility/ConstString.cpp
@@ -12,20 +12,20 @@
#include "lldb/Utility/Stream.h"
#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/iterator.h" // for iterator_facade_base
-#include "llvm/Support/Allocator.h" // for BumpPtrAllocator
-#include "llvm/Support/DJB.h" // for djbHash
-#include "llvm/Support/FormatProviders.h" // for format_provider
+#include "llvm/ADT/iterator.h"
+#include "llvm/Support/Allocator.h"
+#include "llvm/Support/DJB.h"
+#include "llvm/Support/FormatProviders.h"
#include "llvm/Support/RWMutex.h"
#include "llvm/Support/Threading.h"
-#include <algorithm> // for min
+#include <algorithm>
#include <array>
-#include <utility> // for make_pair, pair
+#include <utility>
-#include <inttypes.h> // for PRIu64
-#include <stdint.h> // for uint8_t, uint32_t, uint64_t
-#include <string.h> // for size_t, strlen
+#include <inttypes.h>
+#include <stdint.h>
+#include <string.h>
using namespace lldb_private;
diff --git a/lldb/source/Utility/DataBufferLLVM.cpp b/lldb/source/Utility/DataBufferLLVM.cpp
index a31b5b76d2e..0ab3fe5afd4 100644
--- a/lldb/source/Utility/DataBufferLLVM.cpp
+++ b/lldb/source/Utility/DataBufferLLVM.cpp
@@ -13,8 +13,8 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
-#include <assert.h> // for assert
-#include <type_traits> // for move
+#include <assert.h>
+#include <type_traits>
using namespace lldb_private;
diff --git a/lldb/source/Utility/DataEncoder.cpp b/lldb/source/Utility/DataEncoder.cpp
index 7edee3c2f27..c26c0fa63ab 100644
--- a/lldb/source/Utility/DataEncoder.cpp
+++ b/lldb/source/Utility/DataEncoder.cpp
@@ -13,7 +13,7 @@
#include "lldb/Utility/Endian.h"
#include "llvm/Support/Endian.h"
-#include "llvm/Support/ErrorHandling.h" // for llvm_unreachable
+#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MathExtras.h"
#include <cassert>
diff --git a/lldb/source/Utility/DataExtractor.cpp b/lldb/source/Utility/DataExtractor.cpp
index 947232943aa..ae5a3f9b7d8 100644
--- a/lldb/source/Utility/DataExtractor.cpp
+++ b/lldb/source/Utility/DataExtractor.cpp
@@ -9,10 +9,10 @@
#include "lldb/Utility/DataExtractor.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderBig
-#include "lldb/lldb-forward.h" // for DataBufferSP
-#include "lldb/lldb-types.h" // for offset_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
#include "lldb/Utility/DataBuffer.h"
#include "lldb/Utility/DataBufferHeap.h"
@@ -28,15 +28,15 @@
#include "llvm/Support/MD5.h"
#include "llvm/Support/MathExtras.h"
-#include <algorithm> // for min
-#include <array> // for array
+#include <algorithm>
+#include <array>
#include <cassert>
-#include <cstdint> // for uint8_t, uint32_t, uint64_t
+#include <cstdint>
#include <string>
-#include <ctype.h> // for isprint
-#include <inttypes.h> // for PRIx64, PRId64
-#include <string.h> // for memcpy, memset, memchr
+#include <ctype.h>
+#include <inttypes.h>
+#include <string.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Utility/FileSpec.cpp b/lldb/source/Utility/FileSpec.cpp
index b805fd8323c..5a43cfec857 100644
--- a/lldb/source/Utility/FileSpec.cpp
+++ b/lldb/source/Utility/FileSpec.cpp
@@ -21,14 +21,14 @@
#include "llvm/Support/Program.h"
#include "llvm/Support/raw_ostream.h"
-#include <algorithm> // for replace, min, unique
-#include <system_error> // for error_code
-#include <vector> // for vector
-
-#include <assert.h> // for assert
-#include <limits.h> // for PATH_MAX
-#include <stdio.h> // for size_t, NULL, snpr...
-#include <string.h> // for strcmp
+#include <algorithm>
+#include <system_error>
+#include <vector>
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Utility/JSON.cpp b/lldb/source/Utility/JSON.cpp
index 7d70034ccab..725ea97955c 100644
--- a/lldb/source/Utility/JSON.cpp
+++ b/lldb/source/Utility/JSON.cpp
@@ -9,15 +9,15 @@
#include "lldb/Utility/JSON.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/ErrorHandling.h"
-#include <inttypes.h> // for PRIu64, PRId64
+#include <inttypes.h>
#include <limits.h>
-#include <stddef.h> // for size_t
-#include <utility> // for pair
+#include <stddef.h>
+#include <utility>
using namespace lldb_private;
diff --git a/lldb/source/Utility/Log.cpp b/lldb/source/Utility/Log.cpp
index eb026fb0475..2e8570b762a 100644
--- a/lldb/source/Utility/Log.cpp
+++ b/lldb/source/Utility/Log.cpp
@@ -12,24 +12,24 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/Twine.h" // for operator+, Twine
-#include "llvm/ADT/iterator.h" // for iterator_facade_base
+#include "llvm/ADT/Twine.h"
+#include "llvm/ADT/iterator.h"
#include "llvm/Support/Chrono.h"
-#include "llvm/Support/ManagedStatic.h" // for ManagedStatic
+#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/Threading.h"
#include "llvm/Support/raw_ostream.h"
-#include <chrono> // for duration, system_clock, syst...
+#include <chrono>
#include <cstdarg>
#include <mutex>
-#include <utility> // for pair
+#include <utility>
-#include <assert.h> // for assert
+#include <assert.h>
#if defined(_WIN32)
-#include <process.h> // for getpid
+#include <process.h>
#else
#include <unistd.h>
#include <pthread.h>
diff --git a/lldb/source/Utility/Logging.cpp b/lldb/source/Utility/Logging.cpp
index c9a6ef1bd1e..b97a88b5edc 100644
--- a/lldb/source/Utility/Logging.cpp
+++ b/lldb/source/Utility/Logging.cpp
@@ -10,9 +10,9 @@
#include "lldb/Utility/Logging.h"
#include "lldb/Utility/Log.h"
-#include "llvm/ADT/ArrayRef.h" // for ArrayRef
+#include "llvm/ADT/ArrayRef.h"
-#include <stdarg.h> // for va_end, va_list, va_start
+#include <stdarg.h>
using namespace lldb_private;
diff --git a/lldb/source/Utility/RegisterValue.cpp b/lldb/source/Utility/RegisterValue.cpp
index 2870ac2e249..f51a9641d70 100644
--- a/lldb/source/Utility/RegisterValue.cpp
+++ b/lldb/source/Utility/RegisterValue.cpp
@@ -15,20 +15,20 @@
#include "lldb/Utility/Status.h"
#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-private-types.h" // for RegisterInfo, type128
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-private-types.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h"
-#include <cstdint> // for uint8_t, uint32_t, uint64_t
-#include <string> // for string
-#include <tuple> // for tie, tuple
+#include <cstdint>
+#include <string>
+#include <tuple>
#include <vector>
-#include <assert.h> // for assert
-#include <inttypes.h> // for PRIx64
-#include <stdio.h> // for sscanf
+#include <assert.h>
+#include <inttypes.h>
+#include <stdio.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/source/Utility/Scalar.cpp b/lldb/source/Utility/Scalar.cpp
index 881006bb396..73a929cbd41 100644
--- a/lldb/source/Utility/Scalar.cpp
+++ b/lldb/source/Utility/Scalar.cpp
@@ -13,7 +13,7 @@
#include "lldb/Utility/Endian.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/Stream.h"
-#include "lldb/lldb-types.h" // for offset_t
+#include "lldb/lldb-types.h"
#include "llvm/ADT/SmallString.h"
diff --git a/lldb/source/Utility/SelectHelper.cpp b/lldb/source/Utility/SelectHelper.cpp
index 0f6a9630950..2979a67dc18 100644
--- a/lldb/source/Utility/SelectHelper.cpp
+++ b/lldb/source/Utility/SelectHelper.cpp
@@ -17,14 +17,14 @@
#include "lldb/Utility/SelectHelper.h"
#include "lldb/Utility/LLDBAssert.h"
#include "lldb/Utility/Status.h"
-#include "lldb/lldb-enumerations.h" // for ErrorType::eErrorTypePOSIX
-#include "lldb/lldb-types.h" // for socket_t
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-types.h"
-#include "llvm/ADT/DenseMap.h" // for DenseMapPair, DenseMap, Dense...
-#include "llvm/ADT/Optional.h" // for Optional
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/Optional.h"
#include <algorithm>
-#include <chrono> // for microseconds, seconds, steady...
+#include <chrono>
#include <errno.h>
#if defined(_WIN32)
diff --git a/lldb/source/Utility/Status.cpp b/lldb/source/Utility/Status.cpp
index 5caecc69830..062bd261ea8 100644
--- a/lldb/source/Utility/Status.cpp
+++ b/lldb/source/Utility/Status.cpp
@@ -11,16 +11,16 @@
#include "lldb/Utility/Status.h"
#include "lldb/Utility/VASPrintf.h"
-#include "lldb/lldb-defines.h" // for LLDB_GENERIC_ERROR
-#include "lldb/lldb-enumerations.h" // for ErrorType, ErrorType::eErr...
-#include "llvm/ADT/SmallString.h" // for SmallString
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Errno.h"
-#include "llvm/Support/FormatProviders.h" // for format_provider
+#include "llvm/Support/FormatProviders.h"
#include <cerrno>
#include <cstdarg>
-#include <string> // for string
+#include <string>
#include <system_error>
#ifdef __APPLE__
@@ -30,7 +30,7 @@
#ifdef _WIN32
#include <windows.h>
#endif
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
namespace llvm {
class raw_ostream;
diff --git a/lldb/source/Utility/Stream.cpp b/lldb/source/Utility/Stream.cpp
index df18348a4cc..ab5863d8a8c 100644
--- a/lldb/source/Utility/Stream.cpp
+++ b/lldb/source/Utility/Stream.cpp
@@ -11,7 +11,7 @@
#include "lldb/Utility/Endian.h"
#include "lldb/Utility/VASPrintf.h"
-#include "llvm/ADT/SmallString.h" // for SmallString
+#include "llvm/ADT/SmallString.h"
#include "llvm/Support/LEB128.h"
#include <string>
diff --git a/lldb/source/Utility/StreamGDBRemote.cpp b/lldb/source/Utility/StreamGDBRemote.cpp
index 2620e3786d2..9304d84f58a 100644
--- a/lldb/source/Utility/StreamGDBRemote.cpp
+++ b/lldb/source/Utility/StreamGDBRemote.cpp
@@ -9,8 +9,8 @@
#include "lldb/Utility/StreamGDBRemote.h"
-#include "lldb/Utility/Flags.h" // for Flags
-#include "lldb/Utility/Stream.h" // for Stream::::eBinary
+#include "lldb/Utility/Flags.h"
+#include "lldb/Utility/Stream.h"
#include <stdio.h>
diff --git a/lldb/source/Utility/StringExtractor.cpp b/lldb/source/Utility/StringExtractor.cpp
index 7528350cf75..ddf414702d8 100644
--- a/lldb/source/Utility/StringExtractor.cpp
+++ b/lldb/source/Utility/StringExtractor.cpp
@@ -11,9 +11,9 @@
#include <tuple>
-#include <ctype.h> // for isxdigit, isspace
+#include <ctype.h>
#include <stdlib.h>
-#include <string.h> // for memset
+#include <string.h>
static inline int xdigit_to_sint(char ch) {
if (ch >= 'a' && ch <= 'f')
diff --git a/lldb/source/Utility/StringExtractorGDBRemote.cpp b/lldb/source/Utility/StringExtractorGDBRemote.cpp
index 3cae06df3b1..2a8bd785576 100644
--- a/lldb/source/Utility/StringExtractorGDBRemote.cpp
+++ b/lldb/source/Utility/StringExtractorGDBRemote.cpp
@@ -9,7 +9,7 @@
#include "lldb/Utility/StringExtractorGDBRemote.h"
-#include <ctype.h> // for isxdigit
+#include <ctype.h>
#include <string.h>
StringExtractorGDBRemote::ResponseType
diff --git a/lldb/source/Utility/StringList.cpp b/lldb/source/Utility/StringList.cpp
index 190cb9d682c..fe7c1c4b5a6 100644
--- a/lldb/source/Utility/StringList.cpp
+++ b/lldb/source/Utility/StringList.cpp
@@ -10,13 +10,13 @@
#include "lldb/Utility/StringList.h"
#include "lldb/Utility/Log.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
-#include "llvm/ADT/ArrayRef.h" // for ArrayRef, makeArrayRef
+#include "llvm/ADT/ArrayRef.h"
-#include <algorithm> // for min
-#include <stdint.h> // for SIZE_MAX, uint32_t
-#include <string.h> // for size_t, strcspn, NULL
+#include <algorithm>
+#include <stdint.h>
+#include <string.h>
using namespace lldb_private;
diff --git a/lldb/source/Utility/StructuredData.cpp b/lldb/source/Utility/StructuredData.cpp
index 91e3941496d..b7f900d52bb 100644
--- a/lldb/source/Utility/StructuredData.cpp
+++ b/lldb/source/Utility/StructuredData.cpp
@@ -12,14 +12,14 @@
#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/JSON.h"
#include "lldb/Utility/Status.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
#include "lldb/Utility/StreamString.h"
-#include "llvm/ADT/STLExtras.h" // for make_unique
+#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/MemoryBuffer.h"
#include <cerrno>
#include <cstdlib>
#include <inttypes.h>
-#include <limits> // for numeric_limits
+#include <limits>
using namespace lldb_private;
diff --git a/lldb/source/Utility/TildeExpressionResolver.cpp b/lldb/source/Utility/TildeExpressionResolver.cpp
index ae947059d8b..34ca0254613 100644
--- a/lldb/source/Utility/TildeExpressionResolver.cpp
+++ b/lldb/source/Utility/TildeExpressionResolver.cpp
@@ -9,14 +9,14 @@
#include "lldb/Utility/TildeExpressionResolver.h"
-#include <assert.h> // for assert
-#include <system_error> // for error_code
+#include <assert.h>
+#include <system_error>
-#include "llvm/ADT/STLExtras.h" // for any_of
-#include "llvm/ADT/SmallVector.h" // for SmallVectorImpl
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h" // for fs
+#include "llvm/Support/raw_ostream.h"
#if !defined(_WIN32)
#include <pwd.h>
diff --git a/lldb/source/Utility/Timer.cpp b/lldb/source/Utility/Timer.cpp
index fe7787458fa..170d17a1fc9 100644
--- a/lldb/source/Utility/Timer.cpp
+++ b/lldb/source/Utility/Timer.cpp
@@ -12,11 +12,11 @@
#include <algorithm>
#include <map>
#include <mutex>
-#include <utility> // for pair
+#include <utility>
#include <vector>
-#include <assert.h> // for assert
-#include <stdarg.h> // for va_end, va_list, va_start
+#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
using namespace lldb_private;
diff --git a/lldb/source/Utility/VASprintf.cpp b/lldb/source/Utility/VASprintf.cpp
index 900d9754a9b..4368a373830 100644
--- a/lldb/source/Utility/VASprintf.cpp
+++ b/lldb/source/Utility/VASprintf.cpp
@@ -10,12 +10,12 @@
#include "lldb/Utility/VASPrintf.h"
#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h" // for SmallVectorImpl
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringRef.h"
-#include <assert.h> // for assert
-#include <stdarg.h> // for va_end, va_list, va_copy
-#include <stdio.h> // for vsnprintf, size_t
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
bool lldb_private::VASprintf(llvm::SmallVectorImpl<char> &buf, const char *fmt,
va_list args) {
diff --git a/lldb/source/Utility/VMRange.cpp b/lldb/source/Utility/VMRange.cpp
index 7e35d3ef0c6..20dc7dbbe75 100644
--- a/lldb/source/Utility/VMRange.cpp
+++ b/lldb/source/Utility/VMRange.cpp
@@ -10,14 +10,14 @@
#include "lldb/Utility/VMRange.h"
#include "lldb/Utility/Stream.h"
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-types.h"
#include <algorithm>
-#include <iterator> // for distance
-#include <vector> // for const_iterator
+#include <iterator>
+#include <vector>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for UINT32_MAX, uint32_t
+#include <stddef.h>
+#include <stdint.h>
using namespace lldb;
using namespace lldb_private;
diff --git a/lldb/tools/darwin-debug/darwin-debug.cpp b/lldb/tools/darwin-debug/darwin-debug.cpp
index e754ded474c..31b04bcde9b 100644
--- a/lldb/tools/darwin-debug/darwin-debug.cpp
+++ b/lldb/tools/darwin-debug/darwin-debug.cpp
@@ -24,7 +24,7 @@
//----------------------------------------------------------------------
#if defined(__APPLE__)
-#include <crt_externs.h> // for _NSGetEnviron()
+#include <crt_externs.h>
#include <getopt.h>
#include <limits.h>
#include <mach/machine.h>
diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp
index ab3dad16c4f..bfcd799f131 100644
--- a/lldb/tools/debugserver/source/RNBRemote.cpp
+++ b/lldb/tools/debugserver/source/RNBRemote.cpp
@@ -50,7 +50,7 @@
#include <zlib.h>
#endif
-#include <TargetConditionals.h> // for endianness predefines
+#include <TargetConditionals.h>
#include <iomanip>
#include <sstream>
#include <unordered_set>
diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp
index 7ae321ba431..8afe17bce37 100644
--- a/lldb/tools/debugserver/source/debugserver.cpp
+++ b/lldb/tools/debugserver/source/debugserver.cpp
@@ -9,19 +9,17 @@
#include <arpa/inet.h>
#include <asl.h>
-#include <crt_externs.h> // for _NSGetEnviron()
+#include <crt_externs.h>
#include <errno.h>
#include <getopt.h>
#include <netdb.h>
#include <netinet/in.h>
-#include <netinet/in.h>
#include <netinet/tcp.h>
#include <string>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
#include <sys/types.h>
-#include <sys/types.h>
#include <sys/un.h>
#include <vector>
diff --git a/lldb/tools/lldb-mi/MICmdBase.h b/lldb/tools/lldb-mi/MICmdBase.h
index cb44504a161..86dc51206a0 100644
--- a/lldb/tools/lldb-mi/MICmdBase.h
+++ b/lldb/tools/lldb-mi/MICmdBase.h
@@ -11,7 +11,7 @@
// C Includes
// C++ Includes
-#include <functional> // for function
+#include <functional>
// Other libraries and framework includes
#include "lldb/API/SBError.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdData.cpp b/lldb/tools/lldb-mi/MICmdCmdData.cpp
index 53c2d7e621a..7a4845bba43 100644
--- a/lldb/tools/lldb-mi/MICmdCmdData.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdData.cpp
@@ -23,9 +23,9 @@
#include "lldb/API/SBInstructionList.h"
#include "lldb/API/SBStream.h"
#include "lldb/API/SBThread.h"
-#include "llvm/ADT/Twine.h"
#include "llvm/ADT/StringRef.h"
-#include <inttypes.h> // For PRIx64
+#include "llvm/ADT/Twine.h"
+#include <inttypes.h>
#include <string>
// In-house headers:
diff --git a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
index ba96319469a..5988066883d 100644
--- a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
@@ -11,7 +11,7 @@
// Third party headers:
#include "lldb/API/SBCommandReturnObject.h"
-#include <inttypes.h> // For PRIx64
+#include <inttypes.h>
// In-house headers:
#include "MICmdArgValString.h"
diff --git a/lldb/tools/lldb-mi/MICmnBase.cpp b/lldb/tools/lldb-mi/MICmnBase.cpp
index 63544dc5b9c..7f82c6120e1 100644
--- a/lldb/tools/lldb-mi/MICmnBase.cpp
+++ b/lldb/tools/lldb-mi/MICmnBase.cpp
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
// Third party headers
-#include <stdarg.h> // va_list, va_start, var_end
+#include <stdarg.h>
// In-house headers:
#include "MICmnBase.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
index 9a173d1007e..cf4f21d94ef 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
@@ -9,11 +9,11 @@
// Third party headers:
#include "lldb/API/SBThread.h"
-#include <inttypes.h> // For PRIx64
+#include <inttypes.h>
#ifdef _WIN32
-#include <io.h> // For the ::_access()
+#include <io.h>
#else
-#include <unistd.h> // For the ::access()
+#include <unistd.h>
#endif // _WIN32
#include "lldb/API/SBBreakpointLocation.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
index 865a139e6e8..fae4662299e 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
@@ -20,9 +20,9 @@
#include "lldb/API/SBUnixSignals.h"
#include "llvm/Support/Compiler.h"
#ifdef _WIN32
-#include <io.h> // For the ::_access()
+#include <io.h>
#else
-#include <unistd.h> // For the ::access()
+#include <unistd.h>
#endif // _WIN32
// In-house headers:
@@ -39,7 +39,7 @@
#include "MICmnStreamStdout.h"
#include "MIDriver.h"
#include "MIUtilDebug.h"
-#include "Platform.h" // for PATH_MAX
+#include "Platform.h"
#include <algorithm>
diff --git a/lldb/tools/lldb-mi/MICmnResources.cpp b/lldb/tools/lldb-mi/MICmnResources.cpp
index 5fb36c5079f..d8fa0a82924 100644
--- a/lldb/tools/lldb-mi/MICmnResources.cpp
+++ b/lldb/tools/lldb-mi/MICmnResources.cpp
@@ -9,7 +9,7 @@
// Third party headers
#include "assert.h"
-#include <inttypes.h> // For PRIx64
+#include <inttypes.h>
// In-house headers:
#include "MICmnResources.h"
diff --git a/lldb/tools/lldb-mi/MICmnStreamStdin.cpp b/lldb/tools/lldb-mi/MICmnStreamStdin.cpp
index 154519dbec4..4d3fa2aabd9 100644
--- a/lldb/tools/lldb-mi/MICmnStreamStdin.cpp
+++ b/lldb/tools/lldb-mi/MICmnStreamStdin.cpp
@@ -11,7 +11,7 @@
#ifdef _MSC_VER
#include <windows.h>
#endif
-#include <string.h> // For std::strerror()
+#include <string.h>
// In-house headers:
#include "MICmnLog.h"
diff --git a/lldb/tools/lldb-mi/MIDataTypes.h b/lldb/tools/lldb-mi/MIDataTypes.h
index 34fe4575160..59ff099389c 100644
--- a/lldb/tools/lldb-mi/MIDataTypes.h
+++ b/lldb/tools/lldb-mi/MIDataTypes.h
@@ -21,7 +21,7 @@
// Debugging:
#ifdef _DEBUG
-#include <crtdbg.h> // C-runtime debugging library (defines _ASSERT).
+#include <crtdbg.h>
#endif // _DEBUG
#endif // _WIN32
diff --git a/lldb/tools/lldb-mi/MIDriverMain.cpp b/lldb/tools/lldb-mi/MIDriverMain.cpp
index 1b3521e8f03..4e4b92ca005 100644
--- a/lldb/tools/lldb-mi/MIDriverMain.cpp
+++ b/lldb/tools/lldb-mi/MIDriverMain.cpp
@@ -42,7 +42,7 @@
#include "MIDriver.h"
#include "MIDriverMgr.h"
#include "MIUtilDebug.h"
-#include "Platform.h" // Define signals - CODETAG_IOR_SIGNALS
+#include "Platform.h"
#if defined(_MSC_VER)
#pragma warning( \
diff --git a/lldb/tools/lldb-mi/MIUtilFileStd.cpp b/lldb/tools/lldb-mi/MIUtilFileStd.cpp
index 1e76c1c58fe..abf0ef407d3 100644
--- a/lldb/tools/lldb-mi/MIUtilFileStd.cpp
+++ b/lldb/tools/lldb-mi/MIUtilFileStd.cpp
@@ -11,7 +11,7 @@
#include <assert.h>
#include <cerrno>
#include <stdio.h>
-#include <string.h> // For strerror()
+#include <string.h>
// In-house headers:
#include "MICmnResources.h"
diff --git a/lldb/tools/lldb-mi/MIUtilString.cpp b/lldb/tools/lldb-mi/MIUtilString.cpp
index 3797d100179..2ddd4eb887f 100644
--- a/lldb/tools/lldb-mi/MIUtilString.cpp
+++ b/lldb/tools/lldb-mi/MIUtilString.cpp
@@ -10,12 +10,12 @@
// Third party headers
#include "llvm/Support/Compiler.h"
#include <cstdlib>
-#include <inttypes.h> // for PRIx8
-#include <limits.h> // for ULONG_MAX
-#include <memory> // std::unique_ptr
-#include <sstream> // std::stringstream
-#include <stdarg.h> // va_list, va_start, var_end
-#include <string.h> // for strncmp
+#include <inttypes.h>
+#include <limits.h>
+#include <memory>
+#include <sstream>
+#include <stdarg.h>
+#include <string.h>
// In-house headers:
#include "MIUtilString.h"
OpenPOWER on IntegriCloud