Skip to content

Commit 1b8669a

Browse files
committed
Use llvm::joinErrors
1 parent 1e71640 commit 1b8669a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

lldb/source/Expression/DWARFExpression.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -902,10 +902,12 @@ static llvm::Error Evaluate_DW_OP_deref(DWARFExpression::Stack &stack,
902902
lldb::addr_t pointer_value =
903903
process->ReadPointerFromMemory(pointer_addr, error);
904904
if (pointer_value == LLDB_INVALID_ADDRESS)
905-
return llvm::createStringError(
906-
"Failed to dereference pointer from 0x%" PRIx64
907-
" for DW_OP_deref: %s\n",
908-
pointer_addr, error.AsCString());
905+
return llvm::joinErrors(
906+
llvm::createStringError(
907+
"Failed to dereference pointer from 0x%" PRIx64
908+
" for DW_OP_deref",
909+
pointer_addr),
910+
error.takeError());
909911
if (ABISP abi_sp = process->GetABI())
910912
pointer_value = abi_sp->FixCodeAddress(pointer_value);
911913
stack.back().GetScalar() = pointer_value;

0 commit comments

Comments
 (0)