Move classes from Core -> Utility.

This moves the following classes from Core -> Utility.

ConstString
Error
RegularExpression
Stream
StreamString

The goal here is to get lldbUtility into a state where it has
no dependendencies except on itself and LLVM, so it can be the
starting point at which to start untangling LLDB's dependencies.
These are all low level and very widely used classes, and
previously lldbUtility had dependencies up to lldbCore in order
to use these classes.  So moving then down to lldbUtility makes
sense from both the short term and long term perspective in
solving this problem.

Differential Revision: https://reviews.llvm.org/D29427

llvm-svn: 293941

lldb/include/lldb/Breakpoint/BreakpointResolver.h

@@ -17,10 +17,10 @@
 #include "lldb/Breakpoint/Breakpoint.h"
 #include "lldb/Breakpoint/BreakpointResolver.h"
 #include "lldb/Core/Address.h"
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/RegularExpression.h"
 #include "lldb/Core/SearchFilter.h"
 #include "lldb/Host/FileSpec.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/RegularExpression.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h

@@ -17,7 +17,7 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Breakpoint/BreakpointResolver.h"
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Core/AddressResolver.h

@@ -18,9 +18,9 @@
 // Project includes
 #include "lldb/Core/Address.h"
 #include "lldb/Core/AddressRange.h"
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/SearchFilter.h"
 #include "lldb/Host/FileSpec.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Core/AddressResolverName.h

@@ -13,7 +13,7 @@
 // Project includes
 
 #include "lldb/Core/AddressResolver.h"
-#include "lldb/Core/RegularExpression.h"
+#include "lldb/Utility/RegularExpression.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Core/ArchSpec.h

@@ -12,7 +12,7 @@
 
 #if defined(__cplusplus)
 
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-forward.h"
 #include "llvm/ADT/Triple.h"
 

lldb/include/lldb/Core/Broadcaster.h

@@ -21,7 +21,7 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 #include "llvm/ADT/SmallVector.h"

lldb/include/lldb/Core/Communication.h

@@ -19,8 +19,8 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Host/HostThread.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/Utility/Timeout.h"
 #include "lldb/lldb-private.h"
 

lldb/include/lldb/Core/DataBufferMemoryMap.h

@@ -11,7 +11,7 @@
 #define liblldb_DataBufferMemoryMap_h_
 
 #include "lldb/Core/DataBuffer.h"
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private.h"
 #include <string>
 

lldb/include/lldb/Core/Event.h

@@ -19,9 +19,9 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/StructuredData.h"
 #include "lldb/Host/Predicate.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Core/FormatEntity.h

