Skip to content

Commit 83ea851

Browse files
JDevlieghereJDevlieghere
committed
Store SBValueList instead of SBValue
1 parent 6f59b11 commit 83ea851

File tree

12 files changed

+70
-43
lines changed

12 files changed

+70
-43
lines changed

‎lldb/include/lldb/API/SBCommandReturnObject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class LLDB_API SBCommandReturnObject {
136136

137137
void SetError(const char *error_cstr);
138138

139-
lldb::SBValue GetReturnValue(lldb::DynamicValueType use_dynamic);
139+
lldb::SBValueList GetValues(lldb::DynamicValueType use_dynamic);
140140

141141
protected:
142142
friend class SBCommandInterpreter;

‎lldb/include/lldb/Interpreter/CommandReturnObject.h‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "lldb/Utility/StreamString.h"
1515
#include "lldb/Utility/StreamTee.h"
1616
#include "lldb/Utility/StructuredData.h"
17+
#include "lldb/ValueObject/ValueObjectList.h"
1718
#include "lldb/lldb-private.h"
1819

1920
#include "llvm/ADT/StringRef.h"
@@ -134,7 +135,7 @@ class CommandReturnObject {
134135
__attribute__((format(printf, 2, 3)));
135136

136137
template <typename... Args>
137-
void AppendMessageWithFormatv(const char *format, Args &&... args) {
138+
void AppendMessageWithFormatv(const char *format, Args &&...args) {
138139
AppendMessage(llvm::formatv(format, std::forward<Args>(args)...).str());
139140
}
140141

@@ -144,12 +145,12 @@ class CommandReturnObject {
144145
}
145146

146147
template <typename... Args>
147-
void AppendWarningWithFormatv(const char *format, Args &&... args) {
148+
void AppendWarningWithFormatv(const char *format, Args &&...args) {
148149
AppendWarning(llvm::formatv(format, std::forward<Args>(args)...).str());
149150
}
150151

151152
template <typename... Args>
152-
void AppendErrorWithFormatv(const char *format, Args &&... args) {
153+
void AppendErrorWithFormatv(const char *format, Args &&...args) {
153154
AppendError(llvm::formatv(format, std::forward<Args>(args)...).str());
154155
}
155156

@@ -165,11 +166,9 @@ class CommandReturnObject {
165166
return m_diagnostic_indent;
166167
}
167168

168-
lldb::ValueObjectSP GetValueObjectSP() const { return m_value_object_sp; }
169+
const ValueObjectList &GetValueObjectList() const { return m_value_objects; }
169170

170-
void SetValueObjectSP(lldb::ValueObjectSP value_object_sp) {
171-
m_value_object_sp = value_object_sp;
172-
}
171+
ValueObjectList &GetValueObjectList() { return m_value_objects; }
173172

174173
lldb::ReturnStatus GetStatus() const;
175174

@@ -203,8 +202,8 @@ class CommandReturnObject {
203202

204203
lldb::ReturnStatus m_status = lldb::eReturnStatusStarted;
205204

206-
/// An optional return ValueObjectSP.
207-
lldb::ValueObjectSP m_value_object_sp;
205+
/// An optionally empty list of values produced by this command.
206+
ValueObjectList m_value_objects;
208207

209208
bool m_did_change_process_state = false;
210209
bool m_suppress_immediate_output = false;

‎lldb/include/lldb/ValueObject/ValueObjectList.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ class ValueObject;
2222
/// A collection of ValueObject values that.
2323
class ValueObjectList {
2424
public:
25-
const ValueObjectList &operator=(const ValueObjectList &rhs);
26-
2725
void Append(const lldb::ValueObjectSP &val_obj_sp);
2826

2927
void Append(const ValueObjectList &valobj_list);

‎lldb/source/API/SBCommandReturnObject.cpp‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
#include "lldb/API/SBStream.h"
1414
#include "lldb/API/SBStructuredData.h"
1515
#include "lldb/API/SBValue.h"
16+
#include "lldb/API/SBValueList.h"
1617
#include "lldb/Core/StructuredDataImpl.h"
1718
#include "lldb/Interpreter/CommandReturnObject.h"
1819
#include "lldb/Utility/ConstString.h"
1920
#include "lldb/Utility/Instrumentation.h"
2021
#include "lldb/Utility/Status.h"
22+
#include "lldb/lldb-forward.h"
2123

2224
using namespace lldb;
2325
using namespace lldb_private;
@@ -358,11 +360,17 @@ void SBCommandReturnObject::SetError(const char *error_cstr) {
358360
ref().AppendError(error_cstr);
359361
}
360362

361-
SBValue
362-
SBCommandReturnObject::GetReturnValue(lldb::DynamicValueType use_dynamic) {
363+
SBValueList
364+
SBCommandReturnObject::GetValues(lldb::DynamicValueType use_dynamic) {
363365
LLDB_INSTRUMENT_VA(this, use_dynamic);
364366

365-
SBValue sb_value;
366-
sb_value.SetSP(ref().GetValueObjectSP(), use_dynamic);
367-
return sb_value;
367+
SBValueList value_list;
368+
for (ValueObjectSP value_object_sp :
369+
ref().GetValueObjectList().GetObjects()) {
370+
SBValue value_sb;
371+
value_sb.SetSP(value_object_sp, use_dynamic);
372+
value_list.Append(value_sb);
373+
}
374+
375+
return value_list;
368376
}

‎lldb/source/Commands/CommandObjectDWIMPrint.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
206206
expr, exe_scope, valobj_sp, eval_options, &fixed_expression);
207207

208208
if (valobj_sp)
209-
result.SetValueObjectSP(valobj_sp);
209+
result.GetValueObjectList().Append(valobj_sp);
210210

211211
// Record the position of the expression in the command.
212212
std::optional<uint16_t> indent;

‎lldb/source/Commands/CommandObjectExpression.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ bool CommandObjectExpression::EvaluateExpression(llvm::StringRef expr,
434434
}
435435

436436
if (result_valobj_sp) {
437-
result.SetValueObjectSP(result_valobj_sp);
437+
result.GetValueObjectList().Append(result_valobj_sp);
438438

439439
Format format = m_format_options.GetFormat();
440440

‎lldb/source/Commands/CommandObjectFrame.cpp‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class CommandObjectFrameDiagnose : public CommandObjectParsed {
152152
return;
153153
}
154154

155-
result.SetValueObjectSP(valobj_sp);
155+
result.GetValueObjectList().Append(valobj_sp);
156156
DumpValueObjectOptions::DeclPrintingHelper helper =
157157
[&valobj_sp](ConstString type, ConstString var,
158158
const DumpValueObjectOptions &opts,
@@ -318,10 +318,10 @@ class CommandObjectFrameSelect : public CommandObjectParsed {
318318
} else if (*m_options.relative_frame_offset > 0) {
319319
// I don't want "up 20" where "20" takes you past the top of the stack
320320
// to produce an error, but rather to just go to the top. OTOH, start
321-
// by seeing if the requested frame exists, in which case we can avoid
321+
// by seeing if the requested frame exists, in which case we can avoid
322322
// counting the stack here...
323-
const uint32_t frame_requested = frame_idx
324-
+ *m_options.relative_frame_offset;
323+
const uint32_t frame_requested =
324+
frame_idx + *m_options.relative_frame_offset;
325325
StackFrameSP frame_sp = thread->GetStackFrameAtIndex(frame_requested);
326326
if (frame_sp)
327327
frame_idx = frame_requested;
@@ -516,8 +516,8 @@ may even involve JITing and running code in the target program.)");
516516

517517
if (error.Fail() && (!variable_list || variable_list->GetSize() == 0)) {
518518
result.AppendError(error.AsCString());
519-
520519
}
520+
521521
ValueObjectSP valobj_sp;
522522

523523
TypeSummaryImplSP summary_format_sp;
@@ -565,6 +565,8 @@ may even involve JITing and running code in the target program.)");
565565
valobj_sp = frame->GetValueObjectForFrameVariable(
566566
var_sp, m_varobj_options.use_dynamic);
567567
if (valobj_sp) {
568+
result.GetValueObjectList().Append(valobj_sp);
569+
568570
std::string scope_string;
569571
if (m_option_variable.show_scope)
570572
scope_string = GetScopeString(var_sp).str();
@@ -605,6 +607,8 @@ may even involve JITing and running code in the target program.)");
605607
entry.ref(), m_varobj_options.use_dynamic, expr_path_options,
606608
var_sp, error);
607609
if (valobj_sp) {
610+
result.GetValueObjectList().Append(valobj_sp);
611+
608612
std::string scope_string;
609613
if (m_option_variable.show_scope)
610614
scope_string = GetScopeString(var_sp).str();
@@ -654,6 +658,8 @@ may even involve JITing and running code in the target program.)");
654658
valobj_sp = frame->GetValueObjectForFrameVariable(
655659
var_sp, m_varobj_options.use_dynamic);
656660
if (valobj_sp) {
661+
result.GetValueObjectList().Append(valobj_sp);
662+
657663
// When dumping all variables, don't print any variables that are
658664
// not in scope to avoid extra unneeded output
659665
if (valobj_sp->IsInScope()) {
@@ -695,6 +701,7 @@ may even involve JITing and running code in the target program.)");
695701
recognized_frame->GetRecognizedArguments();
696702
if (recognized_arg_list) {
697703
for (auto &rec_value_sp : recognized_arg_list->GetObjects()) {
704+
result.GetValueObjectList().Append(rec_value_sp);
698705
options.SetFormat(m_option_format.GetFormat());
699706
options.SetVariableFormatDisplayLanguage(
700707
rec_value_sp->GetPreferredDisplayLanguage());

‎lldb/source/Commands/CommandObjectTarget.cpp‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,9 @@ class CommandObjectTargetVariable : public CommandObjectParsed {
803803
protected:
804804
void DumpGlobalVariableList(const ExecutionContext &exe_ctx,
805805
const SymbolContext &sc,
806-
const VariableList &variable_list, Stream &s) {
806+
const VariableList &variable_list,
807+
CommandReturnObject &result) {
808+
Stream &s = result.GetOutputStream();
807809
if (variable_list.Empty())
808810
return;
809811
if (sc.module_sp) {
@@ -824,15 +826,16 @@ class CommandObjectTargetVariable : public CommandObjectParsed {
824826
ValueObjectSP valobj_sp(ValueObjectVariable::Create(
825827
exe_ctx.GetBestExecutionContextScope(), var_sp));
826828

827-
if (valobj_sp)
829+
if (valobj_sp) {
830+
result.GetValueObjectList().Append(valobj_sp);
828831
DumpValueObject(s, var_sp, valobj_sp, var_sp->GetName().GetCString());
832+
}
829833
}
830834
}
831835

832836
void DoExecute(Args &args, CommandReturnObject &result) override {
833837
Target *target = m_exe_ctx.GetTargetPtr();
834838
const size_t argc = args.GetArgumentCount();
835-
Stream &s = result.GetOutputStream();
836839

837840
if (argc > 0) {
838841
for (const Args::ArgEntry &arg : args) {
@@ -874,7 +877,7 @@ class CommandObjectTargetVariable : public CommandObjectParsed {
874877
m_exe_ctx.GetBestExecutionContextScope(), var_sp);
875878

876879
if (valobj_sp)
877-
DumpValueObject(s, var_sp, valobj_sp,
880+
DumpValueObject(result.GetOutputStream(), var_sp, valobj_sp,
878881
use_var_name ? var_sp->GetName().GetCString()
879882
: arg.c_str());
880883
}
@@ -903,7 +906,8 @@ class CommandObjectTargetVariable : public CommandObjectParsed {
903906
if (comp_unit_varlist_sp) {
904907
size_t count = comp_unit_varlist_sp->GetSize();
905908
if (count > 0) {
906-
DumpGlobalVariableList(m_exe_ctx, sc, *comp_unit_varlist_sp, s);
909+
DumpGlobalVariableList(m_exe_ctx, sc, *comp_unit_varlist_sp,
910+
result);
907911
success = true;
908912
}
909913
}
@@ -964,15 +968,16 @@ class CommandObjectTargetVariable : public CommandObjectParsed {
964968
VariableListSP comp_unit_varlist_sp(
965969
sc.comp_unit->GetVariableList(can_create));
966970
if (comp_unit_varlist_sp)
967-
DumpGlobalVariableList(m_exe_ctx, sc, *comp_unit_varlist_sp, s);
971+
DumpGlobalVariableList(m_exe_ctx, sc, *comp_unit_varlist_sp,
972+
result);
968973
} else if (sc.module_sp) {
969974
// Get all global variables for this module
970975
lldb_private::RegularExpression all_globals_regex(
971976
llvm::StringRef(".")); // Any global with at least one character
972977
VariableList variable_list;
973978
sc.module_sp->FindGlobalVariables(all_globals_regex, UINT32_MAX,
974979
variable_list);
975-
DumpGlobalVariableList(m_exe_ctx, sc, variable_list, s);
980+
DumpGlobalVariableList(m_exe_ctx, sc, variable_list, result);
976981
}
977982
}
978983
}

‎lldb/source/ValueObject/ValueObjectList.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
using namespace lldb;
1717
using namespace lldb_private;
1818

19-
const ValueObjectList &ValueObjectList::operator=(const ValueObjectList &rhs) {
20-
if (this != &rhs)
21-
m_value_objects = rhs.m_value_objects;
22-
return *this;
23-
}
24-
2519
void ValueObjectList::Append(const ValueObjectSP &val_obj_sp) {
2620
m_value_objects.push_back(val_obj_sp);
2721
}

‎lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ def test_get_command(self):
3434
self.assertTrue(res.Succeeded())
3535
self.assertEqual(res.GetCommand(), "help help")
3636

37-
value = res.GetReturnValue(lldb.eNoDynamicValues)
38-
self.assertFalse(value)
37+
value_list = res.GetValues(lldb.eNoDynamicValues)
38+
self.assertEqual(value_list.GetSize(), 0)
3939

4040
def test_get_value(self):
4141
res = lldb.SBCommandReturnObject()
4242
ci = self.dbg.GetCommandInterpreter()
4343
ci.HandleCommand("p 1 + 1", res)
4444
self.assertTrue(res.Succeeded())
4545

46-
value = res.GetReturnValue(lldb.eNoDynamicValues)
47-
self.assertTrue(value)
48-
self.assertEqual(value.GetValue(), "2")
46+
value_list = res.GetValues(lldb.eNoDynamicValues)
47+
self.assertEqual(value_list.GetSize(), 1)
48+
self.assertEqual(value_list.GetValueAtIndex(0).GetValue(), "2")

0 commit comments

Comments
 (0)