Skip to content

Commit 7f6f46c

Browse files
committed
[lldb] Move ValueObject into its own library (NFC) (llvm#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 b852fb1)
1 parent ca37942 commit 7f6f46c

File tree

195 files changed

+417
-381
lines changed

Some content is hidden

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

195 files changed

+417
-381
lines changed

lldb/include/lldb/Core/IOHandler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#ifndef LLDB_CORE_IOHANDLER_H
1010
#define LLDB_CORE_IOHANDLER_H
1111

12-
#include "lldb/Core/ValueObjectList.h"
1312
#include "lldb/Host/Config.h"
1413
#include "lldb/Utility/CompletionRequest.h"
1514
#include "lldb/Utility/Flags.h"

lldb/include/lldb/DataFormatters/FormattersContainer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
#include "lldb/lldb-public.h"
1919

20-
#include "lldb/Core/ValueObject.h"
2120
#include "lldb/DataFormatters/FormatClasses.h"
2221
#include "lldb/DataFormatters/TypeFormat.h"
2322
#include "lldb/DataFormatters/TypeSummary.h"
2423
#include "lldb/DataFormatters/TypeSynthetic.h"
2524
#include "lldb/Symbol/CompilerType.h"
2625
#include "lldb/Utility/RegularExpression.h"
2726
#include "lldb/Utility/StringLexer.h"
27+
#include "lldb/ValueObject/ValueObject.h"
2828

2929
namespace lldb_private {
3030

lldb/include/lldb/DataFormatters/TypeFormat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "lldb/lldb-enumerations.h"
1919
#include "lldb/lldb-public.h"
2020

21-
#include "lldb/Core/ValueObject.h"
21+
#include "lldb/ValueObject/ValueObject.h"
2222

2323
namespace lldb_private {
2424
class TypeFormatImpl {

lldb/include/lldb/DataFormatters/TypeSynthetic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "lldb/lldb-enumerations.h"
2121
#include "lldb/lldb-public.h"
2222

23-
#include "lldb/Core/ValueObject.h"
2423
#include "lldb/Utility/StructuredData.h"
24+
#include "lldb/ValueObject/ValueObject.h"
2525

2626
namespace lldb_private {
2727
class SyntheticChildrenFrontEnd {

lldb/include/lldb/Expression/ExpressionVariable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
#include "llvm/ADT/DenseMap.h"
1717

18-
#include "lldb/Core/ValueObject.h"
1918
#include "lldb/Utility/ConstString.h"
19+
#include "lldb/ValueObject/ValueObject.h"
2020
#include "lldb/lldb-public.h"
2121
#include "llvm/Support/ExtensibleRTTI.h"
2222

lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h

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

12-
#include "lldb/Core/ValueObject.h"
1312
#include "lldb/Interpreter/Options.h"
13+
#include "lldb/ValueObject/ValueObject.h"
1414

1515
namespace lldb_private {
1616

lldb/include/lldb/Target/LanguageRuntime.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#include "lldb/Core/PluginInterface.h"
1616
#include "lldb/Core/StructuredDataImpl.h"
1717
#include "lldb/Core/Value.h"
18-
#include "lldb/Core/ValueObject.h"
1918
#include "lldb/Expression/LLVMUserExpression.h"
2019
#include "lldb/Symbol/DeclVendor.h"
2120
#include "lldb/Target/ExecutionContextScope.h"
2221
#include "lldb/Target/Runtime.h"
22+
#include "lldb/ValueObject/ValueObject.h"
2323
#include "lldb/lldb-private.h"
2424
#include "lldb/lldb-public.h"
2525
#include <optional>

lldb/include/lldb/Target/StackFrame.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
#include "lldb/Utility/Flags.h"
1717

1818
#include "lldb/Core/FormatEntity.h"
19-
#include "lldb/Core/ValueObjectList.h"
2019
#include "lldb/Symbol/SymbolContext.h"
2120
#include "lldb/Target/ExecutionContextScope.h"
2221
#include "lldb/Target/StackID.h"
2322
#include "lldb/Utility/Scalar.h"
2423
#include "lldb/Utility/Status.h"
2524
#include "lldb/Utility/StreamString.h"
2625
#include "lldb/Utility/UserID.h"
26+
#include "lldb/ValueObject/ValueObjectList.h"
2727

2828
namespace lldb_private {
2929

lldb/include/lldb/Target/StackFrameRecognizer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
#ifndef LLDB_TARGET_STACKFRAMERECOGNIZER_H
1010
#define LLDB_TARGET_STACKFRAMERECOGNIZER_H
1111

12-
#include "lldb/Core/ValueObject.h"
13-
#include "lldb/Core/ValueObjectList.h"
1412
#include "lldb/Symbol/VariableList.h"
1513
#include "lldb/Target/StopInfo.h"
1614
#include "lldb/Utility/StructuredData.h"
15+
#include "lldb/ValueObject/ValueObject.h"
16+
#include "lldb/ValueObject/ValueObjectList.h"
1717
#include "lldb/lldb-private-forward.h"
1818
#include "lldb/lldb-public.h"
1919

lldb/include/lldb/Core/ValueObject.h renamed to lldb/include/lldb/ValueObject/ValueObject.h

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

9-
#ifndef LLDB_CORE_VALUEOBJECT_H
10-
#define LLDB_CORE_VALUEOBJECT_H
9+
#ifndef LLDB_VALUEOBJECT_VALUEOBJECT_H
10+
#define LLDB_VALUEOBJECT_VALUEOBJECT_H
1111

1212
#include "lldb/Core/SwiftScratchContextReader.h"
1313
#include "lldb/Core/Value.h"
@@ -1088,7 +1088,7 @@ class ValueObject {
10881088
void SetPreferredDisplayLanguageIfNeeded(lldb::LanguageType);
10891089

10901090
protected:
1091-
virtual void DoUpdateChildrenAddressType(ValueObject &valobj){};
1091+
virtual void DoUpdateChildrenAddressType(ValueObject &valobj) {};
10921092

10931093
private:
10941094
virtual CompilerType MaybeCalculateCompleteType();
@@ -1109,4 +1109,4 @@ class ValueObject {
11091109

11101110
} // namespace lldb_private
11111111

1112-
#endif // LLDB_CORE_VALUEOBJECT_H
1112+
#endif // LLDB_VALUEOBJECT_VALUEOBJECT_H

0 commit comments

Comments
 (0)