@@ -17,7 +17,7 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private.h"
 
 namespace llvm {

lldb/include/lldb/Core/IOHandler.h

@@ -21,13 +21,13 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Core/Flags.h"
-#include "lldb/Core/Stream.h"
 #include "lldb/Core/StringList.h"
 #include "lldb/Core/ValueObjectList.h"
 #include "lldb/Host/Predicate.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Error.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-public.h"
 

lldb/include/lldb/Core/Log.h

@@ -11,10 +11,10 @@
 #define liblldb_Log_h_
 
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/Flags.h"
 #include "lldb/Core/Logging.h"
 #include "lldb/Core/PluginInterface.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 // Other libraries and framework includes

lldb/include/lldb/Core/Mangled.h

@@ -11,7 +11,7 @@
 #define liblldb_Mangled_h_
 #if defined(__cplusplus)
 
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 #include <vector>
 

lldb/include/lldb/Core/MappedHash.h

@@ -23,7 +23,7 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/Stream.h"
 
 class MappedHash {
 public:

lldb/include/lldb/Core/ModuleSpec.h

@@ -12,10 +12,10 @@
 
 // Project includes
 #include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/Stream.h"
 #include "lldb/Core/UUID.h"
 #include "lldb/Host/FileSpec.h"
 #include "lldb/Target/PathMappingList.h"
+#include "lldb/Utility/Stream.h"
 
 // Other libraries and framework includes
 #include "llvm/Support/Chrono.h"

lldb/include/lldb/Core/Section.h

@@ -11,13 +11,13 @@
 #define liblldb_Section_h_
 
 #include "lldb/Core/AddressRange.h"
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/Flags.h"
 #include "lldb/Core/ModuleChild.h"
 #include "lldb/Core/RangeMap.h"
 #include "lldb/Core/UserID.h"
 #include "lldb/Core/VMRange.h"
 #include "lldb/Symbol/ObjectFile.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 #include <limits.h>
 

lldb/include/lldb/Core/StreamAsynchronousIO.h

@@ -13,7 +13,7 @@
 
 #include <string>
 
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/Stream.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Core/StreamBuffer.h

@@ -10,7 +10,7 @@
 #ifndef liblldb_StreamBuffer_h_
 #define liblldb_StreamBuffer_h_
 
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/Stream.h"
 #include "llvm/ADT/SmallVector.h"
 #include <stdio.h>
 #include <string>

lldb/include/lldb/Core/StreamCallback.h

@@ -13,8 +13,8 @@
 #include <mutex>
 #include <string>
 
-#include "lldb/Core/Stream.h"
-#include "lldb/Core/StreamString.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/StreamString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Core/StreamFile.h

@@ -18,8 +18,8 @@
 // Other libraries and framework includes
 // Project includes
 
-#include "lldb/Core/Stream.h"
 #include "lldb/Host/File.h"
+#include "lldb/Utility/Stream.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Core/StreamGDBRemote.h

@@ -17,7 +17,7 @@
 // Other libraries and framework includes
 // Project includes
 
-#include "lldb/Core/StreamString.h"
+#include "lldb/Utility/StreamString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Core/StructuredData.h

@@ -23,8 +23,8 @@
 #include "llvm/ADT/StringRef.h"
 
 // Project includes
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/lldb-defines.h"
 
 namespace lldb_private {

lldb/include/lldb/Core/UniqueCStringMap.h

@@ -17,7 +17,9 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/RegularExpression.h"
+#include "lldb/Utility/RegularExpression.h"
+
+#include "llvm/ADT/StringRef.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Core/UserSettingsController.h

@@ -19,11 +19,11 @@
 // Other libraries and framework includes
 // Project includes
 
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/Stream.h"
-#include "lldb/Core/StreamString.h"
 #include "lldb/Core/StringList.h"
 #include "lldb/Interpreter/OptionValue.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/StreamString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Core/Value.h

@@ -17,9 +17,9 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/DataBufferHeap.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Core/Scalar.h"
 #include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Core/ValueObject.h

@@ -22,9 +22,7 @@
 #include "llvm/ADT/SmallVector.h"
 
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Core/Flags.h"
 #include "lldb/Core/UserID.h"
 #include "lldb/Core/Value.h"
@@ -33,6 +31,8 @@
 #include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/StackID.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/Utility/SharedCluster.h"
 #include "lldb/lldb-private.h"
 

lldb/include/lldb/DataFormatters/DataVisualization.h

@@ -15,9 +15,9 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/DataFormatters/FormatClasses.h"
 #include "lldb/DataFormatters/FormatManager.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/DataFormatters/FormatCache.h

@@ -18,7 +18,7 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-public.h"
 
 namespace lldb_private {

lldb/include/lldb/DataFormatters/FormattersContainer.h

@@ -22,7 +22,6 @@
 // Project includes
 #include "lldb/lldb-public.h"
 
-#include "lldb/Core/RegularExpression.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/DataFormatters/FormatClasses.h"
 #include "lldb/DataFormatters/TypeFormat.h"
@@ -30,6 +29,7 @@
 #include "lldb/DataFormatters/TypeSynthetic.h"
 #include "lldb/DataFormatters/TypeValidator.h"
 #include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/RegularExpression.h"
 #include "lldb/Utility/StringLexer.h"
 
 namespace lldb_private {

lldb/include/lldb/DataFormatters/TypeSummary.h

@@ -23,9 +23,9 @@
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-public.h"
 
-#include "lldb/Core/Error.h"
 #include "lldb/Core/FormatEntity.h"
 #include "lldb/Core/StructuredData.h"
+#include "lldb/Utility/Error.h"
 
 namespace lldb_private {
 class TypeSummaryOptions {

lldb/include/lldb/DataFormatters/VectorIterator.h

@@ -13,8 +13,8 @@
 
 #include "lldb/lldb-forward.h"
 
-#include "lldb/Core/ConstString.h"
 #include "lldb/Target/ExecutionContext.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 namespace formatters {

lldb/include/lldb/Expression/DWARFExpression.h

@@ -13,8 +13,8 @@
 #include "lldb/Core/Address.h"
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/Disassembler.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Core/Scalar.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private.h"
 #include <functional>
 

lldb/include/lldb/Expression/ExpressionParser.h

@@ -10,7 +10,7 @@
 #ifndef liblldb_ExpressionParser_h_
 #define liblldb_ExpressionParser_h_
 
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-public.h"
 
 namespace lldb_private {

lldb/include/lldb/Expression/ExpressionVariable.h

@@ -19,8 +19,8 @@
 #include "llvm/ADT/DenseMap.h"
 
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/ValueObject.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-public.h"
 
 namespace lldb_private {

lldb/include/lldb/Expression/IRInterpreter.h

@@ -10,8 +10,8 @@
 #ifndef liblldb_IRInterpreter_h_
 #define liblldb_IRInterpreter_h_
 
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/lldb-public.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/Pass.h"

lldb/include/lldb/Expression/Materializer.h

@@ -17,10 +17,10 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/Error.h"
 #include "lldb/Expression/IRMemoryMap.h"
 #include "lldb/Symbol/TaggedASTType.h"
 #include "lldb/Target/StackFrame.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private-types.h"
 
 namespace lldb_private {

lldb/include/lldb/Host/FileCache.h

@@ -14,8 +14,8 @@
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-types.h"
 
-#include "lldb/Core/Error.h"
 #include "lldb/Host/FileSpec.h"
+#include "lldb/Utility/Error.h"
 
 namespace lldb_private {
 class FileCache {

lldb/include/lldb/Host/FileSpec.h

@@ -17,9 +17,9 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/STLUtils.h"
 #include "lldb/Host/PosixApi.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 #include "llvm/Support/FormatVariadic.h"

lldb/include/lldb/Host/FileSystem.h

@@ -10,8 +10,8 @@
 #ifndef liblldb_Host_FileSystem_h
 #define liblldb_Host_FileSystem_h
 
-#include "lldb/Core/Error.h"
 #include "lldb/Host/FileSpec.h"
+#include "lldb/Utility/Error.h"
 #include "llvm/Support/Chrono.h"
 
 #include "lldb/lldb-types.h"

lldb/include/lldb/Host/HostNativeProcessBase.h

@@ -10,8 +10,8 @@
 #ifndef lldb_Host_HostNativeProcessBase_h_
 #define lldb_Host_HostNativeProcessBase_h_
 
-#include "lldb/Core/Error.h"
 #include "lldb/Host/HostProcess.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
 

lldb/include/lldb/Host/HostNativeThreadBase.h

@@ -10,7 +10,7 @@
 #ifndef lldb_Host_HostNativeThreadBase_h_
 #define lldb_Host_HostNativeThreadBase_h_
 
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
 

lldb/include/lldb/Host/HostThread.h

@@ -10,8 +10,8 @@
 #ifndef lldb_Host_HostThread_h_
 #define lldb_Host_HostThread_h_
 
-#include "lldb/Core/Error.h"
 #include "lldb/Host/HostNativeThreadForward.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-types.h"
 
 #include <memory>

lldb/include/lldb/Host/LockFileBase.h

@@ -10,7 +10,7 @@
 #ifndef liblldb_Host_LockFileBase_h_
 #define liblldb_Host_LockFileBase_h_
 
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/Error.h"
 
 #include <functional>
 

lldb/include/lldb/Host/MainLoopBase.h

@@ -14,8 +14,8 @@
 
 #include "llvm/Support/ErrorHandling.h"
 
-#include "lldb/Core/Error.h"
 #include "lldb/Host/IOObject.h"
+#include "lldb/Utility/Error.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Host/PipeBase.h

@@ -14,7 +14,7 @@
 #include <chrono>
 #include <string>
 
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/Error.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 

lldb/include/lldb/Host/Socket.h

@@ -15,10 +15,10 @@
 
 #include "lldb/lldb-private.h"
 
-#include "lldb/Core/Error.h"
 #include "lldb/Host/IOObject.h"
 #include "lldb/Host/Predicate.h"
 #include "lldb/Host/SocketAddress.h"
+#include "lldb/Utility/Error.h"
 
 #ifdef _WIN32
 #include "lldb/Host/windows/windows.h"

lldb/include/lldb/Host/ThreadLauncher.h

@@ -11,8 +11,8 @@
 #ifndef lldb_Host_ThreadLauncher_h_
 #define lldb_Host_ThreadLauncher_h_
 
-#include "lldb/Core/Error.h"
 #include "lldb/Host/HostThread.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-types.h"
 
 #include "llvm/ADT/StringRef.h"

lldb/include/lldb/Host/XML.h

@@ -24,8 +24,8 @@
 #include "llvm/ADT/StringRef.h"
 
 // Project includes
-#include "lldb/Core/StreamString.h"
 #include "lldb/Core/StructuredData.h"
+#include "lldb/Utility/StreamString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Host/common/NativeBreakpointList.h

@@ -10,7 +10,7 @@
 #ifndef liblldb_NativeBreakpointList_h_
 #define liblldb_NativeBreakpointList_h_
 
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private-forward.h"
 // #include "lldb/Host/NativeBreakpoint.h"
 

lldb/include/lldb/Host/common/NativeProcessProtocol.h

@@ -13,8 +13,8 @@
 #include <mutex>
 #include <vector>
 
-#include "lldb/Core/Error.h"
 #include "lldb/Host/MainLoop.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private-forward.h"
 #include "lldb/lldb-types.h"
 #include "llvm/ADT/StringRef.h"

lldb/include/lldb/Host/common/NativeWatchpointList.h

@@ -10,7 +10,7 @@
 #ifndef liblldb_NativeWatchpointList_h_
 #define liblldb_NativeWatchpointList_h_
 
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private-forward.h"
 
 #include <map>

lldb/include/lldb/Host/posix/HostProcessPosix.h

@@ -14,8 +14,8 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/Error.h"
 #include "lldb/Host/HostNativeProcessBase.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-types.h"
 
 namespace lldb_private {

lldb/include/lldb/Interpreter/Args.h

@@ -21,8 +21,8 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 // Project includes
-#include "lldb/Core/Error.h"
 #include "lldb/Host/OptionParser.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private-types.h"
 #include "lldb/lldb-types.h"
 

lldb/include/lldb/Interpreter/CommandCompletions.h

@@ -17,8 +17,8 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/FileSpecList.h"
-#include "lldb/Core/RegularExpression.h"
 #include "lldb/Core/SearchFilter.h"
+#include "lldb/Utility/RegularExpression.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Interpreter/CommandHistory.h

@@ -18,7 +18,7 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Interpreter/CommandObjectRegexCommand.h

@@ -16,8 +16,8 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/RegularExpression.h"
 #include "lldb/Interpreter/CommandObject.h"
+#include "lldb/Utility/RegularExpression.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Interpreter/CommandReturnObject.h

@@ -16,8 +16,8 @@
 // Project includes
 #include "lldb/Core/STLUtils.h"
 #include "lldb/Core/StreamFile.h"
-#include "lldb/Core/StreamString.h"
-#include "lldb/Core/StreamTee.h"
+#include "lldb/Utility/StreamString.h"
+#include "lldb/Utility/StreamTee.h"
 #include "lldb/lldb-private.h"
 
 #include "llvm/ADT/StringRef.h"

lldb/include/lldb/Interpreter/OptionGroupPlatform.h

@@ -14,8 +14,8 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Interpreter/Options.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Interpreter/OptionValue.h

@@ -14,9 +14,9 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Core/FormatEntity.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-defines.h"
 
 namespace lldb_private {

lldb/include/lldb/Interpreter/OptionValueEnumeration.h

@@ -14,12 +14,12 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/Error.h"
-#include "lldb/Core/Stream.h"
-#include "lldb/Core/StreamString.h"
 #include "lldb/Core/UniqueCStringMap.h"
 #include "lldb/Interpreter/OptionValue.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Error.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/StreamString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Interpreter/OptionValueProperties.h

@@ -16,11 +16,11 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/FormatEntity.h"
 #include "lldb/Core/UniqueCStringMap.h"
 #include "lldb/Interpreter/OptionValue.h"
 #include "lldb/Interpreter/Property.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Interpreter/OptionValueRegex.h

@@ -14,8 +14,8 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/RegularExpression.h"
 #include "lldb/Interpreter/OptionValue.h"
+#include "lldb/Utility/RegularExpression.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Interpreter/Property.h

@@ -16,9 +16,9 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/Flags.h"
 #include "lldb/Interpreter/OptionValue.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-defines.h"
 
 namespace lldb_private {

lldb/include/lldb/Interpreter/ScriptInterpreter.h

@@ -18,9 +18,9 @@
 
 #include "lldb/Breakpoint/BreakpointOptions.h"
 #include "lldb/Core/Broadcaster.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Core/StructuredData.h"
+#include "lldb/Utility/Error.h"
 
 #include "lldb/Utility/PseudoTerminal.h"
 

lldb/include/lldb/Symbol/Block.h

@@ -18,11 +18,11 @@
 // Project includes
 #include "lldb/Core/AddressRange.h"
 #include "lldb/Core/RangeMap.h"
-#include "lldb/Core/Stream.h"
 #include "lldb/Core/UserID.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Symbol/LineEntry.h"
 #include "lldb/Symbol/SymbolContext.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Symbol/ClangASTContext.h

@@ -31,9 +31,9 @@
 // Project includes
 #include "Plugins/ExpressionParser/Clang/ClangPersistentVariables.h"
 #include "lldb/Core/ClangForward.h"
-#include "lldb/Core/ConstString.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Symbol/TypeSystem.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-enumerations.h"
 
 class DWARFASTParserClang;

lldb/include/lldb/Symbol/CompileUnit.h

@@ -12,10 +12,10 @@
 
 #include "lldb/Core/FileSpecList.h"
 #include "lldb/Core/ModuleChild.h"
-#include "lldb/Core/Stream.h"
 #include "lldb/Core/UserID.h"
 #include "lldb/Symbol/DebugMacros.h"
 #include "lldb/Symbol/Function.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/lldb-enumerations.h"
 
 namespace lldb_private {

lldb/include/lldb/Symbol/CompilerDecl.h

@@ -10,8 +10,8 @@
 #ifndef liblldb_CompilerDecl_h_
 #define liblldb_CompilerDecl_h_
 
-#include "lldb/Core/ConstString.h"
 #include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Symbol/CompilerDeclContext.h

@@ -12,7 +12,7 @@
 
 #include <vector>
 
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Symbol/DebugMacros.h

@@ -17,7 +17,7 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Symbol/GoASTContext.h

@@ -20,9 +20,9 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Symbol/TypeSystem.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Symbol/JavaASTContext.h

@@ -18,8 +18,8 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Symbol/TypeSystem.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Symbol/OCamlASTContext.h

@@ -21,9 +21,9 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Symbol/TypeSystem.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Symbol/Type.h

@@ -11,11 +11,11 @@
 #define liblldb_Type_h_
 
 #include "lldb/Core/ClangForward.h"
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/UserID.h"
 #include "lldb/Symbol/CompilerDecl.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Symbol/Declaration.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 #include "llvm/ADT/APSInt.h"

lldb/include/lldb/Symbol/UnwindPlan.h

@@ -19,8 +19,8 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/AddressRange.h"
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Target/ABI.h

@@ -14,9 +14,9 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/Error.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Symbol/UnwindPlan.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private.h"
 
 #include "llvm/ADT/ArrayRef.h"

lldb/include/lldb/Target/DynamicLoader.h

@@ -11,9 +11,9 @@
 #define liblldb_DynamicLoader_h_
 
 // Project includes
-#include "lldb/Core/Error.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Core/UUID.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Target/MemoryRegionInfo.h

@@ -11,8 +11,8 @@
 #ifndef lldb_MemoryRegionInfo_h
 #define lldb_MemoryRegionInfo_h
 
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/RangeMap.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Range.h"
 
 namespace lldb_private {

lldb/include/lldb/Target/PathMappingList.h

@@ -15,8 +15,8 @@
 #include <map>
 #include <vector>
 // Other libraries and framework includes
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/Error.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Error.h"
 // Project includes
 
 namespace lldb_private {

lldb/include/lldb/Target/Platform.h

@@ -22,11 +22,11 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Core/UserSettingsController.h"
 #include "lldb/Host/FileSpec.h"
 #include "lldb/Interpreter/Options.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private-forward.h"
 #include "lldb/lldb-public.h"
 

lldb/include/lldb/Target/Process.h

@@ -30,7 +30,6 @@
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/Broadcaster.h"
 #include "lldb/Core/Communication.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Core/Event.h"
 #include "lldb/Core/Listener.h"
 #include "lldb/Core/LoadedModuleInfoList.h"
@@ -48,6 +47,7 @@
 #include "lldb/Target/ProcessLaunchInfo.h"
 #include "lldb/Target/QueueList.h"
 #include "lldb/Target/ThreadList.h"
+#include "lldb/Utility/Error.h"
 #include "lldb/lldb-private.h"
 
 #include "llvm/ADT/ArrayRef.h"

lldb/include/lldb/Target/QueueItem.h

@@ -23,7 +23,7 @@
 #include "lldb/lldb-private.h"
 
 #include "lldb/Core/Address.h"
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Target/StackFrame.h

@@ -17,15 +17,15 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/Error.h"
 #include "lldb/Core/Flags.h"
 #include "lldb/Core/Scalar.h"
-#include "lldb/Core/StreamString.h"
 #include "lldb/Core/UserID.h"
 #include "lldb/Core/ValueObjectList.h"
 #include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Target/StackID.h"
+#include "lldb/Utility/Error.h"
+#include "lldb/Utility/StreamString.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Target/SystemRuntime.h

@@ -16,12 +16,12 @@
 // Project includes
 #include <vector>
 
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Core/StructuredData.h"
 #include "lldb/Target/QueueItem.h"
 #include "lldb/Target/QueueList.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 #include "lldb/lldb-public.h"
 

lldb/include/lldb/Target/UnixSignals.h

@@ -17,7 +17,7 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Core/ConstString.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {

lldb/include/lldb/Utility/ConstString.h

@@ -21,7 +21,7 @@
 namespace lldb_private {
 
 //----------------------------------------------------------------------
-/// @class ConstString ConstString.h "lldb/Core/ConstString.h"
+/// @class ConstString ConstString.h "lldb/Utility/ConstString.h"
 /// @brief A uniqued constant string class.
 ///
 /// Provides an efficient way to store strings as uniqued strings. After

lldb/include/lldb/Utility/Error.h

@@ -27,7 +27,7 @@ namespace lldb_private {
 class Log;
 
 //----------------------------------------------------------------------
-/// @class Error Error.h "lldb/Core/Error.h"
+/// @class Error Error.h "lldb/Utility/Error.h"
 /// @brief An error handling class.
 ///
 /// This class is designed to be able to hold any error code that can be

lldb/include/lldb/Utility/JSON.h

@@ -10,7 +10,7 @@
 #ifndef utility_JSON_h_
 #define utility_JSON_h_
 
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StringExtractor.h"
 
 #include <inttypes.h>

lldb/include/lldb/Utility/ProcessStructReader.h

@@ -14,11 +14,11 @@
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
 
-#include "lldb/Core/ConstString.h"
 #include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/Error.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Target/Process.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Error.h"
 
 #include <initializer_list>
 #include <map>

lldb/include/lldb/Utility/RegularExpression.h

@@ -48,7 +48,8 @@ class StringRef;
 namespace lldb_private {
 
 //----------------------------------------------------------------------
-/// @class RegularExpression RegularExpression.h "lldb/Core/RegularExpression.h"
+/// @class RegularExpression RegularExpression.h
+/// "lldb/Utility/RegularExpression.h"
 /// @brief A C++ wrapper class for regex.
 ///
 /// This regular expression class wraps the posix regex functions

lldb/include/lldb/Utility/Stream.h

@@ -24,7 +24,7 @@
 namespace lldb_private {
 
 //----------------------------------------------------------------------
-/// @class Stream Stream.h "lldb/Core/Stream.h"
+/// @class Stream Stream.h "lldb/Utility/Stream.h"
 /// @brief A stream class that can stream formatted output to a file.
 //----------------------------------------------------------------------
 class Stream {
@@ -34,7 +34,7 @@ public:
   //------------------------------------------------------------------
   enum {
     eBinary = (1 << 0) ///< Get and put data as binary instead of as the default
-                       ///string mode.
+                       /// string mode.
   };
 
   //------------------------------------------------------------------

lldb/include/lldb/Utility/StreamString.h

@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/Stream.h"
 
 namespace lldb_private {
 

lldb/include/lldb/Utility/StreamTee.h

@@ -14,7 +14,7 @@
 
 #include <mutex>
 
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/Stream.h"
 
 namespace lldb_private {
 

lldb/include/lldb/lldb-private-enumerations.h

@@ -268,10 +268,13 @@ template <> struct format_provider<lldb_private::Vote> {
     switch (V) {
     case lldb_private::eVoteNo:
       Stream << "no";
+      return;
     case lldb_private::eVoteNoOpinion:
       Stream << "no opinion";
+      return;
     case lldb_private::eVoteYes:
       Stream << "yes";
+      return;
     }
     Stream << "invalid";
   }

lldb/source/API/SBAddress.cpp

@@ -14,9 +14,9 @@
 #include "lldb/Core/Address.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Module.h"
-#include "lldb/Core/StreamString.h"
 #include "lldb/Symbol/LineEntry.h"
 #include "lldb/Target/Target.h"
+#include "lldb/Utility/StreamString.h"
 
 using namespace lldb;
 using namespace lldb_private;

lldb/source/API/SBBreakpoint.cpp

@@ -27,7 +27,6 @@
 #include "lldb/Core/Address.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Log.h"
-#include "lldb/Core/Stream.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/ScriptInterpreter.h"
@@ -36,6 +35,7 @@
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/ThreadSpec.h"
+#include "lldb/Utility/Stream.h"
 
 #include "lldb/lldb-enumerations.h"
 

lldb/source/API/SBBreakpointLocation.cpp

@@ -17,13 +17,13 @@
 #include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Log.h"
-#include "lldb/Core/Stream.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/ScriptInterpreter.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/ThreadSpec.h"
 #include "lldb/Target/ThreadSpec.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
 

lldb/source/API/SBCommandReturnObject.cpp

@@ -15,9 +15,9 @@
 #include "lldb/API/SBError.h"
 #include "lldb/API/SBStream.h"
 
-#include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
+#include "lldb/Utility/Error.h"
 
 using namespace lldb;
 using namespace lldb_private;

lldb/source/API/SBData.cpp

@@ -16,7 +16,7 @@
 #include "lldb/Core/DataBufferHeap.h"
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/Log.h"
-#include "lldb/Core/Stream.h"
+#include "lldb/Utility/Stream.h"
 
 using namespace lldb;
 using namespace lldb_private;

lldb/source/API/SBDeclaration.cpp

@@ -11,8 +11,8 @@
 #include "lldb/API/SBDeclaration.h"
 #include "lldb/API/SBStream.h"
 #include "lldb/Core/Log.h"
-#include "lldb/Core/Stream.h"
 #include "lldb/Symbol/Declaration.h"
+#include "lldb/Utility/Stream.h"
 
 #include <limits.h>