Skip to content

Commit af9f94e

Browse files
committed
Change ArrayToPointerConversion arg to ValueObject&
1 parent 482b6a7 commit af9f94e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lldb/source/ValueObject/DILEval.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ static CompilerType GetBasicType(lldb::TypeSystemSP type_system,
4343
}
4444

4545
static lldb::ValueObjectSP
46-
ArrayToPointerConversion(lldb::ValueObjectSP valobj,
46+
ArrayToPointerConversion(ValueObject &valobj,
4747
std::shared_ptr<ExecutionContextScope> ctx) {
48-
uint64_t addr = valobj->GetLoadAddress();
48+
uint64_t addr = valobj.GetLoadAddress();
4949
ExecutionContext exe_ctx;
5050
ctx->CalculateExecutionContext(exe_ctx);
5151
return ValueObject::CreateValueObjectFromAddress(
5252
"result", addr, exe_ctx,
53-
valobj->GetCompilerType().GetArrayElementType(ctx.get()).GetPointerType(),
53+
valobj.GetCompilerType().GetArrayElementType(ctx.get()).GetPointerType(),
5454
/* do_deref */ false);
5555
}
5656

@@ -62,8 +62,8 @@ Interpreter::UnaryConversion(lldb::ValueObjectSP valobj) {
6262
GetTypeSystemFromCU(m_exe_ctx_scope);
6363
if (!type_system)
6464
return type_system.takeError();
65+
6566
CompilerType in_type = valobj->GetCompilerType();
66-
CompilerType result_type;
6767
if (valobj->IsBitfield()) {
6868
// Promote bitfields. If `int` can represent the bitfield value, it is
6969
// converted to `int`. Otherwise, if `unsigned int` can represent it, it
@@ -100,7 +100,7 @@ Interpreter::UnaryConversion(lldb::ValueObjectSP valobj) {
100100
}
101101

102102
if (in_type.IsArrayType())
103-
valobj = ArrayToPointerConversion(valobj, m_exe_ctx_scope);
103+
valobj = ArrayToPointerConversion(*valobj, m_exe_ctx_scope);
104104

105105
if (valobj->GetCompilerType().IsInteger() ||
106106
valobj->GetCompilerType().IsUnscopedEnumerationType()) {

0 commit comments

Comments
 (0)