Summary: Include the offset at which this happened.
Reviewers: dblaikie, jhenderson
Subscribers: hiraditya, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D75265
using namespace llvm;
-static void unexpectedEndReached(Error *E) {
+static void unexpectedEndReached(Error *E, uint64_t Offset) {
if (E)
*E = createStringError(errc::illegal_byte_sequence,
- "unexpected end of data");
+ "unexpected end of data at offset 0x%" PRIx64,
+ Offset);
}
static bool isError(Error *E) { return E && *E; }
uint64_t offset = *offset_ptr;
if (!de->isValidOffsetForDataOfSize(offset, sizeof(T))) {
- unexpectedEndReached(Err);
+ unexpectedEndReached(Err, offset);
return val;
}
std::memcpy(&val, &Data[offset], sizeof(val));
uint64_t offset = *offset_ptr;
if (!de->isValidOffsetForDataOfSize(offset, sizeof(*dst) * count)) {
- unexpectedEndReached(Err);
+ unexpectedEndReached(Err, offset);
return nullptr;
}
for (T *value_ptr = dst, *end = dst + count; value_ptr != end;
if (isValidOffsetForDataOfSize(C.Offset, Length))
C.Offset += Length;
else
- unexpectedEndReached(&C.Err);
+ unexpectedEndReached(&C.Err, C.Offset);
}
# CHECK: DW_AT_name ("x1")
# CHECK-NEXT: DW_AT_location (0xdeadbeef
-# CHECK-NEXT: error: unexpected end of data)
+# CHECK-NEXT: error: unexpected end of data at offset 0xdeadbeef)
# CHECK: DW_AT_name ("x2")
# CHECK-NEXT: DW_AT_location (0x00000036
-# CHECK-NEXT: error: unexpected end of data)
+# CHECK-NEXT: error: unexpected end of data at offset 0x48)
.type f,@function
# CHECK: DW_AT_name ("x1")
# CHECK-NEXT: DW_AT_location (0xdeadbeef
-# CHECK-NEXT: error: unexpected end of data)
+# CHECK-NEXT: error: unexpected end of data at offset 0xdeadbeef)
# CHECK: DW_AT_name ("x2")
# CHECK-NEXT: DW_AT_location (0x00000025
-# CHECK-NEXT: error: unexpected end of data)
+# CHECK-NEXT: error: unexpected end of data at offset 0x34)
.type f,@function
auto ErrorResult = std::make_tuple(0, dwarf::DWARF32, 0);
// Empty data.
- EXPECT_THAT_EXPECTED(GetWithError({}),
- FailedWithMessage("unexpected end of data"));
+ EXPECT_THAT_EXPECTED(
+ GetWithError({}),
+ FailedWithMessage("unexpected end of data at offset 0x0"));
EXPECT_EQ(GetWithoutError({}), ErrorResult);
// Not long enough for the U32 field.
- EXPECT_THAT_EXPECTED(GetWithError({0x00, 0x01, 0x02}),
- FailedWithMessage("unexpected end of data"));
+ EXPECT_THAT_EXPECTED(
+ GetWithError({0x00, 0x01, 0x02}),
+ FailedWithMessage("unexpected end of data at offset 0x0"));
EXPECT_EQ(GetWithoutError({0x00, 0x01, 0x02}), ErrorResult);
EXPECT_THAT_EXPECTED(
EXPECT_EQ(GetWithoutError({0xff, 0xff, 0xff, 0xf0}), ErrorResult);
// DWARF64 marker without the subsequent length field.
- EXPECT_THAT_EXPECTED(GetWithError({0xff, 0xff, 0xff, 0xff}),
- FailedWithMessage("unexpected end of data"));
+ EXPECT_THAT_EXPECTED(
+ GetWithError({0xff, 0xff, 0xff, 0xff}),
+ FailedWithMessage("unexpected end of data at offset 0x4"));
EXPECT_EQ(GetWithoutError({0xff, 0xff, 0xff, 0xff}), ErrorResult);
// Not enough data for the U64 length.
EXPECT_THAT_EXPECTED(
GetWithError({0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x02, 0x03}),
- FailedWithMessage("unexpected end of data"));
+ FailedWithMessage("unexpected end of data at offset 0x4"));
EXPECT_EQ(GetWithoutError({0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x02, 0x03}),
ErrorResult);
&ErrorInfoBase::message,
"Unable to resolve indirect address 1 for: DW_LLE_startx_length")));
- EXPECT_THAT_EXPECTED(Die.getLocations(DW_AT_call_data_location),
- Failed<ErrorInfoBase>(testing::Property(
- &ErrorInfoBase::message, "unexpected end of data")));
+ EXPECT_THAT_EXPECTED(
+ Die.getLocations(DW_AT_call_data_location),
+ FailedWithMessage("unexpected end of data at offset 0x20"));
EXPECT_THAT_EXPECTED(
Die.getLocations(DW_AT_call_data_value),