From 7f6f46cf15ec067f708e0c908af19abf62be7ec9 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Thu, 24 Oct 2024 20:20:48 -0700 Subject: [PATCH 1/2] [lldb] Move ValueObject into its own library (NFC) (#113393) ValueObject is part of lldbCore for historical reasons, but conceptually it deserves to be its own library. This does introduce a (link-time) circular dependency between lldbCore and lldbValueObject, which is unfortunate but probably unavoidable because so many things in LLDB rely on ValueObject. We already have cycles and these libraries are never built as dylibs so while this doesn't improve the situation, it also doesn't make things worse. The header includes were updated with the following command: ``` find . -type f -exec sed -i.bak "s%include \"lldb/Core/ValueObject%include \"lldb/ValueObject/ValueObject%" '{}' \; ``` (cherry picked from commit b852fb1ec5fa15f0b913cc4988cbd09239b19904) --- lldb/include/lldb/Core/IOHandler.h | 1 - .../lldb/DataFormatters/FormattersContainer.h | 2 +- lldb/include/lldb/DataFormatters/TypeFormat.h | 2 +- .../lldb/DataFormatters/TypeSynthetic.h | 2 +- .../lldb/Expression/ExpressionVariable.h | 2 +- .../OptionGroupValueObjectDisplay.h | 2 +- lldb/include/lldb/Target/LanguageRuntime.h | 2 +- lldb/include/lldb/Target/StackFrame.h | 2 +- .../lldb/Target/StackFrameRecognizer.h | 4 +- .../lldb/{Core => ValueObject}/ValueObject.h | 8 ++-- .../{Core => ValueObject}/ValueObjectCast.h | 11 ++--- .../{Core => ValueObject}/ValueObjectChild.h | 15 +++--- .../ValueObjectConstResult.h | 19 ++++---- .../ValueObjectConstResultCast.h | 10 ++-- .../ValueObjectConstResultChild.h | 23 ++++----- .../ValueObjectConstResultImpl.h | 8 ++-- .../ValueObjectDynamicValue.h | 8 ++-- .../{Core => ValueObject}/ValueObjectList.h | 7 +-- .../{Core => ValueObject}/ValueObjectMemory.h | 8 ++-- .../ValueObjectRegister.h | 8 ++-- .../ValueObjectSyntheticFilter.h | 8 ++-- .../ValueObjectUpdater.h | 8 ++-- .../{Core => ValueObject}/ValueObjectVTable.h | 8 ++-- .../ValueObjectVariable.h | 10 ++-- lldb/source/API/CMakeLists.txt | 1 + lldb/source/API/SBBlock.cpp | 2 +- lldb/source/API/SBFrame.cpp | 12 ++--- lldb/source/API/SBModule.cpp | 4 +- lldb/source/API/SBTarget.cpp | 6 +-- lldb/source/API/SBThread.cpp | 2 +- lldb/source/API/SBType.cpp | 2 +- lldb/source/API/SBValue.cpp | 4 +- lldb/source/API/SBValueList.cpp | 2 +- lldb/source/Breakpoint/BreakpointLocation.cpp | 2 +- lldb/source/Breakpoint/CMakeLists.txt | 1 + lldb/source/Breakpoint/Watchpoint.cpp | 4 +- lldb/source/CMakeLists.txt | 1 + lldb/source/Commands/CMakeLists.txt | 1 + .../Commands/CommandObjectDWIMPrint.cpp | 2 +- lldb/source/Commands/CommandObjectFrame.cpp | 2 +- lldb/source/Commands/CommandObjectMemory.cpp | 2 +- lldb/source/Commands/CommandObjectTarget.cpp | 2 +- lldb/source/Commands/CommandObjectThread.cpp | 2 +- .../Commands/CommandObjectWatchpoint.cpp | 2 +- lldb/source/Core/CMakeLists.txt | 16 +------ lldb/source/Core/DumpRegisterValue.cpp | 4 +- lldb/source/Core/FormatEntity.cpp | 4 +- lldb/source/Core/IOHandlerCursesGUI.cpp | 6 +-- lldb/source/DataFormatters/CMakeLists.txt | 3 +- .../DataFormatters/CXXFunctionPointer.cpp | 2 +- .../DataFormatters/DumpValueObjectOptions.cpp | 2 +- lldb/source/DataFormatters/FormatManager.cpp | 2 +- lldb/source/DataFormatters/StringPrinter.cpp | 2 +- lldb/source/DataFormatters/TypeSummary.cpp | 2 +- .../DataFormatters/ValueObjectPrinter.cpp | 2 +- lldb/source/DataFormatters/VectorType.cpp | 4 +- lldb/source/Expression/CMakeLists.txt | 1 + lldb/source/Expression/FunctionCaller.cpp | 4 +- lldb/source/Expression/IRInterpreter.cpp | 2 +- lldb/source/Expression/LLVMUserExpression.cpp | 2 +- lldb/source/Expression/Materializer.cpp | 4 +- lldb/source/Expression/UserExpression.cpp | 2 +- .../Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp | 2 +- .../Plugins/ABI/AArch64/ABISysV_arm64.cpp | 2 +- .../source/Plugins/ABI/AArch64/CMakeLists.txt | 1 + lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp | 6 +-- lldb/source/Plugins/ABI/ARC/CMakeLists.txt | 1 + lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp | 2 +- lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp | 2 +- lldb/source/Plugins/ABI/ARM/CMakeLists.txt | 1 + .../Plugins/ABI/Hexagon/ABISysV_hexagon.cpp | 6 +-- .../source/Plugins/ABI/Hexagon/CMakeLists.txt | 1 + .../Plugins/ABI/MSP430/ABISysV_msp430.cpp | 6 +-- lldb/source/Plugins/ABI/MSP430/CMakeLists.txt | 1 + lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp | 6 +-- .../Plugins/ABI/Mips/ABISysV_mips64.cpp | 6 +-- lldb/source/Plugins/ABI/Mips/CMakeLists.txt | 1 + .../Plugins/ABI/PowerPC/ABISysV_ppc.cpp | 6 +-- .../Plugins/ABI/PowerPC/ABISysV_ppc64.cpp | 6 +-- .../source/Plugins/ABI/PowerPC/CMakeLists.txt | 1 + .../Plugins/ABI/RISCV/ABISysV_riscv.cpp | 2 +- lldb/source/Plugins/ABI/RISCV/CMakeLists.txt | 1 + .../Plugins/ABI/SystemZ/ABISysV_s390x.cpp | 6 +-- .../source/Plugins/ABI/SystemZ/CMakeLists.txt | 1 + .../source/Plugins/ABI/X86/ABIMacOSX_i386.cpp | 2 +- lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp | 6 +-- .../source/Plugins/ABI/X86/ABISysV_x86_64.cpp | 6 +-- .../Plugins/ABI/X86/ABIWindows_x86_64.cpp | 6 +-- lldb/source/Plugins/ABI/X86/CMakeLists.txt | 1 + .../ExpressionParser/Clang/CMakeLists.txt | 1 + .../Clang/ClangExpressionDeclMap.cpp | 4 +- .../Clang/ClangExpressionUtil.cpp | 2 +- .../Clang/ClangExpressionVariable.cpp | 2 +- .../Clang/ClangFunctionCaller.cpp | 4 +- .../Clang/ClangFunctionCaller.h | 2 +- .../Clang/ClangUserExpression.cpp | 2 +- .../TSan/CMakeLists.txt | 1 + .../TSan/InstrumentationRuntimeTSan.cpp | 2 +- .../UBSan/CMakeLists.txt | 1 + .../UBSan/InstrumentationRuntimeUBSan.cpp | 2 +- .../Utility/CMakeLists.txt | 1 + .../Utility/ReportRetriever.cpp | 2 +- .../Language/CPlusPlus/BlockPointer.cpp | 4 +- .../Plugins/Language/CPlusPlus/CMakeLists.txt | 1 + .../Language/CPlusPlus/CPlusPlusLanguage.cpp | 2 +- .../Plugins/Language/CPlusPlus/Coroutines.h | 2 +- .../Language/CPlusPlus/CxxStringTypes.cpp | 4 +- .../Language/CPlusPlus/CxxStringTypes.h | 2 +- .../Plugins/Language/CPlusPlus/Generic.h | 2 +- .../Plugins/Language/CPlusPlus/LibCxx.cpp | 4 +- .../Plugins/Language/CPlusPlus/LibCxx.h | 2 +- .../Plugins/Language/CPlusPlus/LibCxxAtomic.h | 2 +- .../CPlusPlus/LibCxxInitializerList.cpp | 2 +- .../Plugins/Language/CPlusPlus/LibCxxList.cpp | 5 +- .../Plugins/Language/CPlusPlus/LibCxxMap.cpp | 4 +- .../Language/CPlusPlus/LibCxxProxyArray.cpp | 2 +- .../CPlusPlus/LibCxxRangesRefView.cpp | 2 +- .../Language/CPlusPlus/LibCxxSliceArray.cpp | 2 +- .../Plugins/Language/CPlusPlus/LibCxxSpan.cpp | 2 +- .../Language/CPlusPlus/LibCxxUnorderedMap.cpp | 4 +- .../Language/CPlusPlus/LibCxxValarray.cpp | 2 +- .../Language/CPlusPlus/LibCxxVariant.h | 2 +- .../Language/CPlusPlus/LibCxxVector.cpp | 4 +- .../Plugins/Language/CPlusPlus/LibStdcpp.cpp | 4 +- .../Plugins/Language/CPlusPlus/LibStdcpp.h | 2 +- .../Language/CPlusPlus/LibStdcppTuple.cpp | 2 +- .../CPlusPlus/LibStdcppUniquePointer.cpp | 2 +- lldb/source/Plugins/Language/ObjC/CF.cpp | 4 +- lldb/source/Plugins/Language/ObjC/CF.h | 2 +- .../Plugins/Language/ObjC/CMakeLists.txt | 1 + lldb/source/Plugins/Language/ObjC/Cocoa.cpp | 4 +- lldb/source/Plugins/Language/ObjC/Cocoa.h | 2 +- lldb/source/Plugins/Language/ObjC/CoreMedia.h | 2 +- lldb/source/Plugins/Language/ObjC/NSArray.cpp | 4 +- .../Plugins/Language/ObjC/NSDictionary.cpp | 4 +- .../Plugins/Language/ObjC/NSDictionary.h | 2 +- lldb/source/Plugins/Language/ObjC/NSError.cpp | 4 +- .../Plugins/Language/ObjC/NSException.cpp | 4 +- .../Plugins/Language/ObjC/NSIndexPath.cpp | 4 +- lldb/source/Plugins/Language/ObjC/NSSet.cpp | 4 +- lldb/source/Plugins/Language/ObjC/NSSet.h | 2 +- .../source/Plugins/Language/ObjC/NSString.cpp | 4 +- lldb/source/Plugins/Language/ObjC/NSString.h | 2 +- .../Plugins/Language/ObjC/ObjCLanguage.cpp | 2 +- .../CPlusPlus/ItaniumABI/CMakeLists.txt | 1 + .../ItaniumABI/ItaniumABILanguageRuntime.cpp | 4 +- .../AppleObjCRuntime/AppleObjCRuntime.cpp | 4 +- .../AppleObjCRuntime/AppleObjCRuntimeV2.cpp | 4 +- .../ObjC/AppleObjCRuntime/CMakeLists.txt | 1 + .../ObjC/GNUstepObjCRuntime/CMakeLists.txt | 1 + .../GNUstepObjCRuntime/GNUstepObjCRuntime.cpp | 2 +- .../ObjC/ObjCLanguageRuntime.cpp | 2 +- .../Plugins/MemoryHistory/asan/CMakeLists.txt | 1 + .../MemoryHistory/asan/MemoryHistoryASan.cpp | 2 +- .../OperatingSystem/Python/CMakeLists.txt | 1 + .../Python/OperatingSystemPython.cpp | 2 +- .../Plugins/Platform/Android/CMakeLists.txt | 1 + .../Platform/Android/PlatformAndroid.cpp | 2 +- .../Plugins/Platform/POSIX/CMakeLists.txt | 1 + .../Plugins/Platform/POSIX/PlatformPOSIX.cpp | 2 +- .../Plugins/Process/Utility/CMakeLists.txt | 1 + .../Process/Utility/InferiorCallPOSIX.cpp | 2 +- .../ScriptInterpreter/Python/CMakeLists.txt | 1 + .../Python/ScriptInterpreterPython.cpp | 2 +- .../Plugins/SymbolFile/DWARF/CMakeLists.txt | 1 + .../SymbolFile/DWARF/DWARFASTParser.cpp | 2 +- .../AbortWithPayloadFrameRecognizer.cpp | 2 +- .../SystemRuntime/MacOSX/CMakeLists.txt | 1 + lldb/source/Symbol/CMakeLists.txt | 1 + lldb/source/Symbol/Variable.cpp | 4 +- lldb/source/Target/ABI.cpp | 2 +- lldb/source/Target/CMakeLists.txt | 1 + lldb/source/Target/StackFrame.cpp | 6 +-- lldb/source/Target/StopInfo.cpp | 2 +- lldb/source/Target/Target.cpp | 4 +- lldb/source/Target/Thread.cpp | 4 +- lldb/source/Target/ThreadPlanStepOut.cpp | 2 +- lldb/source/ValueObject/CMakeLists.txt | 35 ++++++++++++++ .../{Core => ValueObject}/ValueObject.cpp | 47 ++++++++----------- .../{Core => ValueObject}/ValueObjectCast.cpp | 7 ++- .../ValueObjectChild.cpp | 12 ++--- .../ValueObjectConstResult.cpp | 14 +++--- .../ValueObjectConstResultCast.cpp | 2 +- .../ValueObjectConstResultChild.cpp | 16 +++---- .../ValueObjectConstResultImpl.cpp | 13 +++-- .../ValueObjectDynamicValue.cpp | 6 +-- .../{Core => ValueObject}/ValueObjectList.cpp | 4 +- .../ValueObjectMemory.cpp | 4 +- .../ValueObjectRegister.cpp | 2 +- .../ValueObjectSyntheticFilter.cpp | 10 ++-- .../ValueObjectUpdater.cpp | 2 +- .../ValueObjectVTable.cpp | 11 ++--- .../ValueObjectVariable.cpp | 10 ++-- lldb/unittests/ValueObject/CMakeLists.txt | 1 + .../DumpValueObjectOptionsTests.cpp | 4 +- 195 files changed, 417 insertions(+), 381 deletions(-) rename lldb/include/lldb/{Core => ValueObject}/ValueObject.h (99%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectCast.h (86%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectChild.h (86%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectConstResult.h (90%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectConstResultCast.h (89%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectConstResultChild.h (74%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectConstResultImpl.h (92%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectDynamicValue.h (94%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectList.h (92%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectMemory.h (93%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectRegister.h (95%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectSyntheticFilter.h (96%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectUpdater.h (89%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectVTable.h (95%) rename lldb/include/lldb/{Core => ValueObject}/ValueObjectVariable.h (93%) create mode 100644 lldb/source/ValueObject/CMakeLists.txt rename lldb/source/{Core => ValueObject}/ValueObject.cpp (99%) rename lldb/source/{Core => ValueObject}/ValueObjectCast.cpp (95%) rename lldb/source/{Core => ValueObject}/ValueObjectChild.cpp (96%) rename lldb/source/{Core => ValueObject}/ValueObjectConstResult.cpp (96%) rename lldb/source/{Core => ValueObject}/ValueObjectConstResultCast.cpp (96%) rename lldb/source/{Core => ValueObject}/ValueObjectConstResultChild.cpp (80%) rename lldb/source/{Core => ValueObject}/ValueObjectConstResultImpl.cpp (96%) rename lldb/source/{Core => ValueObject}/ValueObjectDynamicValue.cpp (99%) rename lldb/source/{Core => ValueObject}/ValueObjectList.cpp (97%) rename lldb/source/{Core => ValueObject}/ValueObjectMemory.cpp (98%) rename lldb/source/{Core => ValueObject}/ValueObjectRegister.cpp (99%) rename lldb/source/{Core => ValueObject}/ValueObjectSyntheticFilter.cpp (98%) rename lldb/source/{Core => ValueObject}/ValueObjectUpdater.cpp (97%) rename lldb/source/{Core => ValueObject}/ValueObjectVTable.cpp (96%) rename lldb/source/{Core => ValueObject}/ValueObjectVariable.cpp (98%) diff --git a/lldb/include/lldb/Core/IOHandler.h b/lldb/include/lldb/Core/IOHandler.h index 588d2ce6e4a97..fef6c34903263 100644 --- a/lldb/include/lldb/Core/IOHandler.h +++ b/lldb/include/lldb/Core/IOHandler.h @@ -9,7 +9,6 @@ #ifndef LLDB_CORE_IOHANDLER_H #define LLDB_CORE_IOHANDLER_H -#include "lldb/Core/ValueObjectList.h" #include "lldb/Host/Config.h" #include "lldb/Utility/CompletionRequest.h" #include "lldb/Utility/Flags.h" diff --git a/lldb/include/lldb/DataFormatters/FormattersContainer.h b/lldb/include/lldb/DataFormatters/FormattersContainer.h index fd046e773b690..7898621fd18af 100644 --- a/lldb/include/lldb/DataFormatters/FormattersContainer.h +++ b/lldb/include/lldb/DataFormatters/FormattersContainer.h @@ -17,7 +17,6 @@ #include "lldb/lldb-public.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormatClasses.h" #include "lldb/DataFormatters/TypeFormat.h" #include "lldb/DataFormatters/TypeSummary.h" @@ -25,6 +24,7 @@ #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/RegularExpression.h" #include "lldb/Utility/StringLexer.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { diff --git a/lldb/include/lldb/DataFormatters/TypeFormat.h b/lldb/include/lldb/DataFormatters/TypeFormat.h index 4e19d4cb14a17..63d4765bdf270 100644 --- a/lldb/include/lldb/DataFormatters/TypeFormat.h +++ b/lldb/include/lldb/DataFormatters/TypeFormat.h @@ -18,7 +18,7 @@ #include "lldb/lldb-enumerations.h" #include "lldb/lldb-public.h" -#include "lldb/Core/ValueObject.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { class TypeFormatImpl { diff --git a/lldb/include/lldb/DataFormatters/TypeSynthetic.h b/lldb/include/lldb/DataFormatters/TypeSynthetic.h index ede7442a02bf6..bf6dc6a0c3c6b 100644 --- a/lldb/include/lldb/DataFormatters/TypeSynthetic.h +++ b/lldb/include/lldb/DataFormatters/TypeSynthetic.h @@ -20,8 +20,8 @@ #include "lldb/lldb-enumerations.h" #include "lldb/lldb-public.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Utility/StructuredData.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { class SyntheticChildrenFrontEnd { diff --git a/lldb/include/lldb/Expression/ExpressionVariable.h b/lldb/include/lldb/Expression/ExpressionVariable.h index 7d836fedf7245..f344e341ed717 100644 --- a/lldb/include/lldb/Expression/ExpressionVariable.h +++ b/lldb/include/lldb/Expression/ExpressionVariable.h @@ -15,8 +15,8 @@ #include "llvm/ADT/DenseMap.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-public.h" #include "llvm/Support/ExtensibleRTTI.h" diff --git a/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h b/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h index 9b545c46fba4d..ebf26cea95cf3 100644 --- a/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h +++ b/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h @@ -9,8 +9,8 @@ #ifndef LLDB_INTERPRETER_OPTIONGROUPVALUEOBJECTDISPLAY_H #define LLDB_INTERPRETER_OPTIONGROUPVALUEOBJECTDISPLAY_H -#include "lldb/Core/ValueObject.h" #include "lldb/Interpreter/Options.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/LanguageRuntime.h b/lldb/include/lldb/Target/LanguageRuntime.h index a1b975c8630d5..d378bc6b21ad1 100644 --- a/lldb/include/lldb/Target/LanguageRuntime.h +++ b/lldb/include/lldb/Target/LanguageRuntime.h @@ -15,11 +15,11 @@ #include "lldb/Core/PluginInterface.h" #include "lldb/Core/StructuredDataImpl.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/LLVMUserExpression.h" #include "lldb/Symbol/DeclVendor.h" #include "lldb/Target/ExecutionContextScope.h" #include "lldb/Target/Runtime.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-private.h" #include "lldb/lldb-public.h" #include diff --git a/lldb/include/lldb/Target/StackFrame.h b/lldb/include/lldb/Target/StackFrame.h index 5cc0fccee03b8..0aac02326024d 100644 --- a/lldb/include/lldb/Target/StackFrame.h +++ b/lldb/include/lldb/Target/StackFrame.h @@ -16,7 +16,6 @@ #include "lldb/Utility/Flags.h" #include "lldb/Core/FormatEntity.h" -#include "lldb/Core/ValueObjectList.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Target/ExecutionContextScope.h" #include "lldb/Target/StackID.h" @@ -24,6 +23,7 @@ #include "lldb/Utility/Status.h" #include "lldb/Utility/StreamString.h" #include "lldb/Utility/UserID.h" +#include "lldb/ValueObject/ValueObjectList.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/StackFrameRecognizer.h b/lldb/include/lldb/Target/StackFrameRecognizer.h index 617b1617d404a..0f77e03bbe48f 100644 --- a/lldb/include/lldb/Target/StackFrameRecognizer.h +++ b/lldb/include/lldb/Target/StackFrameRecognizer.h @@ -9,11 +9,11 @@ #ifndef LLDB_TARGET_STACKFRAMERECOGNIZER_H #define LLDB_TARGET_STACKFRAMERECOGNIZER_H -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectList.h" #include "lldb/Symbol/VariableList.h" #include "lldb/Target/StopInfo.h" #include "lldb/Utility/StructuredData.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectList.h" #include "lldb/lldb-private-forward.h" #include "lldb/lldb-public.h" diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/ValueObject/ValueObject.h similarity index 99% rename from lldb/include/lldb/Core/ValueObject.h rename to lldb/include/lldb/ValueObject/ValueObject.h index 800ea5a4b4db8..ba0bb3fb9e503 100644 --- a/lldb/include/lldb/Core/ValueObject.h +++ b/lldb/include/lldb/ValueObject/ValueObject.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECT_H -#define LLDB_CORE_VALUEOBJECT_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECT_H +#define LLDB_VALUEOBJECT_VALUEOBJECT_H #include "lldb/Core/SwiftScratchContextReader.h" #include "lldb/Core/Value.h" @@ -1088,7 +1088,7 @@ class ValueObject { void SetPreferredDisplayLanguageIfNeeded(lldb::LanguageType); protected: - virtual void DoUpdateChildrenAddressType(ValueObject &valobj){}; + virtual void DoUpdateChildrenAddressType(ValueObject &valobj) {}; private: virtual CompilerType MaybeCalculateCompleteType(); @@ -1109,4 +1109,4 @@ class ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECT_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECT_H diff --git a/lldb/include/lldb/Core/ValueObjectCast.h b/lldb/include/lldb/ValueObject/ValueObjectCast.h similarity index 86% rename from lldb/include/lldb/Core/ValueObjectCast.h rename to lldb/include/lldb/ValueObject/ValueObjectCast.h index ba25e166f3268..9d174ae5ca609 100644 --- a/lldb/include/lldb/Core/ValueObjectCast.h +++ b/lldb/include/lldb/ValueObject/ValueObjectCast.h @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTCAST_H -#define LLDB_CORE_VALUEOBJECTCAST_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTCAST_H +#define LLDB_VALUEOBJECT_VALUEOBJECTCAST_H -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/CompilerType.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" @@ -27,8 +27,7 @@ class ValueObjectCast : public ValueObject { public: ~ValueObjectCast() override; - static lldb::ValueObjectSP Create(ValueObject &parent, - ConstString name, + static lldb::ValueObjectSP Create(ValueObject &parent, ConstString name, const CompilerType &cast_type); std::optional GetByteSize() override; @@ -64,4 +63,4 @@ class ValueObjectCast : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTCAST_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTCAST_H diff --git a/lldb/include/lldb/Core/ValueObjectChild.h b/lldb/include/lldb/ValueObject/ValueObjectChild.h similarity index 86% rename from lldb/include/lldb/Core/ValueObjectChild.h rename to lldb/include/lldb/ValueObject/ValueObjectChild.h index 1f88e607cb573..e8c974a3a10a7 100644 --- a/lldb/include/lldb/Core/ValueObjectChild.h +++ b/lldb/include/lldb/ValueObject/ValueObjectChild.h @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTCHILD_H -#define LLDB_CORE_VALUEOBJECTCHILD_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTCHILD_H +#define LLDB_VALUEOBJECT_VALUEOBJECTCHILD_H -#include "lldb/Core/ValueObject.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/ConstString.h" @@ -76,10 +76,9 @@ class ValueObjectChild : public ValueObject { friend class ValueObjectVTable; ValueObjectChild(ValueObject &parent, const CompilerType &compiler_type, - ConstString name, uint64_t byte_size, - int32_t byte_offset, uint32_t bitfield_bit_size, - uint32_t bitfield_bit_offset, bool is_base_class, - bool is_deref_of_parent, + ConstString name, uint64_t byte_size, int32_t byte_offset, + uint32_t bitfield_bit_size, uint32_t bitfield_bit_offset, + bool is_base_class, bool is_deref_of_parent, AddressType child_ptr_or_ref_addr_type, uint64_t language_flags); @@ -89,4 +88,4 @@ class ValueObjectChild : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTCHILD_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTCHILD_H diff --git a/lldb/include/lldb/Core/ValueObjectConstResult.h b/lldb/include/lldb/ValueObject/ValueObjectConstResult.h similarity index 90% rename from lldb/include/lldb/Core/ValueObjectConstResult.h rename to lldb/include/lldb/ValueObject/ValueObjectConstResult.h index 9c34617af71d0..e4ed1f399bf6b 100644 --- a/lldb/include/lldb/Core/ValueObjectConstResult.h +++ b/lldb/include/lldb/ValueObject/ValueObjectConstResult.h @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTCONSTRESULT_H -#define LLDB_CORE_VALUEOBJECTCONSTRESULT_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULT_H +#define LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULT_H #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResultImpl.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResultImpl.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" @@ -50,10 +50,11 @@ class ValueObjectConstResult : public ValueObject { lldb::ByteOrder byte_order, uint32_t addr_size, lldb::addr_t address = LLDB_INVALID_ADDRESS); - static lldb::ValueObjectSP - Create(ExecutionContextScope *exe_scope, const CompilerType &compiler_type, - ConstString name, lldb::addr_t address, - AddressType address_type, uint32_t addr_byte_size); + static lldb::ValueObjectSP Create(ExecutionContextScope *exe_scope, + const CompilerType &compiler_type, + ConstString name, lldb::addr_t address, + AddressType address_type, + uint32_t addr_byte_size); static lldb::ValueObjectSP Create(ExecutionContextScope *exe_scope, Value &value, ConstString name, @@ -162,4 +163,4 @@ class ValueObjectConstResult : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTCONSTRESULT_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULT_H diff --git a/lldb/include/lldb/Core/ValueObjectConstResultCast.h b/lldb/include/lldb/ValueObject/ValueObjectConstResultCast.h similarity index 89% rename from lldb/include/lldb/Core/ValueObjectConstResultCast.h rename to lldb/include/lldb/ValueObject/ValueObjectConstResultCast.h index 911a08363b393..e786467eae6e2 100644 --- a/lldb/include/lldb/Core/ValueObjectConstResultCast.h +++ b/lldb/include/lldb/ValueObject/ValueObjectConstResultCast.h @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTCONSTRESULTCAST_H -#define LLDB_CORE_VALUEOBJECTCONSTRESULTCAST_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTCAST_H +#define LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTCAST_H -#include "lldb/Core/ValueObjectCast.h" -#include "lldb/Core/ValueObjectConstResultImpl.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObjectCast.h" +#include "lldb/ValueObject/ValueObjectConstResultImpl.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-forward.h" #include "lldb/lldb-types.h" @@ -72,4 +72,4 @@ class ValueObjectConstResultCast : public ValueObjectCast { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTCONSTRESULTCAST_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTCAST_H diff --git a/lldb/include/lldb/Core/ValueObjectConstResultChild.h b/lldb/include/lldb/ValueObject/ValueObjectConstResultChild.h similarity index 74% rename from lldb/include/lldb/Core/ValueObjectConstResultChild.h rename to lldb/include/lldb/ValueObject/ValueObjectConstResultChild.h index 71a3c53befe78..ad97b885684ee 100644 --- a/lldb/include/lldb/Core/ValueObjectConstResultChild.h +++ b/lldb/include/lldb/ValueObject/ValueObjectConstResultChild.h @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTCONSTRESULTCHILD_H -#define LLDB_CORE_VALUEOBJECTCONSTRESULTCHILD_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTCHILD_H +#define LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTCHILD_H -#include "lldb/Core/ValueObjectChild.h" -#include "lldb/Core/ValueObjectConstResultImpl.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObjectChild.h" +#include "lldb/ValueObject/ValueObjectConstResultImpl.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-forward.h" #include "lldb/lldb-types.h" @@ -28,14 +28,11 @@ class ValueObject; // A child of a ValueObjectConstResult. class ValueObjectConstResultChild : public ValueObjectChild { public: - ValueObjectConstResultChild(ValueObject &parent, - const CompilerType &compiler_type, - ConstString name, uint32_t byte_size, - int32_t byte_offset, uint32_t bitfield_bit_size, - uint32_t bitfield_bit_offset, bool is_base_class, - bool is_deref_of_parent, - lldb::addr_t live_address, - uint64_t language_flags); + ValueObjectConstResultChild( + ValueObject &parent, const CompilerType &compiler_type, ConstString name, + uint32_t byte_size, int32_t byte_offset, uint32_t bitfield_bit_size, + uint32_t bitfield_bit_offset, bool is_base_class, bool is_deref_of_parent, + lldb::addr_t live_address, uint64_t language_flags); ~ValueObjectConstResultChild() override; @@ -81,4 +78,4 @@ class ValueObjectConstResultChild : public ValueObjectChild { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTCONSTRESULTCHILD_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTCHILD_H diff --git a/lldb/include/lldb/Core/ValueObjectConstResultImpl.h b/lldb/include/lldb/ValueObject/ValueObjectConstResultImpl.h similarity index 92% rename from lldb/include/lldb/Core/ValueObjectConstResultImpl.h rename to lldb/include/lldb/ValueObject/ValueObjectConstResultImpl.h index 68ba8ae7fba20..dbd68160acb4d 100644 --- a/lldb/include/lldb/Core/ValueObjectConstResultImpl.h +++ b/lldb/include/lldb/ValueObject/ValueObjectConstResultImpl.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTCONSTRESULTIMPL_H -#define LLDB_CORE_VALUEOBJECTCONSTRESULTIMPL_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTIMPL_H +#define LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTIMPL_H #include "lldb/Utility/ConstString.h" #include "lldb/lldb-defines.h" @@ -22,7 +22,7 @@ class CompilerType; class DataExtractor; class Status; class ValueObject; -} +} // namespace lldb_private namespace lldb_private { @@ -77,4 +77,4 @@ class ValueObjectConstResultImpl { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTCONSTRESULTIMPL_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTCONSTRESULTIMPL_H diff --git a/lldb/include/lldb/Core/ValueObjectDynamicValue.h b/lldb/include/lldb/ValueObject/ValueObjectDynamicValue.h similarity index 94% rename from lldb/include/lldb/Core/ValueObjectDynamicValue.h rename to lldb/include/lldb/ValueObject/ValueObjectDynamicValue.h index 82c20eee0cd42..145a46e295566 100644 --- a/lldb/include/lldb/Core/ValueObjectDynamicValue.h +++ b/lldb/include/lldb/ValueObject/ValueObjectDynamicValue.h @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTDYNAMICVALUE_H -#define LLDB_CORE_VALUEOBJECTDYNAMICVALUE_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTDYNAMICVALUE_H +#define LLDB_VALUEOBJECT_VALUEOBJECTDYNAMICVALUE_H #include "lldb/Core/Address.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/Type.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" @@ -126,4 +126,4 @@ class ValueObjectDynamicValue : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTDYNAMICVALUE_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTDYNAMICVALUE_H diff --git a/lldb/include/lldb/Core/ValueObjectList.h b/lldb/include/lldb/ValueObject/ValueObjectList.h similarity index 92% rename from lldb/include/lldb/Core/ValueObjectList.h rename to lldb/include/lldb/ValueObject/ValueObjectList.h index fcb358e21a26b..5d63c65a96e5f 100644 --- a/lldb/include/lldb/Core/ValueObjectList.h +++ b/lldb/include/lldb/ValueObject/ValueObjectList.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTLIST_H -#define LLDB_CORE_VALUEOBJECTLIST_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTLIST_H +#define LLDB_VALUEOBJECT_VALUEOBJECTLIST_H #include "lldb/lldb-forward.h" #include "lldb/lldb-types.h" @@ -51,6 +51,7 @@ class ValueObjectList { const std::vector &GetObjects() const { return m_value_objects; } + protected: typedef std::vector collection; // Classes that inherit from ValueObjectList can see and modify these @@ -59,4 +60,4 @@ class ValueObjectList { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTLIST_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTLIST_H diff --git a/lldb/include/lldb/Core/ValueObjectMemory.h b/lldb/include/lldb/ValueObject/ValueObjectMemory.h similarity index 93% rename from lldb/include/lldb/Core/ValueObjectMemory.h rename to lldb/include/lldb/ValueObject/ValueObjectMemory.h index a8fb0353d601b..cfc36d0d610db 100644 --- a/lldb/include/lldb/Core/ValueObjectMemory.h +++ b/lldb/include/lldb/ValueObject/ValueObjectMemory.h @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTMEMORY_H -#define LLDB_CORE_VALUEOBJECTMEMORY_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTMEMORY_H +#define LLDB_VALUEOBJECT_VALUEOBJECTMEMORY_H #include "lldb/Core/Address.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" @@ -79,4 +79,4 @@ class ValueObjectMemory : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTMEMORY_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTMEMORY_H diff --git a/lldb/include/lldb/Core/ValueObjectRegister.h b/lldb/include/lldb/ValueObject/ValueObjectRegister.h similarity index 95% rename from lldb/include/lldb/Core/ValueObjectRegister.h rename to lldb/include/lldb/ValueObject/ValueObjectRegister.h index d948c663a4f8b..fafbfd0341115 100644 --- a/lldb/include/lldb/Core/ValueObjectRegister.h +++ b/lldb/include/lldb/ValueObject/ValueObjectRegister.h @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTREGISTER_H -#define LLDB_CORE_VALUEOBJECTREGISTER_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTREGISTER_H +#define LLDB_VALUEOBJECT_VALUEOBJECTREGISTER_H -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/RegisterValue.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" @@ -140,4 +140,4 @@ class ValueObjectRegister : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTREGISTER_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTREGISTER_H diff --git a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h b/lldb/include/lldb/ValueObject/ValueObjectSyntheticFilter.h similarity index 96% rename from lldb/include/lldb/Core/ValueObjectSyntheticFilter.h rename to lldb/include/lldb/ValueObject/ValueObjectSyntheticFilter.h index b58d588b4cf9f..b9dda23abe6b3 100644 --- a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h +++ b/lldb/include/lldb/ValueObject/ValueObjectSyntheticFilter.h @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTSYNTHETICFILTER_H -#define LLDB_CORE_VALUEOBJECTSYNTHETICFILTER_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETICFILTER_H +#define LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETICFILTER_H -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" @@ -192,4 +192,4 @@ class ValueObjectSynthetic : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTSYNTHETICFILTER_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETICFILTER_H diff --git a/lldb/include/lldb/Core/ValueObjectUpdater.h b/lldb/include/lldb/ValueObject/ValueObjectUpdater.h similarity index 89% rename from lldb/include/lldb/Core/ValueObjectUpdater.h rename to lldb/include/lldb/ValueObject/ValueObjectUpdater.h index 54fcb31076add..3f1d887b47a7b 100644 --- a/lldb/include/lldb/Core/ValueObjectUpdater.h +++ b/lldb/include/lldb/ValueObject/ValueObjectUpdater.h @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTUPDATER_H -#define LLDB_CORE_VALUEOBJECTUPDATER_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTUPDATER_H +#define LLDB_VALUEOBJECT_VALUEOBJECTUPDATER_H -#include "lldb/Core/ValueObject.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { @@ -40,4 +40,4 @@ class ValueObjectUpdater { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTUPDATER_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTUPDATER_H diff --git a/lldb/include/lldb/Core/ValueObjectVTable.h b/lldb/include/lldb/ValueObject/ValueObjectVTable.h similarity index 95% rename from lldb/include/lldb/Core/ValueObjectVTable.h rename to lldb/include/lldb/ValueObject/ValueObjectVTable.h index 7087dcc1d1bec..9cf13be093a8d 100644 --- a/lldb/include/lldb/Core/ValueObjectVTable.h +++ b/lldb/include/lldb/ValueObject/ValueObjectVTable.h @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTVTABLE_H -#define LLDB_CORE_VALUEOBJECTVTABLE_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTVTABLE_H +#define LLDB_VALUEOBJECT_VALUEOBJECTVTABLE_H -#include "lldb/Core/ValueObject.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { @@ -104,4 +104,4 @@ class ValueObjectVTable : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTVTABLE_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTVTABLE_H diff --git a/lldb/include/lldb/Core/ValueObjectVariable.h b/lldb/include/lldb/ValueObject/ValueObjectVariable.h similarity index 93% rename from lldb/include/lldb/Core/ValueObjectVariable.h rename to lldb/include/lldb/ValueObject/ValueObjectVariable.h index db3847f14a0b5..9f66af808425a 100644 --- a/lldb/include/lldb/Core/ValueObjectVariable.h +++ b/lldb/include/lldb/ValueObject/ValueObjectVariable.h @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef LLDB_CORE_VALUEOBJECTVARIABLE_H -#define LLDB_CORE_VALUEOBJECTVARIABLE_H +#ifndef LLDB_VALUEOBJECT_VALUEOBJECTVARIABLE_H +#define LLDB_VALUEOBJECT_VALUEOBJECTVARIABLE_H -#include "lldb/Core/ValueObject.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/Core/Value.h" #include "lldb/Symbol/CompilerType.h" @@ -68,7 +68,7 @@ class ValueObjectVariable : public ValueObject { protected: bool UpdateValue() override; - + void DoUpdateChildrenAddressType(ValueObject &valobj) override; CompilerType GetCompilerTypeImpl() override; @@ -90,4 +90,4 @@ class ValueObjectVariable : public ValueObject { } // namespace lldb_private -#endif // LLDB_CORE_VALUEOBJECTVARIABLE_H +#endif // LLDB_VALUEOBJECT_VALUEOBJECTVARIABLE_H diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt index 225cdca095b39..9042ee43f7665 100644 --- a/lldb/source/API/CMakeLists.txt +++ b/lldb/source/API/CMakeLists.txt @@ -147,6 +147,7 @@ add_lldb_library(liblldb SHARED ${option_framework} lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbVersion ${LLDB_ALL_PLUGINS} ## BEGIN SWIFT diff --git a/lldb/source/API/SBBlock.cpp b/lldb/source/API/SBBlock.cpp index 2577b14920f06..b921ccd980245 100644 --- a/lldb/source/API/SBBlock.cpp +++ b/lldb/source/API/SBBlock.cpp @@ -14,7 +14,6 @@ #include "lldb/API/SBValue.h" #include "lldb/Core/AddressRange.h" #include "lldb/Core/AddressRangeListImpl.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Symbol/Block.h" #include "lldb/Symbol/Function.h" #include "lldb/Symbol/SymbolContext.h" @@ -22,6 +21,7 @@ #include "lldb/Target/StackFrame.h" #include "lldb/Target/Target.h" #include "lldb/Utility/Instrumentation.h" +#include "lldb/ValueObject/ValueObjectVariable.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp index 75819a34bda57..8f6a110b10487 100644 --- a/lldb/source/API/SBFrame.cpp +++ b/lldb/source/API/SBFrame.cpp @@ -18,9 +18,6 @@ #include "lldb/Core/Address.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/StructuredDataImpl.h" -#include "lldb/Core/ValueObjectRegister.h" -#include "lldb/Core/ValueObjectVariable.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Expression/UserExpression.h" #include "lldb/Host/Host.h" @@ -42,6 +39,9 @@ #include "lldb/Utility/Instrumentation.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectRegister.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/API/SBAddress.h" #include "lldb/API/SBDebugger.h" @@ -611,7 +611,7 @@ SBValue SBFrame::FindValue(const char *name, ValueType value_type, stop_if_block_is_inlined_function, [frame](Variable *v) { return v->IsInScope(frame); }, &variable_list); - if (value_type == eValueTypeVariableGlobal + if (value_type == eValueTypeVariableGlobal || value_type == eValueTypeVariableStatic) { const bool get_file_globals = true; VariableList *frame_vars = frame->GetVariableList(get_file_globals, @@ -824,7 +824,7 @@ SBValueList SBFrame::GetVariables(const lldb::SBVariablesOptions &options) { if (num_variables) { size_t num_produced = 0; for (const VariableSP &variable_sp : *variable_list) { - if (INTERRUPT_REQUESTED(dbg, + if (INTERRUPT_REQUESTED(dbg, "Interrupted getting frame variables with {0} of {1} " "produced.", num_produced, num_variables)) return {}; @@ -1268,7 +1268,7 @@ lldb::SBStructuredData SBFrame::GetLanguageSpecificData() const { bool SBFrame::IsSwiftThunk() const { std::unique_lock lock; ExecutionContext exe_ctx(m_opaque_sp.get(), lock); - + StackFrame *frame = nullptr; Target *target = exe_ctx.GetTargetPtr(); Process *process = exe_ctx.GetProcessPtr(); diff --git a/lldb/source/API/SBModule.cpp b/lldb/source/API/SBModule.cpp index 378a809a7f7f5..e35fb1e9ed3ca 100644 --- a/lldb/source/API/SBModule.cpp +++ b/lldb/source/API/SBModule.cpp @@ -15,8 +15,6 @@ #include "lldb/API/SBSymbolContextList.h" #include "lldb/Core/Module.h" #include "lldb/Core/Section.h" -#include "lldb/Core/ValueObjectList.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Symbol/SymbolFile.h" #include "lldb/Symbol/Symtab.h" @@ -25,6 +23,8 @@ #include "lldb/Target/Target.h" #include "lldb/Utility/Instrumentation.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObjectList.h" +#include "lldb/ValueObject/ValueObjectVariable.h" // BEGIN SWIFT #include "lldb/Target/Language.h" diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp index 0ac1a499437b8..867c7a7ce7a64 100644 --- a/lldb/source/API/SBTarget.cpp +++ b/lldb/source/API/SBTarget.cpp @@ -42,9 +42,6 @@ #include "lldb/Core/SearchFilter.h" #include "lldb/Core/Section.h" #include "lldb/Core/StructuredDataImpl.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectList.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Host/Host.h" #include "lldb/Symbol/DeclVendor.h" #include "lldb/Symbol/ObjectFile.h" @@ -64,6 +61,9 @@ #include "lldb/Utility/FileSpec.h" #include "lldb/Utility/ProcessInfo.h" #include "lldb/Utility/RegularExpression.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectList.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "Commands/CommandObjectBreakpoint.h" #include "lldb/Interpreter/CommandReturnObject.h" diff --git a/lldb/source/API/SBThread.cpp b/lldb/source/API/SBThread.cpp index dc4afab50dbb3..2d5413fca022a 100644 --- a/lldb/source/API/SBThread.cpp +++ b/lldb/source/API/SBThread.cpp @@ -24,7 +24,6 @@ #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/StructuredDataImpl.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/SymbolContext.h" @@ -43,6 +42,7 @@ #include "lldb/Utility/State.h" #include "lldb/Utility/Stream.h" #include "lldb/Utility/StructuredData.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-enumerations.h" #include diff --git a/lldb/source/API/SBType.cpp b/lldb/source/API/SBType.cpp index 028e3c695d46e..25c8c4feed855 100644 --- a/lldb/source/API/SBType.cpp +++ b/lldb/source/API/SBType.cpp @@ -13,7 +13,6 @@ #include "lldb/API/SBStream.h" #include "lldb/API/SBTypeEnumMember.h" #include "lldb/Core/Mangled.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Symbol/CompilerDecl.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/Type.h" @@ -23,6 +22,7 @@ #include "lldb/Utility/Instrumentation.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "llvm/ADT/APSInt.h" #include "llvm/Support/MathExtras.h" diff --git a/lldb/source/API/SBValue.cpp b/lldb/source/API/SBValue.cpp index 273aac5ad4798..5e3f25559a28c 100644 --- a/lldb/source/API/SBValue.cpp +++ b/lldb/source/API/SBValue.cpp @@ -21,8 +21,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/Section.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/DataFormatters/DumpValueObjectOptions.h" #include "lldb/Symbol/Block.h" @@ -38,6 +36,8 @@ #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "lldb/API/SBDebugger.h" #include "lldb/API/SBExpressionOptions.h" diff --git a/lldb/source/API/SBValueList.cpp b/lldb/source/API/SBValueList.cpp index 63b915094baf2..0a90ea66f974f 100644 --- a/lldb/source/API/SBValueList.cpp +++ b/lldb/source/API/SBValueList.cpp @@ -10,9 +10,9 @@ #include "lldb/API/SBError.h" #include "lldb/API/SBStream.h" #include "lldb/API/SBValue.h" -#include "lldb/Core/ValueObjectList.h" #include "lldb/Utility/Instrumentation.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectList.h" #include using namespace lldb; diff --git a/lldb/source/Breakpoint/BreakpointLocation.cpp b/lldb/source/Breakpoint/BreakpointLocation.cpp index 35058a713aef8..ad9057c8141e9 100644 --- a/lldb/source/Breakpoint/BreakpointLocation.cpp +++ b/lldb/source/Breakpoint/BreakpointLocation.cpp @@ -11,7 +11,6 @@ #include "lldb/Breakpoint/StoppointCallbackContext.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Expression/UserExpression.h" @@ -25,6 +24,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Breakpoint/CMakeLists.txt b/lldb/source/Breakpoint/CMakeLists.txt index 2fa659f803c28..6cd3c396a2c50 100644 --- a/lldb/source/Breakpoint/CMakeLists.txt +++ b/lldb/source/Breakpoint/CMakeLists.txt @@ -33,6 +33,7 @@ add_lldb_library(lldbBreakpoint NO_PLUGIN_DEPENDENCIES lldbSymbol lldbTarget lldbUtility + lldbValueObject LINK_COMPONENTS Support diff --git a/lldb/source/Breakpoint/Watchpoint.cpp b/lldb/source/Breakpoint/Watchpoint.cpp index 715e83c76697b..2df848aaa0576 100644 --- a/lldb/source/Breakpoint/Watchpoint.cpp +++ b/lldb/source/Breakpoint/Watchpoint.cpp @@ -11,8 +11,6 @@ #include "lldb/Breakpoint/StoppointCallbackContext.h" #include "lldb/Breakpoint/WatchpointResource.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectMemory.h" #include "lldb/DataFormatters/DumpValueObjectOptions.h" #include "lldb/Expression/UserExpression.h" #include "lldb/Symbol/TypeSystem.h" @@ -22,6 +20,8 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectMemory.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt index 54e7903580662..51c9f9c90826e 100644 --- a/lldb/source/CMakeLists.txt +++ b/lldb/source/CMakeLists.txt @@ -13,6 +13,7 @@ add_subdirectory(Plugins) add_subdirectory(Symbol) add_subdirectory(Target) add_subdirectory(Utility) +add_subdirectory(ValueObject) add_subdirectory(Version) # Build API last. Since liblldb needs to link against every other target, it needs diff --git a/lldb/source/Commands/CMakeLists.txt b/lldb/source/Commands/CMakeLists.txt index 3d13c1960c47d..186d778305a4e 100644 --- a/lldb/source/Commands/CMakeLists.txt +++ b/lldb/source/Commands/CMakeLists.txt @@ -60,6 +60,7 @@ add_lldb_library(lldbCommands NO_PLUGIN_DEPENDENCIES lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbVersion LINK_COMPONENTS diff --git a/lldb/source/Commands/CommandObjectDWIMPrint.cpp b/lldb/source/Commands/CommandObjectDWIMPrint.cpp index 24ad318e12ac8..32b7aecf4e770 100644 --- a/lldb/source/Commands/CommandObjectDWIMPrint.cpp +++ b/lldb/source/Commands/CommandObjectDWIMPrint.cpp @@ -8,7 +8,6 @@ #include "CommandObjectDWIMPrint.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/DumpValueObjectOptions.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Expression/UserExpression.h" @@ -20,6 +19,7 @@ #include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/StackFrame.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index d8091e8993fde..596af6798107a 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -7,7 +7,6 @@ //===----------------------------------------------------------------------===// #include "CommandObjectFrame.h" #include "lldb/Core/Debugger.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/DataFormatters/ValueObjectPrinter.h" #include "lldb/Host/Config.h" @@ -30,6 +29,7 @@ #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/Args.h" +#include "lldb/ValueObject/ValueObject.h" #include #include diff --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp index f93081d3f45a1..b5612f21f1156 100644 --- a/lldb/source/Commands/CommandObjectMemory.cpp +++ b/lldb/source/Commands/CommandObjectMemory.cpp @@ -10,7 +10,6 @@ #include "CommandObjectMemoryTag.h" #include "lldb/Core/DumpDataExtractor.h" #include "lldb/Core/Section.h" -#include "lldb/Core/ValueObjectMemory.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Host/OptionParser.h" #include "lldb/Interpreter/CommandOptionArgumentTable.h" @@ -36,6 +35,7 @@ #include "lldb/Utility/Args.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObjectMemory.h" #include "llvm/Support/MathExtras.h" #include #include diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index b7a7735495134..8ee350cb12e28 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -15,7 +15,6 @@ #include "lldb/Core/ModuleSpec.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Section.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/DataFormatters/ValueObjectPrinter.h" #include "lldb/Host/OptionParser.h" #include "lldb/Interpreter/CommandInterpreter.h" @@ -56,6 +55,7 @@ #include "lldb/Utility/Stream.h" #include "lldb/Utility/StructuredData.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-private-enumerations.h" diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index d2e1a086180b7..e059fde5315f5 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -15,7 +15,6 @@ #include "CommandObjectThreadUtil.h" #include "CommandObjectTrace.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Host/OptionParser.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/CommandOptionArgumentTable.h" @@ -37,6 +36,7 @@ #include "lldb/Target/Trace.h" #include "lldb/Target/TraceDumper.h" #include "lldb/Utility/State.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp index 253df833bdff3..fbeab97b8cabf 100644 --- a/lldb/source/Commands/CommandObjectWatchpoint.cpp +++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp @@ -16,7 +16,6 @@ #include "lldb/Breakpoint/Watchpoint.h" #include "lldb/Breakpoint/WatchpointList.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Host/OptionParser.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/CommandOptionArgumentTable.h" @@ -27,6 +26,7 @@ #include "lldb/Target/StackFrame.h" #include "lldb/Target/Target.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt index 226586aae210d..309fcfd7947df 100644 --- a/lldb/source/Core/CMakeLists.txt +++ b/lldb/source/Core/CMakeLists.txt @@ -56,21 +56,6 @@ add_lldb_library(lldbCore ThreadedCommunication.cpp UserSettingsController.cpp Value.cpp - ValueObject.cpp - ValueObjectCast.cpp - ValueObjectChild.cpp - ValueObjectConstResult.cpp - ValueObjectConstResultCast.cpp - ValueObjectConstResultChild.cpp - ValueObjectConstResultImpl.cpp - ValueObjectDynamicValue.cpp - ValueObjectList.cpp - ValueObjectMemory.cpp - ValueObjectRegister.cpp - ValueObjectSyntheticFilter.cpp - ValueObjectUpdater.cpp - ValueObjectVariable.cpp - ValueObjectVTable.cpp DEPENDS clang-tablegen-targets @@ -84,6 +69,7 @@ add_lldb_library(lldbCore lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbPluginCPlusPlusLanguage lldbPluginObjCLanguage ${LLDB_CURSES_LIBS} diff --git a/lldb/source/Core/DumpRegisterValue.cpp b/lldb/source/Core/DumpRegisterValue.cpp index 90b31fd0e865e..aff4d2c621d7e 100644 --- a/lldb/source/Core/DumpRegisterValue.cpp +++ b/lldb/source/Core/DumpRegisterValue.cpp @@ -8,14 +8,14 @@ #include "lldb/Core/DumpRegisterValue.h" #include "lldb/Core/DumpDataExtractor.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/DumpValueObjectOptions.h" #include "lldb/Target/RegisterFlags.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Endian.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "lldb/lldb-private-types.h" #include "llvm/ADT/bit.h" diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp index c03af1d910777..c6b7210eea16b 100644 --- a/lldb/source/Core/FormatEntity.cpp +++ b/lldb/source/Core/FormatEntity.cpp @@ -13,8 +13,6 @@ #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" #include "lldb/DataFormatters/FormatManager.h" @@ -52,6 +50,8 @@ #include "lldb/Utility/StreamString.h" #include "lldb/Utility/StringList.h" #include "lldb/Utility/StructuredData.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-forward.h" #include "llvm/ADT/STLExtras.h" diff --git a/lldb/source/Core/IOHandlerCursesGUI.cpp b/lldb/source/Core/IOHandlerCursesGUI.cpp index d922d32f91058..c3bbe91290c36 100644 --- a/lldb/source/Core/IOHandlerCursesGUI.cpp +++ b/lldb/source/Core/IOHandlerCursesGUI.cpp @@ -25,13 +25,13 @@ #include #include "lldb/Core/Debugger.h" -#include "lldb/Core/ValueObjectUpdater.h" #include "lldb/Host/File.h" #include "lldb/Utility/AnsiTerminal.h" #include "lldb/Utility/Predicate.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/StreamString.h" #include "lldb/Utility/StringList.h" +#include "lldb/ValueObject/ValueObjectUpdater.h" #include "lldb/lldb-forward.h" #include "lldb/Interpreter/CommandCompletions.h" @@ -42,8 +42,6 @@ #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/Block.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/Function.h" @@ -56,6 +54,8 @@ #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/State.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #endif #include "llvm/ADT/StringRef.h" diff --git a/lldb/source/DataFormatters/CMakeLists.txt b/lldb/source/DataFormatters/CMakeLists.txt index 7f48a2785c73f..13faf65227d2c 100644 --- a/lldb/source/DataFormatters/CMakeLists.txt +++ b/lldb/source/DataFormatters/CMakeLists.txt @@ -22,7 +22,8 @@ add_lldb_library(lldbDataFormatters NO_PLUGIN_DEPENDENCIES lldbSymbol lldbTarget lldbUtility - + lldbValueObject + LINK_COMPONENTS Support ) diff --git a/lldb/source/DataFormatters/CXXFunctionPointer.cpp b/lldb/source/DataFormatters/CXXFunctionPointer.cpp index 6543433d17ff4..6d56e39fa9733 100644 --- a/lldb/source/DataFormatters/CXXFunctionPointer.cpp +++ b/lldb/source/DataFormatters/CXXFunctionPointer.cpp @@ -8,11 +8,11 @@ #include "lldb/DataFormatters/CXXFunctionPointer.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Target/ABI.h" #include "lldb/Target/SectionLoadList.h" #include "lldb/Target/Target.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-enumerations.h" #include diff --git a/lldb/source/DataFormatters/DumpValueObjectOptions.cpp b/lldb/source/DataFormatters/DumpValueObjectOptions.cpp index c5e84810cdc8f..18d590d47d9a0 100644 --- a/lldb/source/DataFormatters/DumpValueObjectOptions.cpp +++ b/lldb/source/DataFormatters/DumpValueObjectOptions.cpp @@ -8,7 +8,7 @@ #include "lldb/DataFormatters/DumpValueObjectOptions.h" -#include "lldb/Core/ValueObject.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp index a6de33a21c965..889135180fec9 100644 --- a/lldb/source/DataFormatters/FormatManager.cpp +++ b/lldb/source/DataFormatters/FormatManager.cpp @@ -9,7 +9,6 @@ #include "lldb/DataFormatters/FormatManager.h" #include "lldb/Core/Debugger.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/LanguageCategory.h" #include "lldb/Interpreter/ScriptInterpreter.h" @@ -17,6 +16,7 @@ #include "lldb/Target/Language.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/STLExtras.h" // BEGIN SWIFT diff --git a/lldb/source/DataFormatters/StringPrinter.cpp b/lldb/source/DataFormatters/StringPrinter.cpp index ab07c74fd1854..2571784250175 100644 --- a/lldb/source/DataFormatters/StringPrinter.cpp +++ b/lldb/source/DataFormatters/StringPrinter.cpp @@ -9,11 +9,11 @@ #include "lldb/DataFormatters/StringPrinter.h" #include "lldb/Core/Debugger.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Target/Language.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/ConvertUTF.h" diff --git a/lldb/source/DataFormatters/TypeSummary.cpp b/lldb/source/DataFormatters/TypeSummary.cpp index 3707d2d879d33..b8f2bad1e6d2a 100644 --- a/lldb/source/DataFormatters/TypeSummary.cpp +++ b/lldb/source/DataFormatters/TypeSummary.cpp @@ -15,13 +15,13 @@ #include "lldb/lldb-public.h" #include "lldb/Core/Debugger.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/ValueObjectPrinter.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Target/StackFrame.h" #include "lldb/Target/Target.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/DataFormatters/ValueObjectPrinter.cpp b/lldb/source/DataFormatters/ValueObjectPrinter.cpp index e023ec5176104..5edd8d65656e3 100644 --- a/lldb/source/DataFormatters/ValueObjectPrinter.cpp +++ b/lldb/source/DataFormatters/ValueObjectPrinter.cpp @@ -8,12 +8,12 @@ #include "lldb/DataFormatters/ValueObjectPrinter.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Target/Language.h" #include "lldb/Target/Target.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/Support/MathExtras.h" #include diff --git a/lldb/source/DataFormatters/VectorType.cpp b/lldb/source/DataFormatters/VectorType.cpp index f6c38f76fea31..cba107b7da890 100644 --- a/lldb/source/DataFormatters/VectorType.cpp +++ b/lldb/source/DataFormatters/VectorType.cpp @@ -8,12 +8,12 @@ #include "lldb/DataFormatters/VectorType.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/TypeSystem.h" #include "lldb/Target/Target.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "lldb/Utility/LLDBAssert.h" #include "lldb/Utility/Log.h" diff --git a/lldb/source/Expression/CMakeLists.txt b/lldb/source/Expression/CMakeLists.txt index e6c34635f38cc..0f17f2bfa86f2 100644 --- a/lldb/source/Expression/CMakeLists.txt +++ b/lldb/source/Expression/CMakeLists.txt @@ -34,6 +34,7 @@ add_lldb_library(lldbExpression ${PLUGIN_DEPENDENCY_ARG} lldbSymbol lldbTarget lldbUtility + lldbValueObject # Begin Swift Mods ${SWIFT_LIBS} diff --git a/lldb/source/Expression/FunctionCaller.cpp b/lldb/source/Expression/FunctionCaller.cpp index d1dd350b09f25..67f9cd5758be2 100644 --- a/lldb/source/Expression/FunctionCaller.cpp +++ b/lldb/source/Expression/FunctionCaller.cpp @@ -8,8 +8,6 @@ #include "lldb/Expression/FunctionCaller.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectList.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/IRExecutionUnit.h" #include "lldb/Interpreter/CommandReturnObject.h" @@ -27,6 +25,8 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/State.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectList.h" using namespace lldb_private; diff --git a/lldb/source/Expression/IRInterpreter.cpp b/lldb/source/Expression/IRInterpreter.cpp index 593258f4407d5..af38ff367ca7e 100644 --- a/lldb/source/Expression/IRInterpreter.cpp +++ b/lldb/source/Expression/IRInterpreter.cpp @@ -10,7 +10,6 @@ #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" #include "lldb/Core/ModuleSpec.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/IRExecutionUnit.h" #include "lldb/Expression/IRMemoryMap.h" @@ -22,6 +21,7 @@ #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/Target/ABI.h" #include "lldb/Target/ExecutionContext.h" diff --git a/lldb/source/Expression/LLVMUserExpression.cpp b/lldb/source/Expression/LLVMUserExpression.cpp index 2db5189d1f3a1..c03d804161a16 100644 --- a/lldb/source/Expression/LLVMUserExpression.cpp +++ b/lldb/source/Expression/LLVMUserExpression.cpp @@ -8,7 +8,6 @@ #include "lldb/Expression/LLVMUserExpression.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Expression/IRExecutionUnit.h" @@ -33,6 +32,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Expression/Materializer.cpp b/lldb/source/Expression/Materializer.cpp index 8fbfae454a56b..70fa970013897 100644 --- a/lldb/source/Expression/Materializer.cpp +++ b/lldb/source/Expression/Materializer.cpp @@ -8,8 +8,6 @@ #include "lldb/Expression/Materializer.h" #include "lldb/Core/DumpDataExtractor.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Symbol/Symbol.h" #include "lldb/Symbol/Type.h" @@ -23,6 +21,8 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/lldb-forward.h" #include diff --git a/lldb/source/Expression/UserExpression.cpp b/lldb/source/Expression/UserExpression.cpp index 999faddbcd246..572c6456f8917 100644 --- a/lldb/source/Expression/UserExpression.cpp +++ b/lldb/source/Expression/UserExpression.cpp @@ -14,7 +14,6 @@ #include #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Expression/IRExecutionUnit.h" @@ -39,6 +38,7 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/State.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "llvm/BinaryFormat/Dwarf.h" using namespace lldb_private; diff --git a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp index 57b8f52f91452..cb121c14048f0 100644 --- a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp +++ b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp @@ -17,7 +17,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -29,6 +28,7 @@ #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Utility/ARM64_DWARF_Registers.h" diff --git a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp index 2ca69378d7ec4..93b8141e97ef8 100644 --- a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp +++ b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp @@ -17,7 +17,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -29,6 +28,7 @@ #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Utility/ARM64_DWARF_Registers.h" diff --git a/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt b/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt index dcf15ef5b6cd8..e1e555249450e 100644 --- a/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt @@ -7,6 +7,7 @@ add_lldb_library(lldbPluginABIAArch64 PLUGIN lldbCore lldbSymbol lldbTarget + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp index 945fc56775b25..6f60663ca51e1 100644 --- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp +++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp @@ -22,9 +22,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -34,6 +31,9 @@ #include "lldb/Utility/ConstString.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #define DEFINE_REG_NAME(reg_num) ConstString(#reg_num).GetCString() #define DEFINE_REG_NAME_STR(reg_name) ConstString(reg_name).GetCString() diff --git a/lldb/source/Plugins/ABI/ARC/CMakeLists.txt b/lldb/source/Plugins/ABI/ARC/CMakeLists.txt index 1ad4cf16716b0..8654461a6e7b1 100644 --- a/lldb/source/Plugins/ABI/ARC/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/ARC/CMakeLists.txt @@ -6,6 +6,7 @@ add_lldb_library(lldbPluginABIARC PLUGIN lldbSymbol lldbTarget lldbPluginProcessUtility + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp index 005c5cb166e66..08c613c7b0d0c 100644 --- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp +++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp @@ -17,7 +17,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -27,6 +26,7 @@ #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/Process/Utility/ARMDefines.h" #include "Utility/ARM_DWARF_Registers.h" diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp index b70ece159b5c2..1a0e44f1936b8 100644 --- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp +++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp @@ -17,7 +17,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -27,6 +26,7 @@ #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/Process/Utility/ARMDefines.h" #include "Utility/ARM_DWARF_Registers.h" diff --git a/lldb/source/Plugins/ABI/ARM/CMakeLists.txt b/lldb/source/Plugins/ABI/ARM/CMakeLists.txt index b0914d54f9b6c..f73848947e5d4 100644 --- a/lldb/source/Plugins/ABI/ARM/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/ARM/CMakeLists.txt @@ -8,6 +8,7 @@ add_lldb_library(lldbPluginABIARM PLUGIN lldbSymbol lldbTarget lldbPluginProcessUtility + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp index 1fb293bb3d532..5419f054cbe2d 100644 --- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp +++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp @@ -14,9 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -28,6 +25,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt b/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt index c2d80ee153854..2bfc08d62a887 100644 --- a/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt @@ -5,6 +5,7 @@ add_lldb_library(lldbPluginABIHexagon PLUGIN lldbCore lldbSymbol lldbTarget + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp b/lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp index 7fb651aa6c18f..6f0fd3a6e8f6f 100644 --- a/lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp +++ b/lldb/source/Plugins/ABI/MSP430/ABISysV_msp430.cpp @@ -12,9 +12,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -25,6 +22,9 @@ #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/TargetParser/Triple.h" diff --git a/lldb/source/Plugins/ABI/MSP430/CMakeLists.txt b/lldb/source/Plugins/ABI/MSP430/CMakeLists.txt index 81abb2d9b16e0..6aff7a2f7bf2e 100644 --- a/lldb/source/Plugins/ABI/MSP430/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/MSP430/CMakeLists.txt @@ -5,6 +5,7 @@ add_lldb_library(lldbPluginABIMSP430 PLUGIN lldbCore lldbSymbol lldbTarget + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp index 58293c3e7f64c..d21ee8ac04a21 100644 --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp @@ -14,9 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -29,6 +26,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp index cd9c3442cebce..100d52bfd1c8b 100644 --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp @@ -14,9 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -29,6 +26,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/ABI/Mips/CMakeLists.txt b/lldb/source/Plugins/ABI/Mips/CMakeLists.txt index 7e2cfc80b55ff..c7d0cc69d727f 100644 --- a/lldb/source/Plugins/ABI/Mips/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/Mips/CMakeLists.txt @@ -7,6 +7,7 @@ add_lldb_library(lldbPluginABIMips PLUGIN lldbCore lldbSymbol lldbTarget + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp index 655c52b71fe04..e482b8d4c4c46 100644 --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp @@ -14,9 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -29,6 +26,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp index 34c34ff7dbadd..0aa51ef654274 100644 --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp @@ -17,9 +17,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -32,6 +29,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Attr.h" diff --git a/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt b/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt index 3ab251e4c64d7..eff8cd664e4cf 100644 --- a/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt @@ -8,6 +8,7 @@ add_lldb_library(lldbPluginABIPowerPC PLUGIN lldbSymbol lldbTarget lldbPluginTypeSystemClang + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.cpp b/lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.cpp index de304183f6717..6c96ac9817ab7 100644 --- a/lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.cpp +++ b/lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.cpp @@ -16,11 +16,11 @@ #include "Utility/RISCV_DWARF_Registers.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Target/RegisterContext.h" #include "lldb/Target/StackFrame.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/RegisterValue.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #define DEFINE_REG_NAME(reg_num) ConstString(#reg_num).GetCString() #define DEFINE_REG_NAME_STR(reg_name) ConstString(reg_name).GetCString() diff --git a/lldb/source/Plugins/ABI/RISCV/CMakeLists.txt b/lldb/source/Plugins/ABI/RISCV/CMakeLists.txt index a556480ecdcf4..5b25bf7c6af82 100755 --- a/lldb/source/Plugins/ABI/RISCV/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/RISCV/CMakeLists.txt @@ -6,6 +6,7 @@ add_lldb_library(lldbPluginABIRISCV PLUGIN lldbSymbol lldbTarget lldbPluginProcessUtility + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp index ac2d1988a176c..82853c96a0f74 100644 --- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp +++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp @@ -14,9 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -29,6 +26,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt b/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt index 11d659b03b55a..b6164ed87d9db 100644 --- a/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt @@ -5,6 +5,7 @@ add_lldb_library(lldbPluginABISystemZ PLUGIN lldbCore lldbSymbol lldbTarget + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp index 1abf7365e83cc..f03acbcedb351 100644 --- a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp +++ b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp @@ -16,7 +16,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -26,6 +25,7 @@ #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp index ecf68e6131d3c..19ec5fa49bbea 100644 --- a/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp +++ b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp @@ -13,9 +13,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -27,6 +24,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp index 7b239cc51e9f1..97eb4c0fb73fc 100644 --- a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp +++ b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp @@ -15,9 +15,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -30,6 +27,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include #include diff --git a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp index 2f88a329eb416..098293c1d6046 100644 --- a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp +++ b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp @@ -15,9 +15,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectRegister.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -30,6 +27,9 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/ABI/X86/CMakeLists.txt b/lldb/source/Plugins/ABI/X86/CMakeLists.txt index 32a9df14b4b9b..eeab6297e6f2d 100644 --- a/lldb/source/Plugins/ABI/X86/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/X86/CMakeLists.txt @@ -10,6 +10,7 @@ add_lldb_library(lldbPluginABIX86 PLUGIN lldbCore lldbSymbol lldbTarget + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt index e0ae3922788eb..675cd066507bc 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt +++ b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt @@ -37,6 +37,7 @@ add_lldb_library(lldbPluginExpressionParserClang lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbPluginCPlusPlusLanguage lldbPluginCPPRuntime lldbPluginObjCRuntime diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp index ef9235fc44138..49433346cb388 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp @@ -20,8 +20,6 @@ #include "lldb/Core/Address.h" #include "lldb/Core/Module.h" #include "lldb/Core/ModuleSpec.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/Materializer.h" #include "lldb/Symbol/CompileUnit.h" @@ -47,6 +45,8 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/lldb-private-types.h" #include "lldb/lldb-private.h" #include "clang/AST/ASTConsumer.h" diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionUtil.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionUtil.cpp index 723a3d7e59849..d4b2775b8c039 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionUtil.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionUtil.cpp @@ -8,9 +8,9 @@ #include "ClangExpressionUtil.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Target/StackFrame.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace ClangExpressionUtil { diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionVariable.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionVariable.cpp index ac3cb0b1bdf31..e2fb4a054daf3 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionVariable.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionVariable.cpp @@ -9,12 +9,12 @@ #include "ClangExpressionVariable.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "clang/AST/ASTContext.h" using namespace lldb_private; diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.cpp index 59321e375bdca..e4a094f3aa512 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.cpp @@ -23,8 +23,6 @@ #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectList.h" #include "lldb/Expression/IRExecutionUnit.h" #include "lldb/Interpreter/CommandReturnObject.h" #include "lldb/Symbol/Function.h" @@ -40,6 +38,8 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/State.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectList.h" using namespace lldb_private; diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h b/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h index 2a5c863b51a2f..9329ce76ec3bd 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h @@ -13,10 +13,10 @@ #include "lldb/Core/Address.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectList.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Target/Process.h" +#include "lldb/ValueObject/ValueObjectList.h" namespace lldb_private { diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp index 7cf22863d30a1..a5524b95242a9 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp @@ -27,7 +27,6 @@ #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Expression/ExpressionSourceCode.h" #include "lldb/Expression/IRExecutionUnit.h" #include "lldb/Expression/IRInterpreter.h" @@ -51,6 +50,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/DeclObjC.h" diff --git a/lldb/source/Plugins/InstrumentationRuntime/TSan/CMakeLists.txt b/lldb/source/Plugins/InstrumentationRuntime/TSan/CMakeLists.txt index a388cbb2ddfea..673e75fa2faf2 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/TSan/CMakeLists.txt +++ b/lldb/source/Plugins/InstrumentationRuntime/TSan/CMakeLists.txt @@ -8,5 +8,6 @@ add_lldb_library(lldbPluginInstrumentationRuntimeTSan PLUGIN lldbInterpreter lldbSymbol lldbTarget + lldbValueObject lldbPluginProcessUtility ) diff --git a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp index eda4ba165a1d3..06e00fd63acaf 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp @@ -14,7 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginInterface.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/UserExpression.h" #include "lldb/Host/StreamFile.h" #include "lldb/Interpreter/CommandReturnObject.h" @@ -31,6 +30,7 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegularExpression.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" #include diff --git a/lldb/source/Plugins/InstrumentationRuntime/UBSan/CMakeLists.txt b/lldb/source/Plugins/InstrumentationRuntime/UBSan/CMakeLists.txt index 12e1956bbe88e..156bd3ac454e7 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/UBSan/CMakeLists.txt +++ b/lldb/source/Plugins/InstrumentationRuntime/UBSan/CMakeLists.txt @@ -8,6 +8,7 @@ add_lldb_library(lldbPluginInstrumentationRuntimeUBSan PLUGIN lldbInterpreter lldbSymbol lldbTarget + lldbValueObject LINK_COMPONENTS Support ) diff --git a/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp b/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp index 80935915e6c67..06d455e0676b2 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp @@ -14,7 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginInterface.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/UserExpression.h" #include "lldb/Host/StreamFile.h" #include "lldb/Interpreter/CommandReturnObject.h" @@ -29,6 +28,7 @@ #include "lldb/Target/Thread.h" #include "lldb/Utility/RegularExpression.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" #include #include diff --git a/lldb/source/Plugins/InstrumentationRuntime/Utility/CMakeLists.txt b/lldb/source/Plugins/InstrumentationRuntime/Utility/CMakeLists.txt index 05f05c8139227..dcca47fb0e253 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/Utility/CMakeLists.txt +++ b/lldb/source/Plugins/InstrumentationRuntime/Utility/CMakeLists.txt @@ -7,4 +7,5 @@ add_lldb_library(lldbPluginInstrumentationRuntimeUtility lldbExpression lldbSymbol lldbTarget + lldbValueObject ) diff --git a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp index 298b63bc716fc..2f1c78d07fc01 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp @@ -11,9 +11,9 @@ #include "lldb/Breakpoint/StoppointCallbackContext.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/UserExpression.h" #include "lldb/Target/InstrumentationRuntimeStopInfo.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp index 01b0943a0caf9..95516d1aa62c6 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp @@ -11,8 +11,6 @@ #include "Plugins/ExpressionParser/Clang/ClangASTImporter.h" #include "Plugins/ExpressionParser/Clang/ClangPersistentVariables.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/TypeSystem.h" @@ -20,6 +18,8 @@ #include "lldb/Utility/LLDBAssert.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt b/lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt index f59032c423880..ccdc4d0ae99b3 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt +++ b/lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt @@ -33,6 +33,7 @@ add_lldb_library(lldbPluginCPlusPlusLanguage PLUGIN lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbPluginClangCommon lldbPluginCPPRuntime lldbPluginTypeSystemClang diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp index d20603f7f656d..0198ceb8149e1 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp @@ -23,7 +23,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/UniqueCStringMap.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/DataFormatters/CXXFunctionPointer.h" #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/DataFormatters/FormattersHelpers.h" @@ -34,6 +33,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/RegularExpression.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "BlockPointer.h" #include "CPlusPlusNameParser.h" diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h index 1d4bc65e26374..f9765f3255d2b 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h +++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h @@ -9,10 +9,10 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_COROUTINES_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_COROUTINES_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { diff --git a/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp b/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp index 6781c96210a42..6d810cd30cd8c 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp @@ -11,8 +11,6 @@ #include "llvm/Support/ConvertUTF.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/StringPrinter.h" #include "lldb/DataFormatters/TypeSummary.h" @@ -24,6 +22,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include #include diff --git a/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.h b/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.h index 2713ded45929c..a2b606d28cac1 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.h +++ b/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.h @@ -10,9 +10,9 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_CXXSTRINGTYPES_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_CXXSTRINGTYPES_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/CPlusPlus/Generic.h b/lldb/source/Plugins/Language/CPlusPlus/Generic.h index bfb28bebf90be..34efef9e82e5c 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/Generic.h +++ b/lldb/source/Plugins/Language/CPlusPlus/Generic.h @@ -9,9 +9,9 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_GENERIC_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_GENERIC_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp index feaa51a96843a..d029855f6026d 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp @@ -10,8 +10,6 @@ #include "lldb/Core/Debugger.h" #include "lldb/Core/FormatEntity.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/StringPrinter.h" #include "lldb/DataFormatters/TypeSummary.h" @@ -23,6 +21,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h index 5307b5251ca84..159616c74be90 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h @@ -10,10 +10,10 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_LIBCXX_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_LIBCXX_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.h b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.h index 6fcceb645c7be..93274460ce359 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.h +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.h @@ -10,10 +10,10 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_LIBCXXATOMIC_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_LIBCXXATOMIC_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp index bd9c72497664a..67c6d1d3e5506 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp @@ -8,9 +8,9 @@ #include "LibCxx.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp index d7cfeb30557c3..f92f263c87311 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp @@ -9,14 +9,15 @@ #include "LibCxx.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Target.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/lldb-enumerations.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp index 5106a63d531f8..e62bff9bd19ac 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp @@ -9,14 +9,14 @@ #include "LibCxx.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Target.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" #include diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp index 726f06523b97b..c659adbb9ab2e 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp @@ -8,8 +8,8 @@ #include "LibCxx.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" +#include "lldb/ValueObject/ValueObject.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp index 01a7b8f142ecb..f3fe56525789a 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp @@ -8,9 +8,9 @@ #include "LibCxx.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/APSInt.h" using namespace lldb; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp index c33d8e91af709..5d607709d2c6f 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp @@ -8,8 +8,8 @@ #include "LibCxx.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" +#include "lldb/ValueObject/ValueObject.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp index 9895f336bfd02..15040295efe6d 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp @@ -8,9 +8,9 @@ #include "LibCxx.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/APSInt.h" #include diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp index 93e7f4f4fd86c..105ec6b9c4a3e 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp @@ -9,8 +9,6 @@ #include "LibCxx.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Target.h" #include "lldb/Utility/ConstString.h" @@ -18,6 +16,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "llvm/ADT/StringRef.h" using namespace lldb; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp index 99f94406e99a6..3f519f8c585f5 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp @@ -8,8 +8,8 @@ #include "LibCxx.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" +#include "lldb/ValueObject/ValueObject.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.h b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.h index 9488d94efda70..c6764f6178ae5 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.h +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.h @@ -9,10 +9,10 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_LIBCXXVARIANT_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_LIBCXXVARIANT_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp index 461fed35164b4..eb65f1e57290e 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp @@ -8,9 +8,11 @@ #include "LibCxx.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/lldb-enumerations.h" +#include "lldb/lldb-forward.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp index 86bb575af5ca3..0a1877471916d 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp @@ -10,8 +10,6 @@ #include "LibCxx.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/StringPrinter.h" #include "lldb/DataFormatters/VectorIterator.h" #include "lldb/Target/Target.h" @@ -19,6 +17,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h index 1c1c8fdb9ea41..c7b2130275ad8 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h @@ -9,10 +9,10 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_LIBSTDCPP_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_CPLUSPLUS_LIBSTDCPP_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp index 05199ba35b9a4..f59969d4cd7a1 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp @@ -8,10 +8,10 @@ #include "LibStdcpp.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include #include diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp index 92f540d9ca523..9447f7463f64a 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp @@ -8,10 +8,10 @@ #include "LibStdcpp.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include #include diff --git a/lldb/source/Plugins/Language/ObjC/CF.cpp b/lldb/source/Plugins/Language/ObjC/CF.cpp index 0926192a4f384..eba905b7b94f3 100644 --- a/lldb/source/Plugins/Language/ObjC/CF.cpp +++ b/lldb/source/Plugins/Language/ObjC/CF.cpp @@ -9,8 +9,6 @@ #include "CF.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Language.h" #include "lldb/Target/StackFrame.h" @@ -19,6 +17,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h" diff --git a/lldb/source/Plugins/Language/ObjC/CF.h b/lldb/source/Plugins/Language/ObjC/CF.h index 6165e1c235bc8..a4e6031b08f62 100644 --- a/lldb/source/Plugins/Language/ObjC/CF.h +++ b/lldb/source/Plugins/Language/ObjC/CF.h @@ -9,9 +9,9 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_CF_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_CF_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/ObjC/CMakeLists.txt b/lldb/source/Plugins/Language/ObjC/CMakeLists.txt index b50359c8b36cc..e89dcbbe560d3 100644 --- a/lldb/source/Plugins/Language/ObjC/CMakeLists.txt +++ b/lldb/source/Plugins/Language/ObjC/CMakeLists.txt @@ -35,6 +35,7 @@ add_lldb_library(lldbPluginObjCLanguage PLUGIN lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbPluginAppleObjCRuntime lldbPluginClangCommon lldbPluginTypeSystemClang diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp index 868e99197acc8..90541da549c67 100644 --- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp +++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp @@ -13,8 +13,6 @@ #include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Mangled.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/StringPrinter.h" #include "lldb/DataFormatters/TypeSummary.h" @@ -27,6 +25,8 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "llvm/ADT/APInt.h" #include "llvm/ADT/bit.h" diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.h b/lldb/source/Plugins/Language/ObjC/Cocoa.h index a195d622ce581..9617cb07cd8d6 100644 --- a/lldb/source/Plugins/Language/ObjC/Cocoa.h +++ b/lldb/source/Plugins/Language/ObjC/Cocoa.h @@ -10,10 +10,10 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_COCOA_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_COCOA_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h" diff --git a/lldb/source/Plugins/Language/ObjC/CoreMedia.h b/lldb/source/Plugins/Language/ObjC/CoreMedia.h index 7fd8560d20e18..cc926f9c480ac 100644 --- a/lldb/source/Plugins/Language/ObjC/CoreMedia.h +++ b/lldb/source/Plugins/Language/ObjC/CoreMedia.h @@ -10,9 +10,9 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_COREMEDIA_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_COREMEDIA_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/ObjC/NSArray.cpp b/lldb/source/Plugins/Language/ObjC/NSArray.cpp index aba726400324e..5d6b7354c5f05 100644 --- a/lldb/source/Plugins/Language/ObjC/NSArray.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSArray.cpp @@ -14,8 +14,6 @@ #include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Target/Language.h" @@ -24,6 +22,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp index ee8f7e08db68e..a06e33ee556cf 100644 --- a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp @@ -16,8 +16,6 @@ #include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Language.h" #include "lldb/Target/StackFrame.h" @@ -26,6 +24,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.h b/lldb/source/Plugins/Language/ObjC/NSDictionary.h index 57dacd6759d29..a65298de56b90 100644 --- a/lldb/source/Plugins/Language/ObjC/NSDictionary.h +++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.h @@ -9,11 +9,11 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_NSDICTIONARY_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_NSDICTIONARY_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" #include #include diff --git a/lldb/source/Plugins/Language/ObjC/NSError.cpp b/lldb/source/Plugins/Language/ObjC/NSError.cpp index 5ef7edc7e80c1..2356bc4ef4bab 100644 --- a/lldb/source/Plugins/Language/ObjC/NSError.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSError.cpp @@ -11,14 +11,14 @@ #include "Cocoa.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Target.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/Language/ObjC/NSString.h" #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h" diff --git a/lldb/source/Plugins/Language/ObjC/NSException.cpp b/lldb/source/Plugins/Language/ObjC/NSException.cpp index e7ce26ea4c6f5..b7d42bc5745e3 100644 --- a/lldb/source/Plugins/Language/ObjC/NSException.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSException.cpp @@ -10,14 +10,14 @@ #include "Cocoa.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Target.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/Language/ObjC/NSString.h" #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h" diff --git a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp index a434cee09d382..e29f625b405b0 100644 --- a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp @@ -9,12 +9,12 @@ #include "Cocoa.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h" using namespace lldb; diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.cpp b/lldb/source/Plugins/Language/ObjC/NSSet.cpp index d04b4e738f466..6bceab78b50a3 100644 --- a/lldb/source/Plugins/Language/ObjC/NSSet.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSSet.cpp @@ -11,8 +11,6 @@ #include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Language.h" #include "lldb/Target/Target.h" @@ -20,6 +18,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.h b/lldb/source/Plugins/Language/ObjC/NSSet.h index 3ad1f694befe7..2c490b72961f3 100644 --- a/lldb/source/Plugins/Language/ObjC/NSSet.h +++ b/lldb/source/Plugins/Language/ObjC/NSSet.h @@ -10,11 +10,11 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_NSSET_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_NSSET_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/Language/ObjC/NSString.cpp b/lldb/source/Plugins/Language/ObjC/NSString.cpp index 0a30737d9723b..a99d042572bfe 100644 --- a/lldb/source/Plugins/Language/ObjC/NSString.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSString.cpp @@ -8,8 +8,6 @@ #include "NSString.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/StringPrinter.h" #include "lldb/Target/Language.h" @@ -19,6 +17,8 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/ObjC/NSString.h b/lldb/source/Plugins/Language/ObjC/NSString.h index a68cc6c056b0d..8c9fcf955f1f8 100644 --- a/lldb/source/Plugins/Language/ObjC/NSString.h +++ b/lldb/source/Plugins/Language/ObjC/NSString.h @@ -10,9 +10,9 @@ #ifndef LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_NSSTRING_H #define LLDB_SOURCE_PLUGINS_LANGUAGE_OBJC_NSSTRING_H -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h" diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp index f44f3c5582172..da59f6f5858b1 100644 --- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp +++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp @@ -14,13 +14,13 @@ #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Target/Target.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/Support/Threading.h" diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt index 5ab494414ac5b..a5406c73be933 100644 --- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt +++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt @@ -7,6 +7,7 @@ add_lldb_library(lldbPluginCXXItaniumABI PLUGIN lldbInterpreter lldbSymbol lldbTarget + lldbValueObject lldbPluginCPPRuntime lldbPluginTypeSystemClang ) diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp index 7af768aad0bc1..afaf2ebb70e4b 100644 --- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp @@ -13,8 +13,6 @@ #include "lldb/Core/Mangled.h" #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectMemory.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/FunctionCaller.h" @@ -35,6 +33,8 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectMemory.h" #include diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp index 5ff267720629e..ceee19c136d25 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp @@ -18,8 +18,6 @@ #include "lldb/Core/ModuleList.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Section.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/FunctionCaller.h" @@ -37,6 +35,8 @@ #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "clang/AST/Type.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index 5051fde5c4e7f..9725fa440882e 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -14,8 +14,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Section.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Expression/UtilityFunction.h" @@ -48,6 +46,8 @@ #include "lldb/Utility/Stream.h" #include "lldb/Utility/StreamString.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/lldb-enumerations.h" #include "AppleObjCClassDescriptorV2.h" diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt index 3789f56325980..53320d3da4cfb 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt @@ -17,6 +17,7 @@ add_lldb_library(lldbPluginAppleObjCRuntime PLUGIN lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbPluginExpressionParserClang lldbPluginCPPRuntime lldbPluginTypeSystemClang diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/CMakeLists.txt index 1da3ac58ec9f5..0c7bff701dc04 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/CMakeLists.txt +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/CMakeLists.txt @@ -10,6 +10,7 @@ add_lldb_library(lldbPluginGNUstepObjCRuntime PLUGIN lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbPluginExpressionParserClang lldbPluginTypeSystemClang CLANG_LIBS diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/GNUstepObjCRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/GNUstepObjCRuntime.cpp index 58b838752be50..d6ffb03ab55e2 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/GNUstepObjCRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/GNUstepObjCRuntime/GNUstepObjCRuntime.cpp @@ -12,13 +12,13 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/UtilityFunction.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp index ccde6c03db2eb..cb745135b0249 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp @@ -12,7 +12,6 @@ #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Symbol/SymbolFile.h" #include "lldb/Symbol/Type.h" @@ -23,6 +22,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/DJB.h" diff --git a/lldb/source/Plugins/MemoryHistory/asan/CMakeLists.txt b/lldb/source/Plugins/MemoryHistory/asan/CMakeLists.txt index 08deb75aabb11..a03723500f3a2 100644 --- a/lldb/source/Plugins/MemoryHistory/asan/CMakeLists.txt +++ b/lldb/source/Plugins/MemoryHistory/asan/CMakeLists.txt @@ -5,5 +5,6 @@ add_lldb_library(lldbPluginMemoryHistoryASan PLUGIN lldbCore lldbExpression lldbTarget + lldbValueObject lldbPluginProcessUtility ) diff --git a/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp b/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp index fe6c5a0544be3..7363f606d1a72 100644 --- a/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp +++ b/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp @@ -15,12 +15,12 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginInterface.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/UserExpression.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadList.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-private.h" #include diff --git a/lldb/source/Plugins/OperatingSystem/Python/CMakeLists.txt b/lldb/source/Plugins/OperatingSystem/Python/CMakeLists.txt index 91d7901011bc4..b5be50d02bdb7 100644 --- a/lldb/source/Plugins/OperatingSystem/Python/CMakeLists.txt +++ b/lldb/source/Plugins/OperatingSystem/Python/CMakeLists.txt @@ -6,5 +6,6 @@ add_lldb_library(lldbPluginOperatingSystemPython PLUGIN lldbInterpreter lldbSymbol lldbTarget + lldbValueObject lldbPluginProcessUtility ) diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp index 106e38b6e25ae..3848a2b1deb97 100644 --- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp +++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp @@ -18,7 +18,6 @@ #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Interpreter/ScriptInterpreter.h" #include "lldb/Symbol/ObjectFile.h" @@ -33,6 +32,7 @@ #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/StreamString.h" #include "lldb/Utility/StructuredData.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include diff --git a/lldb/source/Plugins/Platform/Android/CMakeLists.txt b/lldb/source/Plugins/Platform/Android/CMakeLists.txt index 518041b6cb316..7ffccc30a19f0 100644 --- a/lldb/source/Plugins/Platform/Android/CMakeLists.txt +++ b/lldb/source/Plugins/Platform/Android/CMakeLists.txt @@ -14,6 +14,7 @@ add_lldb_library(lldbPluginPlatformAndroid PLUGIN LINK_LIBS lldbCore lldbHost + lldbValueObject lldbPluginPlatformLinux lldbPluginPlatformGDB LINK_COMPONENTS diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp index 1fd098b4c42b7..5bc9cc133fbd3 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp @@ -9,12 +9,12 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Section.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Host/HostInfo.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/UriParser.h" +#include "lldb/ValueObject/ValueObject.h" #include "AdbClient.h" #include "PlatformAndroid.h" diff --git a/lldb/source/Plugins/Platform/POSIX/CMakeLists.txt b/lldb/source/Plugins/Platform/POSIX/CMakeLists.txt index 78eb7bc60e0ea..ebca113a45d5d 100644 --- a/lldb/source/Plugins/Platform/POSIX/CMakeLists.txt +++ b/lldb/source/Plugins/Platform/POSIX/CMakeLists.txt @@ -7,6 +7,7 @@ add_lldb_library(lldbPluginPlatformPOSIX lldbHost lldbInterpreter lldbTarget + lldbValueObject lldbPluginPlatformGDB lldbPluginTypeSystemClang ) diff --git a/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp b/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp index e9830c9f8722b..4a8f669a84ecb 100644 --- a/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp +++ b/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp @@ -12,7 +12,6 @@ #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Expression/UserExpression.h" @@ -32,6 +31,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/ScopeExit.h" #include diff --git a/lldb/source/Plugins/Process/Utility/CMakeLists.txt b/lldb/source/Plugins/Process/Utility/CMakeLists.txt index 5df4a9e5ac5c8..308ea29e31ad7 100644 --- a/lldb/source/Plugins/Process/Utility/CMakeLists.txt +++ b/lldb/source/Plugins/Process/Utility/CMakeLists.txt @@ -66,6 +66,7 @@ add_lldb_library(lldbPluginProcessUtility lldbSymbol lldbTarget lldbUtility + lldbValueObject LINK_COMPONENTS Support TargetParser diff --git a/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp b/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp index 32c71d87c7f58..99426c7d1f261 100644 --- a/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp +++ b/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp @@ -9,7 +9,6 @@ #include "InferiorCallPOSIX.h" #include "lldb/Core/Address.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Host/Config.h" #include "lldb/Symbol/SymbolContext.h" @@ -19,6 +18,7 @@ #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Target/ThreadPlanCallFunction.h" +#include "lldb/ValueObject/ValueObject.h" #if LLDB_ENABLE_POSIX #include diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt index 7523d65abf0f8..fd3118aa9c0a8 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt +++ b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt @@ -33,6 +33,7 @@ add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN lldbHost lldbInterpreter lldbTarget + lldbValueObject lldbPluginScriptInterpreterPythonInterfaces ${Python3_LIBRARIES} ${LLDB_LIBEDIT_LIBS} diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 63691d24f0dad..f792af56aceb7 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -29,7 +29,6 @@ #include "lldb/Core/Debugger.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/ThreadedCommunication.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/Host/FileSystem.h" #include "lldb/Host/HostInfo.h" @@ -41,6 +40,7 @@ #include "lldb/Utility/Instrumentation.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Error.h" diff --git a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt index 15049e91db32c..6c7059aa5b230 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt +++ b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt @@ -53,6 +53,7 @@ add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbPluginObjCLanguage lldbPluginCPlusPlusLanguage lldbPluginExpressionParserClang diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp index 409e9bb37ab28..0cd2db86e5d7a 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp @@ -11,9 +11,9 @@ #include "DWARFDIE.h" #include "SymbolFileDWARF.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/SymbolFile.h" #include "lldb/Target/StackFrame.h" +#include "lldb/ValueObject/ValueObject.h" #include using namespace lldb; diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.cpp b/lldb/source/Plugins/SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.cpp index 5d7e6d221f1b9..a785ef126ae66 100644 --- a/lldb/source/Plugins/SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.cpp +++ b/lldb/source/Plugins/SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.cpp @@ -9,7 +9,6 @@ #include "AbortWithPayloadFrameRecognizer.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Target/ABI.h" #include "lldb/Target/Process.h" #include "lldb/Target/StackFrame.h" @@ -18,6 +17,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/StructuredData.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt b/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt index 17fccdf43c828..9dc196f45d601 100644 --- a/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt +++ b/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt @@ -14,6 +14,7 @@ add_lldb_library(lldbPluginSystemRuntimeMacOSX PLUGIN lldbSymbol lldbTarget lldbUtility + lldbValueObject lldbPluginProcessUtility lldbPluginTypeSystemClang ) diff --git a/lldb/source/Symbol/CMakeLists.txt b/lldb/source/Symbol/CMakeLists.txt index b01b144fec02e..8eaf1d9246852 100644 --- a/lldb/source/Symbol/CMakeLists.txt +++ b/lldb/source/Symbol/CMakeLists.txt @@ -64,6 +64,7 @@ add_lldb_library(lldbSymbol ${PLUGIN_DEPENDENCY_ARG} lldbHost lldbTarget lldbUtility + lldbValueObject ${LLDB_PLUGIN_DEPENDENCIES} ${SWIFT_LIBS} diff --git a/lldb/source/Symbol/Variable.cpp b/lldb/source/Symbol/Variable.cpp index 092fd14689637..6b206d3b3620d 100644 --- a/lldb/source/Symbol/Variable.cpp +++ b/lldb/source/Symbol/Variable.cpp @@ -9,8 +9,6 @@ #include "lldb/Symbol/Variable.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Symbol/Block.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/CompilerDecl.h" @@ -31,6 +29,8 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegularExpression.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "llvm/ADT/Twine.h" diff --git a/lldb/source/Target/ABI.cpp b/lldb/source/Target/ABI.cpp index 99bb00b04f51a..bad1a6b8c2df9 100644 --- a/lldb/source/Target/ABI.cpp +++ b/lldb/source/Target/ABI.cpp @@ -9,7 +9,6 @@ #include "lldb/Target/ABI.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/TypeSystem.h" @@ -17,6 +16,7 @@ #include "lldb/Target/Thread.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "llvm/MC/TargetRegistry.h" #include diff --git a/lldb/source/Target/CMakeLists.txt b/lldb/source/Target/CMakeLists.txt index 8a45cbcf48d0b..6bbc4d0b6c32a 100644 --- a/lldb/source/Target/CMakeLists.txt +++ b/lldb/source/Target/CMakeLists.txt @@ -89,6 +89,7 @@ add_lldb_library(lldbTarget lldbInterpreter lldbSymbol lldbUtility + lldbValueObject lldbPluginProcessUtility LINK_COMPONENTS diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp index da36338a3b328..2d715ec7582ad 100644 --- a/lldb/source/Target/StackFrame.cpp +++ b/lldb/source/Target/StackFrame.cpp @@ -13,9 +13,6 @@ #include "lldb/Core/Mangled.h" #include "lldb/Core/Module.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/Function.h" #include "lldb/Symbol/Symbol.h" @@ -33,6 +30,9 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/RegisterValue.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/lldb-enumerations.h" diff --git a/lldb/source/Target/StopInfo.cpp b/lldb/source/Target/StopInfo.cpp index 6367b02dae82c..0108efe32c9e0 100644 --- a/lldb/source/Target/StopInfo.cpp +++ b/lldb/source/Target/StopInfo.cpp @@ -14,7 +14,6 @@ #include "lldb/Breakpoint/Watchpoint.h" #include "lldb/Breakpoint/WatchpointResource.h" #include "lldb/Core/Debugger.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/UserExpression.h" #include "lldb/Target/Process.h" #include "lldb/Target/StopInfo.h" @@ -26,6 +25,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index 72e25cd095d8c..47d68ec50d8e6 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -24,8 +24,6 @@ #include "lldb/Core/Section.h" #include "lldb/Core/SourceManager.h" #include "lldb/Core/StructuredDataImpl.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/ExpressionVariable.h" @@ -66,6 +64,8 @@ #include "lldb/Utility/State.h" #include "lldb/Utility/StreamString.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "llvm/ADT/ScopeExit.h" #include "llvm/ADT/SetVector.h" diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index bdab46b048f24..c00b58b245f0a 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -12,8 +12,6 @@ #include "lldb/Core/FormatEntity.h" #include "lldb/Core/Module.h" #include "lldb/Core/StructuredDataImpl.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Host/Host.h" #include "lldb/Interpreter/OptionValueFileSpecList.h" #include "lldb/Interpreter/OptionValueProperties.h" @@ -51,6 +49,8 @@ #include "lldb/Utility/State.h" #include "lldb/Utility/Stream.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "lldb/lldb-enumerations.h" #ifdef LLDB_ENABLE_SWIFT diff --git a/lldb/source/Target/ThreadPlanStepOut.cpp b/lldb/source/Target/ThreadPlanStepOut.cpp index 21c3eca14989b..4a633467ee164 100644 --- a/lldb/source/Target/ThreadPlanStepOut.cpp +++ b/lldb/source/Target/ThreadPlanStepOut.cpp @@ -9,7 +9,6 @@ #include "lldb/Target/ThreadPlanStepOut.h" #include "lldb/Breakpoint/Breakpoint.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Symbol/Block.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/Function.h" @@ -25,6 +24,7 @@ #include "lldb/Target/ThreadPlanStepThrough.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include diff --git a/lldb/source/ValueObject/CMakeLists.txt b/lldb/source/ValueObject/CMakeLists.txt new file mode 100644 index 0000000000000..70cb3d6d53f07 --- /dev/null +++ b/lldb/source/ValueObject/CMakeLists.txt @@ -0,0 +1,35 @@ +add_lldb_library(lldbValueObject + ValueObject.cpp + ValueObjectCast.cpp + ValueObjectChild.cpp + ValueObjectConstResult.cpp + ValueObjectConstResultCast.cpp + ValueObjectConstResultChild.cpp + ValueObjectConstResultImpl.cpp + ValueObjectDynamicValue.cpp + ValueObjectList.cpp + ValueObjectMemory.cpp + ValueObjectRegister.cpp + ValueObjectSyntheticFilter.cpp + ValueObjectUpdater.cpp + ValueObjectVariable.cpp + ValueObjectVTable.cpp + + + LINK_LIBS + lldbBreakpoint + lldbDataFormatters + lldbExpression + lldbHost + lldbInterpreter + lldbSymbol + lldbTarget + lldbUtility + lldbPluginCPlusPlusLanguage + lldbPluginObjCLanguage + + LINK_COMPONENTS + Support + Demangle + TargetParser + ) diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/ValueObject/ValueObject.cpp similarity index 99% rename from lldb/source/Core/ValueObject.cpp rename to lldb/source/ValueObject/ValueObject.cpp index f6170dc0f23c8..cb700225a7577 100644 --- a/lldb/source/Core/ValueObject.cpp +++ b/lldb/source/ValueObject/ValueObject.cpp @@ -6,20 +6,13 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObject.h" +#include "lldb/ValueObject/ValueObject.h" #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "lldb/Core/Address.h" #include "lldb/Core/Declaration.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObjectCast.h" -#include "lldb/Core/ValueObjectChild.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectDynamicValue.h" -#include "lldb/Core/ValueObjectMemory.h" -#include "lldb/Core/ValueObjectSyntheticFilter.h" -#include "lldb/Core/ValueObjectVTable.h" #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/DataFormatters/DumpValueObjectOptions.h" #include "lldb/DataFormatters/FormatManager.h" @@ -50,6 +43,14 @@ #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Stream.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectCast.h" +#include "lldb/ValueObject/ValueObjectChild.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectDynamicValue.h" +#include "lldb/ValueObject/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectSyntheticFilter.h" +#include "lldb/ValueObject/ValueObjectVTable.h" #include "lldb/lldb-private-types.h" #ifdef LLDB_ENABLE_SWIFT @@ -71,8 +72,6 @@ #include #include -#include - namespace lldb_private { class ExecutionContextScope; } @@ -347,8 +346,6 @@ CompilerType ValueObject::MaybeCalculateCompleteType() { return compiler_type; } - - DataExtractor &ValueObject::GetDataExtractor() { UpdateValueIfNeeded(false); return m_data; @@ -661,8 +658,8 @@ bool ValueObject::GetSummaryAsCString(TypeSummaryImpl *summary_ptr, // a valid summary string or function because the type is not complete and // no member variables or member functions will be available. if (GetCompilerType().IsForcefullyCompleted()) { - destination = ""; - return true; + destination = ""; + return true; } // ideally we would like to bail out if passing NULL, but if we do so we end @@ -1810,8 +1807,7 @@ std::optional ValueObject::GetSwiftScratchContext() { } #endif // LLDB_ENABLE_SWIFT -void ValueObject::AddSyntheticChild(ConstString key, - ValueObject *valobj) { +void ValueObject::AddSyntheticChild(ConstString key, ValueObject *valobj) { m_synthetic_children[key] = valobj; } @@ -3030,13 +3026,13 @@ ValueObjectSP ValueObject::AddressOf(Status &error) { } ValueObjectSP ValueObject::DoCast(const CompilerType &compiler_type) { - return ValueObjectCast::Create(*this, GetName(), compiler_type); + return ValueObjectCast::Create(*this, GetName(), compiler_type); } ValueObjectSP ValueObject::Cast(const CompilerType &compiler_type) { // Only allow casts if the original type is equal or larger than the cast // type, unless we know this is a load address. Getting the size wrong for - // a host side storage could leak lldb memory, so we absolutely want to + // a host side storage could leak lldb memory, so we absolutely want to // prevent that. We may not always get the right value, for instance if we // have an expression result value that's copied into a storage location in // the target may not have copied enough memory. I'm not trying to fix that @@ -3051,13 +3047,12 @@ ValueObjectSP ValueObject::Cast(const CompilerType &compiler_type) { Status error; CompilerType my_type = GetCompilerType(); - ExecutionContextScope *exe_scope - = ExecutionContext(GetExecutionContextRef()) - .GetBestExecutionContextScope(); - if (compiler_type.GetByteSize(exe_scope) - <= GetCompilerType().GetByteSize(exe_scope) - || m_value.GetValueType() == Value::ValueType::LoadAddress) - return DoCast(compiler_type); + ExecutionContextScope *exe_scope = + ExecutionContext(GetExecutionContextRef()).GetBestExecutionContextScope(); + if (compiler_type.GetByteSize(exe_scope) <= + GetCompilerType().GetByteSize(exe_scope) || + m_value.GetValueType() == Value::ValueType::LoadAddress) + return DoCast(compiler_type); error = Status::FromErrorString( "Can only cast to a type that is equal to or smaller " @@ -3845,8 +3840,6 @@ bool ValueObject::CanProvideValue() { return (!type.IsValid()) || (0 != (type.GetTypeInfo() & eTypeHasValue)); } - - ValueObjectSP ValueObject::Persist() { if (!UpdateValueIfNeeded()) return nullptr; diff --git a/lldb/source/Core/ValueObjectCast.cpp b/lldb/source/ValueObject/ValueObjectCast.cpp similarity index 95% rename from lldb/source/Core/ValueObjectCast.cpp rename to lldb/source/ValueObject/ValueObjectCast.cpp index 308fa161180d4..6241f23979365 100644 --- a/lldb/source/Core/ValueObjectCast.cpp +++ b/lldb/source/ValueObject/ValueObjectCast.cpp @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectCast.h" +#include "lldb/ValueObject/ValueObjectCast.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObject.h" #include namespace lldb_private { @@ -43,8 +43,7 @@ CompilerType ValueObjectCast::GetCompilerTypeImpl() { return m_cast_type; } llvm::Expected ValueObjectCast::CalculateNumChildren(uint32_t max) { ExecutionContext exe_ctx(GetExecutionContextRef()); - auto children_count = GetCompilerType().GetNumChildren( - true, &exe_ctx); + auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx); if (!children_count) return children_count; return *children_count <= max ? *children_count : max; diff --git a/lldb/source/Core/ValueObjectChild.cpp b/lldb/source/ValueObject/ValueObjectChild.cpp similarity index 96% rename from lldb/source/Core/ValueObjectChild.cpp rename to lldb/source/ValueObject/ValueObjectChild.cpp index e1eec92ff07c7..d6773873b0ab1 100644 --- a/lldb/source/Core/ValueObjectChild.cpp +++ b/lldb/source/ValueObject/ValueObjectChild.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectChild.h" +#include "lldb/ValueObject/ValueObjectChild.h" #include "lldb/Core/Value.h" #include "lldb/Symbol/CompilerType.h" @@ -28,10 +28,9 @@ using namespace lldb_private; ValueObjectChild::ValueObjectChild( - ValueObject &parent, const CompilerType &compiler_type, - ConstString name, uint64_t byte_size, int32_t byte_offset, - uint32_t bitfield_bit_size, uint32_t bitfield_bit_offset, - bool is_base_class, bool is_deref_of_parent, + ValueObject &parent, const CompilerType &compiler_type, ConstString name, + uint64_t byte_size, int32_t byte_offset, uint32_t bitfield_bit_size, + uint32_t bitfield_bit_offset, bool is_base_class, bool is_deref_of_parent, AddressType child_ptr_or_ref_addr_type, uint64_t language_flags) : ValueObject(parent), m_compiler_type(compiler_type), m_byte_size(byte_size), m_byte_offset(byte_offset), @@ -237,8 +236,7 @@ bool ValueObjectChild::UpdateValue() { GetExecutionContextRef().Lock(thread_and_frame_only_if_stopped)); if (GetCompilerType().GetTypeInfo() & lldb::eTypeHasValue) { Value &value = is_instance_ptr_base ? m_parent->GetValue() : m_value; - m_error = - value.GetValueAsData(&exe_ctx, m_data, GetModule().get()); + m_error = value.GetValueAsData(&exe_ctx, m_data, GetModule().get()); } else { m_error.Clear(); // No value so nothing to read... } diff --git a/lldb/source/Core/ValueObjectConstResult.cpp b/lldb/source/ValueObject/ValueObjectConstResult.cpp similarity index 96% rename from lldb/source/Core/ValueObjectConstResult.cpp rename to lldb/source/ValueObject/ValueObjectConstResult.cpp index 48d152859c8e1..dae0c5871c86f 100644 --- a/lldb/source/Core/ValueObjectConstResult.cpp +++ b/lldb/source/ValueObject/ValueObjectConstResult.cpp @@ -6,9 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectDynamicValue.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/ExecutionContextScope.h" @@ -17,6 +16,7 @@ #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Scalar.h" +#include "lldb/ValueObject/ValueObjectDynamicValue.h" #include namespace lldb_private { @@ -97,8 +97,7 @@ ValueObjectSP ValueObjectConstResult::Create(ExecutionContextScope *exe_scope, } ValueObjectSP ValueObjectConstResult::Create(ExecutionContextScope *exe_scope, - Value &value, - ConstString name, + Value &value, ConstString name, Module *module) { auto manager_sp = ValueObjectManager::Create(); return (new ValueObjectConstResult(exe_scope, *manager_sp, value, name, @@ -141,8 +140,7 @@ ValueObjectConstResult::ValueObjectConstResult( ExecutionContextScope *exe_scope, ValueObjectManager &manager, const CompilerType &compiler_type, ConstString name, lldb::addr_t address, AddressType address_type, uint32_t addr_byte_size) - : ValueObject(exe_scope, manager), m_type_name(), - m_impl(this, address) { + : ValueObject(exe_scope, manager), m_type_name(), m_impl(this, address) { m_value.GetScalar() = address; m_data.SetAddressByteSize(addr_byte_size); m_value.GetScalar().GetData(m_data, addr_byte_size); @@ -208,8 +206,8 @@ lldb::ValueType ValueObjectConstResult::GetValueType() const { std::optional ValueObjectConstResult::GetByteSize() { ExecutionContext exe_ctx(GetExecutionContextRef()); if (!m_byte_size) { - if (auto size = - GetCompilerType().GetByteSize(exe_ctx.GetBestExecutionContextScope())) + if (auto size = GetCompilerType().GetByteSize( + exe_ctx.GetBestExecutionContextScope())) SetByteSize(*size); } return m_byte_size; diff --git a/lldb/source/Core/ValueObjectConstResultCast.cpp b/lldb/source/ValueObject/ValueObjectConstResultCast.cpp similarity index 96% rename from lldb/source/Core/ValueObjectConstResultCast.cpp rename to lldb/source/ValueObject/ValueObjectConstResultCast.cpp index bf7a12dc68236..ac6eef5e415ec 100644 --- a/lldb/source/Core/ValueObjectConstResultCast.cpp +++ b/lldb/source/ValueObject/ValueObjectConstResultCast.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectConstResultCast.h" +#include "lldb/ValueObject/ValueObjectConstResultCast.h" namespace lldb_private { class DataExtractor; diff --git a/lldb/source/Core/ValueObjectConstResultChild.cpp b/lldb/source/ValueObject/ValueObjectConstResultChild.cpp similarity index 80% rename from lldb/source/Core/ValueObjectConstResultChild.cpp rename to lldb/source/ValueObject/ValueObjectConstResultChild.cpp index 39fc0c9fbb35b..b1c800dfe8c33 100644 --- a/lldb/source/Core/ValueObjectConstResultChild.cpp +++ b/lldb/source/ValueObject/ValueObjectConstResultChild.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectConstResultChild.h" +#include "lldb/ValueObject/ValueObjectConstResultChild.h" #include "lldb/lldb-private-enumerations.h" namespace lldb_private { @@ -22,11 +22,10 @@ class ValueObject; using namespace lldb_private; ValueObjectConstResultChild::ValueObjectConstResultChild( - ValueObject &parent, const CompilerType &compiler_type, - ConstString name, uint32_t byte_size, int32_t byte_offset, - uint32_t bitfield_bit_size, uint32_t bitfield_bit_offset, - bool is_base_class, bool is_deref_of_parent, lldb::addr_t live_address, - uint64_t language_flags) + ValueObject &parent, const CompilerType &compiler_type, ConstString name, + uint32_t byte_size, int32_t byte_offset, uint32_t bitfield_bit_size, + uint32_t bitfield_bit_offset, bool is_base_class, bool is_deref_of_parent, + lldb::addr_t live_address, uint64_t language_flags) : ValueObjectChild(parent, compiler_type, name, byte_size, byte_offset, bitfield_bit_size, bitfield_bit_offset, is_base_class, is_deref_of_parent, eAddressTypeLoad, language_flags), @@ -51,8 +50,9 @@ lldb::ValueObjectSP ValueObjectConstResultChild::AddressOf(Status &error) { return m_impl.AddressOf(error); } -lldb::addr_t ValueObjectConstResultChild::GetAddressOf( - bool scalar_is_load_address, AddressType* address_type) { +lldb::addr_t +ValueObjectConstResultChild::GetAddressOf(bool scalar_is_load_address, + AddressType *address_type) { return m_impl.GetAddressOf(scalar_is_load_address, address_type); } diff --git a/lldb/source/Core/ValueObjectConstResultImpl.cpp b/lldb/source/ValueObject/ValueObjectConstResultImpl.cpp similarity index 96% rename from lldb/source/Core/ValueObjectConstResultImpl.cpp rename to lldb/source/ValueObject/ValueObjectConstResultImpl.cpp index 2a7c907700765..d79f655b015a3 100644 --- a/lldb/source/Core/ValueObjectConstResultImpl.cpp +++ b/lldb/source/ValueObject/ValueObjectConstResultImpl.cpp @@ -6,13 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectConstResultImpl.h" +#include "lldb/ValueObject/ValueObjectConstResultImpl.h" #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" @@ -20,6 +16,10 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Scalar.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectConstResultCast.h" +#include "lldb/ValueObject/ValueObjectConstResultChild.h" #include @@ -36,8 +36,7 @@ using namespace lldb_private; ValueObjectConstResultImpl::ValueObjectConstResultImpl( ValueObject *valobj, lldb::addr_t live_address) : m_impl_backend(valobj), m_live_address(live_address), - m_live_address_type(eAddressTypeLoad), - m_address_of_backend() {} + m_live_address_type(eAddressTypeLoad), m_address_of_backend() {} lldb::ValueObjectSP ValueObjectConstResultImpl::Dereference(Status &error) { if (m_impl_backend == nullptr) diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp b/lldb/source/ValueObject/ValueObjectDynamicValue.cpp similarity index 99% rename from lldb/source/Core/ValueObjectDynamicValue.cpp rename to lldb/source/ValueObject/ValueObjectDynamicValue.cpp index 4001c89f7e0d1..dbf6d322996a9 100644 --- a/lldb/source/Core/ValueObjectDynamicValue.cpp +++ b/lldb/source/ValueObject/ValueObjectDynamicValue.cpp @@ -6,9 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectDynamicValue.h" +#include "lldb/ValueObject/ValueObjectDynamicValue.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/Type.h" #include "lldb/Target/ExecutionContext.h" @@ -20,6 +19,7 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-types.h" #include "llvm/BinaryFormat/Dwarf.h" @@ -247,7 +247,7 @@ bool ValueObjectDynamicValue::UpdateValue() { // If we don't have a dynamic type, set ourselves to be invalid and return // false. We used to try to produce a dynamic ValueObject that behaved "like" - // its parent, but that failed for ValueObjectConstResult, which is too + // its parent, but that failed for ValueObjectConstResult, which is too // complex a beast to try to emulate. If we return an invalid ValueObject, // clients will end up getting the static value instead, which behaves // correctly. diff --git a/lldb/source/Core/ValueObjectList.cpp b/lldb/source/ValueObject/ValueObjectList.cpp similarity index 97% rename from lldb/source/Core/ValueObjectList.cpp rename to lldb/source/ValueObject/ValueObjectList.cpp index 28907261f0a60..a79a040bdf7fd 100644 --- a/lldb/source/Core/ValueObjectList.cpp +++ b/lldb/source/ValueObject/ValueObjectList.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectList.h" +#include "lldb/ValueObject/ValueObjectList.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" #include diff --git a/lldb/source/Core/ValueObjectMemory.cpp b/lldb/source/ValueObject/ValueObjectMemory.cpp similarity index 98% rename from lldb/source/Core/ValueObjectMemory.cpp rename to lldb/source/ValueObject/ValueObjectMemory.cpp index ac8d42d4442f4..8bf15164bd59b 100644 --- a/lldb/source/Core/ValueObjectMemory.cpp +++ b/lldb/source/ValueObject/ValueObjectMemory.cpp @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectMemory.h" +#include "lldb/ValueObject/ValueObjectMemory.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/Type.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Target.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-types.h" #include "llvm/Support/ErrorHandling.h" diff --git a/lldb/source/Core/ValueObjectRegister.cpp b/lldb/source/ValueObject/ValueObjectRegister.cpp similarity index 99% rename from lldb/source/Core/ValueObjectRegister.cpp rename to lldb/source/ValueObject/ValueObjectRegister.cpp index 1d1ae23f6ce2c..805c921bfc9b8 100644 --- a/lldb/source/Core/ValueObjectRegister.cpp +++ b/lldb/source/ValueObject/ValueObjectRegister.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectRegister.h" +#include "lldb/ValueObject/ValueObjectRegister.h" #include "lldb/Core/Module.h" #include "lldb/Core/Value.h" diff --git a/lldb/source/Core/ValueObjectSyntheticFilter.cpp b/lldb/source/ValueObject/ValueObjectSyntheticFilter.cpp similarity index 98% rename from lldb/source/Core/ValueObjectSyntheticFilter.cpp rename to lldb/source/ValueObject/ValueObjectSyntheticFilter.cpp index 091b8f883b605..fbb329b0896de 100644 --- a/lldb/source/Core/ValueObjectSyntheticFilter.cpp +++ b/lldb/source/ValueObject/ValueObjectSyntheticFilter.cpp @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectSyntheticFilter.h" +#include "lldb/ValueObject/ValueObjectSyntheticFilter.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSynthetic.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/STLExtras.h" #include @@ -143,11 +143,9 @@ lldb::ValueType ValueObjectSynthetic::GetValueType() const { void ValueObjectSynthetic::CreateSynthFilter() { ValueObject *valobj_for_frontend = m_parent; - if (m_synth_sp->WantsDereference()) - { + if (m_synth_sp->WantsDereference()) { CompilerType type = m_parent->GetCompilerType(); - if (type.IsValid() && type.IsPointerOrReferenceType()) - { + if (type.IsValid() && type.IsPointerOrReferenceType()) { Status error; lldb::ValueObjectSP deref_sp = m_parent->Dereference(error); if (error.Success()) diff --git a/lldb/source/Core/ValueObjectUpdater.cpp b/lldb/source/ValueObject/ValueObjectUpdater.cpp similarity index 97% rename from lldb/source/Core/ValueObjectUpdater.cpp rename to lldb/source/ValueObject/ValueObjectUpdater.cpp index af7f976a6d272..9260ceae8aa7e 100644 --- a/lldb/source/Core/ValueObjectUpdater.cpp +++ b/lldb/source/ValueObject/ValueObjectUpdater.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectUpdater.h" +#include "lldb/ValueObject/ValueObjectUpdater.h" using namespace lldb_private; diff --git a/lldb/source/Core/ValueObjectVTable.cpp b/lldb/source/ValueObject/ValueObjectVTable.cpp similarity index 96% rename from lldb/source/Core/ValueObjectVTable.cpp rename to lldb/source/ValueObject/ValueObjectVTable.cpp index e38f0a83df994..7171154339f91 100644 --- a/lldb/source/Core/ValueObjectVTable.cpp +++ b/lldb/source/ValueObject/ValueObjectVTable.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectVTable.h" +#include "lldb/ValueObject/ValueObjectVTable.h" #include "lldb/Core/Module.h" -#include "lldb/Core/ValueObjectChild.h" #include "lldb/Symbol/Function.h" #include "lldb/Target/Language.h" #include "lldb/Target/LanguageRuntime.h" +#include "lldb/ValueObject/ValueObjectChild.h" #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" @@ -84,7 +84,6 @@ class ValueObjectVTableChild : public ValueObject { return false; } - // Set our value to be the load address of the function pointer in memory // and our type to be the function pointer type. m_value.SetValueType(Value::ValueType::LoadAddress); @@ -109,7 +108,7 @@ class ValueObjectVTableChild : public ValueObject { // the language from it correctly. ValueObject *val = parent->GetParent(); auto type_system = target_sp->GetScratchTypeSystemForLanguage( - val ? val->GetObjectRuntimeLanguage() : eLanguageTypeC_plus_plus); + val ? val->GetObjectRuntimeLanguage() : eLanguageTypeC_plus_plus); if (type_system) { m_value.SetCompilerType( (*type_system)->CreateGenericFunctionPrototype().GetPointerType()); @@ -124,7 +123,7 @@ class ValueObjectVTableChild : public ValueObject { if (m_error.Success()) { const bool thread_and_frame_only_if_stopped = true; ExecutionContext exe_ctx( - GetExecutionContextRef().Lock(thread_and_frame_only_if_stopped)); + GetExecutionContextRef().Lock(thread_and_frame_only_if_stopped)); m_error = m_value.GetValueAsData(&exe_ctx, m_data, GetModule().get()); } SetValueDidChange(true); @@ -255,7 +254,7 @@ bool ValueObjectVTable::UpdateValue() { m_value.SetValueType(Value::ValueType::LoadAddress); m_value.GetScalar() = parent->GetAddressOf(); auto type_system_or_err = - target_sp->GetScratchTypeSystemForLanguage(eLanguageTypeC_plus_plus); + target_sp->GetScratchTypeSystemForLanguage(eLanguageTypeC_plus_plus); if (type_system_or_err) { m_value.SetCompilerType( (*type_system_or_err)->GetBasicTypeFromAST(eBasicTypeUnsignedLong)); diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/ValueObject/ValueObjectVariable.cpp similarity index 98% rename from lldb/source/Core/ValueObjectVariable.cpp rename to lldb/source/ValueObject/ValueObjectVariable.cpp index 51a7615dffa02..33ec4373945d1 100644 --- a/lldb/source/Core/ValueObjectVariable.cpp +++ b/lldb/source/ValueObject/ValueObjectVariable.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/ValueObjectVariable.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/Core/Address.h" #include "lldb/Core/AddressRange.h" @@ -263,8 +263,7 @@ bool ValueObjectVariable::UpdateValue() { case Value::ValueType::Scalar: // The variable value is in the Scalar value inside the m_value. We can // point our m_data right to it. - m_error = - m_value.GetValueAsData(&exe_ctx, m_data, GetModule().get()); + m_error = m_value.GetValueAsData(&exe_ctx, m_data, GetModule().get()); break; case Value::ValueType::FileAddress: @@ -292,8 +291,7 @@ bool ValueObjectVariable::UpdateValue() { // extract read its value into m_data appropriately Value value(m_value); value.SetContext(Value::ContextType::Variable, variable); - m_error = - value.GetValueAsData(&exe_ctx, m_data, GetModule().get()); + m_error = value.GetValueAsData(&exe_ctx, m_data, GetModule().get()); SetValueDidChange(value_type != old_value.GetValueType() || m_value.GetScalar() != old_value.GetScalar()); @@ -365,8 +363,6 @@ void ValueObjectVariable::DoUpdateChildrenAddressType(ValueObject &valobj) { } } - - bool ValueObjectVariable::IsInScope() { const ExecutionContextRef &exe_ctx_ref = GetExecutionContextRef(); if (exe_ctx_ref.HasFrameRef()) { diff --git a/lldb/unittests/ValueObject/CMakeLists.txt b/lldb/unittests/ValueObject/CMakeLists.txt index fb31f76506286..8fcc8d62a7997 100644 --- a/lldb/unittests/ValueObject/CMakeLists.txt +++ b/lldb/unittests/ValueObject/CMakeLists.txt @@ -2,6 +2,7 @@ add_lldb_unittest(LLDBValueObjectTests DumpValueObjectOptionsTests.cpp LINK_LIBS + lldbValueObject lldbPluginPlatformLinux lldbPluginScriptInterpreterNone diff --git a/lldb/unittests/ValueObject/DumpValueObjectOptionsTests.cpp b/lldb/unittests/ValueObject/DumpValueObjectOptionsTests.cpp index 950e981a3f5a4..c3fb8cbeb60ae 100644 --- a/lldb/unittests/ValueObject/DumpValueObjectOptionsTests.cpp +++ b/lldb/unittests/ValueObject/DumpValueObjectOptionsTests.cpp @@ -12,9 +12,9 @@ #include "TestingSupport/SubsystemRAII.h" #include "TestingSupport/Symbol/ClangTestUtils.h" #include "lldb/Core/Debugger.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/DumpValueObjectOptions.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "gtest/gtest.h" From fa4e2c10e3f723dbcb87a0065d32442461415e15 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Fri, 1 Nov 2024 10:39:43 -0700 Subject: [PATCH 2/2] [lldb] Update Swift plugins for ValueObject move --- .../ExpressionParser/Swift/SwiftExpressionParser.cpp | 2 +- .../ExpressionParser/Swift/SwiftExpressionVariable.cpp | 2 +- lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp | 2 +- .../ExpressionParser/Swift/SwiftREPLMaterializer.cpp | 2 +- .../Plugins/Language/Swift/FoundationValueTypes.cpp | 2 +- lldb/source/Plugins/Language/Swift/SwiftArray.cpp | 2 +- lldb/source/Plugins/Language/Swift/SwiftBasicTypes.cpp | 2 +- lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp | 2 +- .../Plugins/Language/Swift/SwiftHashedContainer.cpp | 2 +- lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp | 4 ++-- lldb/source/Plugins/Language/Swift/SwiftOptionSet.cpp | 2 +- lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.h | 2 +- .../LanguageRuntime/Swift/SwiftLanguageRuntime.cpp | 8 ++++---- .../Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp index f8239f7802a22..070ac70438aad 100644 --- a/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp +++ b/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp @@ -25,7 +25,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/ModuleList.h" #include "lldb/Core/ModuleSpec.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/Expression.h" #include "lldb/Expression/IRExecutionUnit.h" @@ -42,6 +41,7 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/Stream.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm-c/Analysis.h" #include "llvm/ADT/ArrayRef.h" diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionVariable.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionVariable.cpp index 159d8d4c09f70..7be552e2281b9 100644 --- a/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionVariable.cpp +++ b/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionVariable.cpp @@ -13,12 +13,12 @@ #include "SwiftExpressionVariable.h" #include "lldb/Core/Value.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "clang/AST/ASTContext.h" using namespace lldb_private; diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp index 8071e81953124..78826b48a974b 100644 --- a/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp +++ b/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp @@ -18,7 +18,6 @@ #include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/ValueObjectPrinter.h" #include "lldb/Host/HostInfo.h" @@ -31,6 +30,7 @@ #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/AnsiTerminal.h" +#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/ScopeExit.h" #include "llvm/Support/raw_ostream.h" diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPLMaterializer.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPLMaterializer.cpp index a49f3343039cc..18c27607cac9e 100644 --- a/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPLMaterializer.cpp +++ b/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPLMaterializer.cpp @@ -16,11 +16,11 @@ #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h" #include "lldb/Core/DumpDataExtractor.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Expression/IRExecutionUnit.h" #include "lldb/Expression/IRMemoryMap.h" #include "lldb/Target/Target.h" #include "lldb/Utility/Log.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "swift/Demangling/Demangle.h" diff --git a/lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp b/lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp index cb72b4799bd38..461492a82206c 100644 --- a/lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp +++ b/lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp @@ -18,12 +18,12 @@ #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h" #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Status.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-enumerations.h" using namespace lldb; diff --git a/lldb/source/Plugins/Language/Swift/SwiftArray.cpp b/lldb/source/Plugins/Language/Swift/SwiftArray.cpp index abeabc0356f1b..b6562a9481875 100644 --- a/lldb/source/Plugins/Language/Swift/SwiftArray.cpp +++ b/lldb/source/Plugins/Language/Swift/SwiftArray.cpp @@ -15,10 +15,10 @@ #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" // FIXME: we should not need this #include "Plugins/Language/ObjC/Cocoa.h" diff --git a/lldb/source/Plugins/Language/Swift/SwiftBasicTypes.cpp b/lldb/source/Plugins/Language/Swift/SwiftBasicTypes.cpp index 1ebe7fda1979b..a405cdfd6388b 100644 --- a/lldb/source/Plugins/Language/Swift/SwiftBasicTypes.cpp +++ b/lldb/source/Plugins/Language/Swift/SwiftBasicTypes.cpp @@ -12,7 +12,7 @@ #include "SwiftBasicTypes.h" -#include "lldb/Core/ValueObject.h" +#include "lldb/ValueObject/ValueObject.h" using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp b/lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp index a310a6a890a8e..5626651d67b7b 100644 --- a/lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp +++ b/lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp @@ -15,7 +15,6 @@ #include "Plugins/LanguageRuntime/Swift/ReflectionContextInterface.h" #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" -#include "lldb/Core/ValueObject.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/StringPrinter.h" #include "lldb/Target/Process.h" @@ -25,6 +24,7 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObject.h" #include "lldb/lldb-enumerations.h" #include "swift/AST/Types.h" #include "swift/Demangling/ManglingMacros.h" diff --git a/lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp b/lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp index 0052ceae47222..b89d3d559ba38 100644 --- a/lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp +++ b/lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp @@ -16,10 +16,10 @@ #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "Plugins/TypeSystem/Swift/TypeSystemSwift.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/Target/Process.h" #include "lldb/Utility/DataBufferHeap.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "Plugins/Language/ObjC/NSDictionary.h" #include "lldb/lldb-enumerations.h" diff --git a/lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp b/lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp index 5c238bb94ca4c..ddf574756fd55 100644 --- a/lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp +++ b/lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp @@ -15,9 +15,9 @@ #include "SwiftUnsafeTypes.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/PluginManager.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/Utility/ConstString.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/DataFormatters/DataVisualization.h" #include "lldb/DataFormatters/FormattersHelpers.h" diff --git a/lldb/source/Plugins/Language/Swift/SwiftOptionSet.cpp b/lldb/source/Plugins/Language/Swift/SwiftOptionSet.cpp index cb4b74edf5512..c68e0c3c08e65 100644 --- a/lldb/source/Plugins/Language/Swift/SwiftOptionSet.cpp +++ b/lldb/source/Plugins/Language/Swift/SwiftOptionSet.cpp @@ -14,11 +14,11 @@ #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "Plugins/TypeSystem/Swift/SwiftASTContext.h" -#include "lldb/Core/ValueObject.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/StreamString.h" +#include "lldb/ValueObject/ValueObject.h" #include "clang/AST/Decl.h" #include "llvm/ADT/StringRef.h" diff --git a/lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.h b/lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.h index 214585c671498..50c5d2211dd85 100644 --- a/lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.h +++ b/lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.h @@ -13,8 +13,8 @@ #ifndef liblldb_SwiftUnsafeTypes_h_ #define liblldb_SwiftUnsafeTypes_h_ -#include "lldb/Core/ValueObject.h" #include "lldb/Utility/Stream.h" +#include "lldb/ValueObject/ValueObject.h" namespace lldb_private { namespace formatters { diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp index cd57ef0870776..2f7efc0300647 100644 --- a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp @@ -26,10 +26,6 @@ #include "lldb/Core/PluginManager.h" #include "lldb/Core/Progress.h" #include "lldb/Core/Section.h" -#include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectCast.h" -#include "lldb/Core/ValueObjectConstResult.h" -#include "lldb/Core/ValueObjectVariable.h" #include "lldb/DataFormatters/StringPrinter.h" #include "lldb/Host/OptionParser.h" #include "lldb/Host/SafeMachO.h" @@ -47,6 +43,10 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/OptionParsing.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectCast.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" +#include "lldb/ValueObject/ValueObjectVariable.h" #include "lldb/lldb-enumerations.h" #include "swift/AST/ASTMangler.h" diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp index 58fb90cd4bcf2..32f18702fcd5c 100644 --- a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp +++ b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp @@ -20,7 +20,6 @@ #include "Plugins/Language/Swift/LogChannelSwift.h" #include "Plugins/TypeSystem/Clang/TypeSystemClang.h" #include "Plugins/TypeSystem/Swift/SwiftDemangle.h" -#include "lldb/Core/ValueObjectMemory.h" #include "lldb/Host/SafeMachO.h" #include "lldb/Symbol/Variable.h" #include "lldb/Symbol/VariableList.h" @@ -30,6 +29,7 @@ #include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Timer.h" +#include "lldb/ValueObject/ValueObjectMemory.h" #include "llvm/ADT/STLExtras.h" #include "swift/AST/ASTContext.h"