Skip to content

Commit

Permalink
modules/zstd/frame_header_test: Fix absl::Span handling
Browse files Browse the repository at this point in the history
Internal-tag: [#64294]
Signed-off-by: Pawel Czarnecki <[email protected]>
  • Loading branch information
lpawelcz committed Aug 19, 2024
1 parent 94ebb25 commit f404d7d
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions xls/modules/zstd/frame_header_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,19 @@ enum FrameHeaderStatus : uint8_t {
};

struct ZstdFrameHeader {
absl::Span<const uint8_t> kBuffer;
ZSTD_frameHeader kHeader;
size_t kResult;

absl::Span<const uint8_t> kBuffer() const {
return absl::MakeConstSpan(buffer_);
}

ZstdFrameHeader(absl::Span<const uint8_t> buffer, ZSTD_frameHeader& h,
size_t& r)
: kHeader(h), kResult(r) {
std::vector<uint8_t> v(buffer.begin(), buffer.end());
buffer_ = v;
}
// Parse a frame header from an arbitrary buffer with the ZSTD library.
static absl::StatusOr<ZstdFrameHeader> Parse(
absl::Span<const uint8_t> buffer) {
Expand All @@ -71,6 +81,9 @@ struct ZstdFrameHeader {
&zstd_fh, buffer.data(), buffer.size(), ZSTD_f_zstd1_magicless);
return ZstdFrameHeader(buffer, zstd_fh, result);
}

private:
std::vector<uint8_t> buffer_;
};

class FrameHeaderTest : public xls::IrTestBase {
Expand Down Expand Up @@ -113,7 +126,7 @@ class FrameHeaderTest : public xls::IrTestBase {
// expected values.
void RunAndExpectFrameHeader(const ZstdFrameHeader& zstd_frame_header) {
// Extend buffer contents to 128 bits if necessary.
const absl::Span<const uint8_t>& buffer = zstd_frame_header.kBuffer;
const absl::Span<const uint8_t>& buffer = zstd_frame_header.kBuffer();
std::vector<uint8_t> buffer_extended(kDslxBufferSizeBytes, 0);
absl::Span<const uint8_t> input_buffer;
if (buffer.size() < kDslxBufferSizeBytes) {
Expand Down

0 comments on commit f404d7d

Please sign in to comment.