Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lldb/source/Expression/DWARFExpression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,9 @@ static llvm::Error Evaluate_DW_OP_convert(EvalContext &eval_ctx,
if (!bit_size)
return llvm::createStringError("unspecified architecture");
} else {
if (!eval_ctx.dwarf_cu)
return llvm::createStringError(
"DW_OP_convert with a DIE offset requires a DWARF unit");
auto bit_size_sign_or_err =
eval_ctx.dwarf_cu->GetDIEBitSizeAndSign(relative_die_offset);
if (!bit_size_sign_or_err)
Expand Down
13 changes: 13 additions & 0 deletions lldb/unittests/Expression/DWARFExpressionTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,19 @@ TEST(DWARFExpression, DW_OP_convert) {
EXPECT_THAT_ERROR(
t.Eval({DW_OP_const1s, 'X', DW_OP_convert, 0x1d}).takeError(),
llvm::Failed());

// A non-zero DIE offset with no DWARF unit.
EXPECT_THAT_ERROR(
Evaluate({DW_OP_const1s, 'X', DW_OP_convert, 0x01}, nullptr, nullptr)
.takeError(),
llvm::FailedWithMessage(
"DW_OP_convert with a DIE offset requires a DWARF unit"));

// DW_OP_convert with an empty stack.
EXPECT_THAT_ERROR(
Evaluate({DW_OP_convert, 0x00}, nullptr, nullptr).takeError(),
llvm::FailedWithMessage("DW_OP_convert needs at least 1 stack entries "
"(stack has 0 entries)"));
}

TEST(DWARFExpression, DW_OP_stack_value) {
Expand Down