<div dir="ltr">This is re-added in r296643 with the offending test disabled while I investigate. It doesn't look like any other tests were causing problems, but I'm keeping an eye on the bot just in case.</div><br><div class="gmail_quote"><div dir="ltr">On Wed, Mar 1, 2017 at 9:29 AM Zachary Turner <<a href="mailto:zturner@google.com">zturner@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr" class="gmail_msg">Ahh nvm, looks like you reverted. No worries</div><br class="gmail_msg"><div class="gmail_quote gmail_msg"><div dir="ltr" class="gmail_msg">On Wed, Mar 1, 2017 at 9:26 AM Zachary Turner <<a href="mailto:zturner@google.com" class="gmail_msg" target="_blank">zturner@google.com</a>> wrote:<br class="gmail_msg"></div><blockquote class="gmail_quote gmail_msg" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr" class="gmail_msg">I will disable this test for now.<br class="gmail_msg"></div><br class="gmail_msg"><div class="gmail_quote gmail_msg"><div dir="ltr" class="gmail_msg">On Wed, Mar 1, 2017 at 9:22 AM Vedant Kumar <<a href="mailto:vsk@apple.com" class="gmail_msg" target="_blank">vsk@apple.com</a>> wrote:<br class="gmail_msg"></div><blockquote class="gmail_quote gmail_msg" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Zachary,<br class="gmail_msg">
<br class="gmail_msg">
This test causes a UBSan alignment failure on ToT. Some of our bots rely on UBSan for presubmission testing, so I needed to clear them up.<br class="gmail_msg">
<br class="gmail_msg">
/Users/vk/Desktop/llvm/include/llvm/DebugInfo/MSF/BinaryStreamArray.h:246:12: runtime error: reference binding to misaligned address 0x7f925540939a for type 'const int', which requires 4 byte alignment<br class="gmail_msg">
0x7f925540939a: note: pointer points here<br class="gmail_msg">
05 00 00 00 01 00 00 00 02 00 00 00 03 00 00 00 00 00 00 00 00 00 00 00 00 00 70 98 50 06 01 00<br class="gmail_msg">
^<br class="gmail_msg">
0 DebugInfoPDBTests 0x0000000106263cbd llvm::sys::PrintStackTrace(llvm::raw_ostream&) + 45<br class="gmail_msg">
1 DebugInfoPDBTests 0x00000001062628ff llvm::sys::RunSignalHandlers() + 159<br class="gmail_msg">
2 DebugInfoPDBTests 0x0000000106264593 SignalHandler(int) + 179<br class="gmail_msg">
3 libsystem_platform.dylib 0x0000000107bb3fba _sigtramp + 26<br class="gmail_msg">
4 libsystem_pthread.dylib 0x0000000107bd82c8 _pthread_keys + 9720<br class="gmail_msg">
5 libsystem_c.dylib 0x0000000107947f83 abort + 127<br class="gmail_msg">
6 libclang_rt.ubsan_osx_dynamic.dylib 0x0000000106bb5fc2 __sanitizer::Abort() + 66<br class="gmail_msg">
7 DebugInfoPDBTests 0x000000010613f880 llvm::FixedStreamArrayIterator<int>::operator+=(long) + 0<br class="gmail_msg">
8 DebugInfoPDBTests 0x000000010613f615 llvm::FixedStreamArrayIterator<int>::operator*() const + 37<br class="gmail_msg">
9 DebugInfoPDBTests 0x000000010613f3cb std::__1::enable_if<__is_forward_iterator<llvm::FixedStreamArrayIterator<int> >::value, void>::type std::__1::vector<int, std::__1::allocator<int> >::__construct_at_end<llvm::FixedStreamArrayIterator<int> >(llvm::FixedStreamArrayIterator<int>, llvm::FixedStreamArrayIterator<int>, unsigned long) + 251<br class="gmail_msg">
10 DebugInfoPDBTests 0x000000010613f292 std::__1::vector<int, std::__1::allocator<int> >::vector<llvm::FixedStreamArrayIterator<int> >(llvm::FixedStreamArrayIterator<int>, std::__1::enable_if<(__is_forward_iterator<llvm::FixedStreamArrayIterator<int> >::value) && (is_constructible<int, std::__1::iterator_traits<llvm::FixedStreamArrayIterator<int> >::reference>::value), llvm::FixedStreamArrayIterator<int> >::type) + 226<br class="gmail_msg">
11 DebugInfoPDBTests 0x000000010613ddb7 std::__1::vector<int, std::__1::allocator<int> >::vector<llvm::FixedStreamArrayIterator<int> >(llvm::FixedStreamArrayIterator<int>, std::__1::enable_if<(__is_forward_iterator<llvm::FixedStreamArrayIterator<int> >::value) && (is_constructible<int, std::__1::iterator_traits<llvm::FixedStreamArrayIterator<int> >::reference>::value), llvm::FixedStreamArrayIterator<int> >::type) + 87<br class="gmail_msg">
12 DebugInfoPDBTests 0x000000010613d4af (anonymous namespace)::BinaryStreamTest_StreamReaderIntegerArray_Test::TestBody() + 1279<br class="gmail_msg">
13 DebugInfoPDBTests 0x00000001062780f3 testing::Test::Run() + 179<br class="gmail_msg">
14 DebugInfoPDBTests 0x0000000106279594 testing::TestInfo::Run() + 308<br class="gmail_msg">
15 DebugInfoPDBTests 0x000000010627a6a3 testing::TestCase::Run() + 307<br class="gmail_msg">
16 DebugInfoPDBTests 0x00000001062849d4 testing::internal::UnitTestImpl::RunAllTests() + 756<br class="gmail_msg">
17 DebugInfoPDBTests 0x0000000106284558 testing::UnitTest::Run() + 152<br class="gmail_msg">
18 DebugInfoPDBTests 0x0000000106266fa5 main + 117<br class="gmail_msg">
19 libdyld.dylib 0x00000001078506a5 start + 1<br class="gmail_msg">
zsh: abort ./unittests/DebugInfo/PDB/DebugInfoPDBTests<br class="gmail_msg">
<br class="gmail_msg">
vedant<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
> On Feb 28, 2017, at 5:03 PM, Zachary Turner via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br class="gmail_msg">
><br class="gmail_msg">
> Author: zturner<br class="gmail_msg">
> Date: Tue Feb 28 19:03:53 2017<br class="gmail_msg">
> New Revision: 296555<br class="gmail_msg">
><br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=296555&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=296555&view=rev</a><br class="gmail_msg">
> Log:<br class="gmail_msg">
> [PDB] Add tests for BinaryStream.<br class="gmail_msg">
><br class="gmail_msg">
> Added:<br class="gmail_msg">
> llvm/trunk/unittests/DebugInfo/PDB/BinaryStreamTest.cpp<br class="gmail_msg">
> Modified:<br class="gmail_msg">
> llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt<br class="gmail_msg">
><br class="gmail_msg">
> Added: llvm/trunk/unittests/DebugInfo/PDB/BinaryStreamTest.cpp<br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/PDB/BinaryStreamTest.cpp?rev=296555&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/PDB/BinaryStreamTest.cpp?rev=296555&view=auto</a><br class="gmail_msg">
> ==============================================================================<br class="gmail_msg">
> --- llvm/trunk/unittests/DebugInfo/PDB/BinaryStreamTest.cpp (added)<br class="gmail_msg">
> +++ llvm/trunk/unittests/DebugInfo/PDB/BinaryStreamTest.cpp Tue Feb 28 19:03:53 2017<br class="gmail_msg">
> @@ -0,0 +1,643 @@<br class="gmail_msg">
> +//===- llvm/unittest/Support/BinaryStreamTest.cpp -------------------------===//<br class="gmail_msg">
> +//<br class="gmail_msg">
> +// The LLVM Compiler Infrastructure<br class="gmail_msg">
> +//<br class="gmail_msg">
> +// This file is distributed under the University of Illinois Open Source<br class="gmail_msg">
> +// License. See LICENSE.TXT for details.<br class="gmail_msg">
> +//<br class="gmail_msg">
> +//===----------------------------------------------------------------------===//<br class="gmail_msg">
> +<br class="gmail_msg">
> +#include "llvm/DebugInfo/MSF/BinaryByteStream.h"<br class="gmail_msg">
> +#include "llvm/DebugInfo/MSF/BinaryItemStream.h"<br class="gmail_msg">
> +#include "llvm/DebugInfo/MSF/BinaryStreamArray.h"<br class="gmail_msg">
> +#include "llvm/DebugInfo/MSF/BinaryStreamReader.h"<br class="gmail_msg">
> +#include "llvm/DebugInfo/MSF/BinaryStreamRef.h"<br class="gmail_msg">
> +#include "llvm/DebugInfo/MSF/BinaryStreamWriter.h"<br class="gmail_msg">
> +#include "gtest/gtest.h"<br class="gmail_msg">
> +<br class="gmail_msg">
> +#include <unordered_map><br class="gmail_msg">
> +<br class="gmail_msg">
> +using namespace llvm;<br class="gmail_msg">
> +using namespace llvm::support;<br class="gmail_msg">
> +<br class="gmail_msg">
> +#define EXPECT_NO_ERROR(Err) \<br class="gmail_msg">
> + { \<br class="gmail_msg">
> + auto E = Err; \<br class="gmail_msg">
> + EXPECT_FALSE(static_cast<bool>(E)); \<br class="gmail_msg">
> + if (E) \<br class="gmail_msg">
> + consumeError(std::move(E)); \<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> +#define ASSERT_NO_ERROR(Err) \<br class="gmail_msg">
> + { \<br class="gmail_msg">
> + auto E = Err; \<br class="gmail_msg">
> + ASSERT_FALSE(static_cast<bool>(E)); \<br class="gmail_msg">
> + if (E) \<br class="gmail_msg">
> + consumeError(std::move(E)); \<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> +#define EXPECT_ERROR(Err) \<br class="gmail_msg">
> + { \<br class="gmail_msg">
> + auto E = Err; \<br class="gmail_msg">
> + EXPECT_TRUE(static_cast<bool>(E)); \<br class="gmail_msg">
> + if (E) \<br class="gmail_msg">
> + consumeError(std::move(E)); \<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> +namespace {<br class="gmail_msg">
> +<br class="gmail_msg">
> +class DiscontiguousStream : public WritableBinaryStream {<br class="gmail_msg">
> +public:<br class="gmail_msg">
> + DiscontiguousStream(MutableArrayRef<uint8_t> Data, endianness Endian)<br class="gmail_msg">
> + : Data(Data), PartitionIndex(Data.size() / 2), Endian(Endian) {}<br class="gmail_msg">
> +<br class="gmail_msg">
> + endianness getEndian() const override { return Endian; }<br class="gmail_msg">
> +<br class="gmail_msg">
> + Error readBytes(uint32_t Offset, uint32_t Size,<br class="gmail_msg">
> + ArrayRef<uint8_t> &Buffer) override {<br class="gmail_msg">
> + if (Offset + Size > Data.size())<br class="gmail_msg">
> + return errorCodeToError(make_error_code(std::errc::no_buffer_space));<br class="gmail_msg">
> + uint32_t S = startIndex(Offset);<br class="gmail_msg">
> + auto Ref = Data.drop_front(S);<br class="gmail_msg">
> + if (Ref.size() >= Size) {<br class="gmail_msg">
> + Buffer = Ref.take_front(Size);<br class="gmail_msg">
> + return Error::success();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + uint32_t BytesLeft = Size - Ref.size();<br class="gmail_msg">
> + uint8_t *Ptr = Allocator.Allocate<uint8_t>(Size);<br class="gmail_msg">
> + ::memcpy(Ptr, Ref.data(), Ref.size());<br class="gmail_msg">
> + ::memcpy(Ptr + Ref.size(), Data.data(), BytesLeft);<br class="gmail_msg">
> + Buffer = makeArrayRef<uint8_t>(Ptr, Size);<br class="gmail_msg">
> + return Error::success();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + Error readLongestContiguousChunk(uint32_t Offset,<br class="gmail_msg">
> + ArrayRef<uint8_t> &Buffer) override {<br class="gmail_msg">
> + if (Offset >= Data.size())<br class="gmail_msg">
> + return errorCodeToError(make_error_code(std::errc::no_buffer_space));<br class="gmail_msg">
> + uint32_t S = startIndex(Offset);<br class="gmail_msg">
> + Buffer = Data.drop_front(S);<br class="gmail_msg">
> + return Error::success();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + uint32_t getLength() override { return Data.size(); }<br class="gmail_msg">
> +<br class="gmail_msg">
> + Error writeBytes(uint32_t Offset, ArrayRef<uint8_t> SrcData) override {<br class="gmail_msg">
> + if (Offset + SrcData.size() > Data.size())<br class="gmail_msg">
> + return errorCodeToError(make_error_code(std::errc::no_buffer_space));<br class="gmail_msg">
> + if (SrcData.empty())<br class="gmail_msg">
> + return Error::success();<br class="gmail_msg">
> +<br class="gmail_msg">
> + uint32_t S = startIndex(Offset);<br class="gmail_msg">
> + MutableArrayRef<uint8_t> Ref(Data);<br class="gmail_msg">
> + Ref = Ref.drop_front(S);<br class="gmail_msg">
> + if (Ref.size() >= SrcData.size()) {<br class="gmail_msg">
> + ::memcpy(Ref.data(), SrcData.data(), SrcData.size());<br class="gmail_msg">
> + return Error::success();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + uint32_t BytesLeft = SrcData.size() - Ref.size();<br class="gmail_msg">
> + ::memcpy(Ref.data(), SrcData.data(), Ref.size());<br class="gmail_msg">
> + ::memcpy(&Data[0], SrcData.data() + Ref.size(), BytesLeft);<br class="gmail_msg">
> + return Error::success();<br class="gmail_msg">
> + }<br class="gmail_msg">
> + Error commit() override { return Error::success(); }<br class="gmail_msg">
> +<br class="gmail_msg">
> +private:<br class="gmail_msg">
> + uint32_t startIndex(uint32_t Offset) const {<br class="gmail_msg">
> + return (Offset + PartitionIndex) % Data.size();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + uint32_t endIndex(uint32_t Offset, uint32_t Size) const {<br class="gmail_msg">
> + return (startIndex(Offset) + Size - 1) % Data.size();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + // Buffer is organized like this:<br class="gmail_msg">
> + // -------------------------------------------------<br class="gmail_msg">
> + // | N/2 | N/2+1 | ... | N-1 | 0 | 1 | ... | N-2-1 |<br class="gmail_msg">
> + // -------------------------------------------------<br class="gmail_msg">
> + // So reads from the beginning actually come from the middle.<br class="gmail_msg">
> + MutableArrayRef<uint8_t> Data;<br class="gmail_msg">
> + uint32_t PartitionIndex = 0;<br class="gmail_msg">
> + endianness Endian;<br class="gmail_msg">
> + BumpPtrAllocator Allocator;<br class="gmail_msg">
> +};<br class="gmail_msg">
> +<br class="gmail_msg">
> +class BinaryStreamTest : public testing::Test {<br class="gmail_msg">
> + static constexpr endianness Endians[] = {big, little, native};<br class="gmail_msg">
> + static constexpr uint32_t NumEndians = llvm::array_lengthof(Endians);<br class="gmail_msg">
> + static constexpr uint32_t NumStreams = 2 * NumEndians;<br class="gmail_msg">
> +<br class="gmail_msg">
> +public:<br class="gmail_msg">
> + BinaryStreamTest() {}<br class="gmail_msg">
> +<br class="gmail_msg">
> + void SetUp() override {<br class="gmail_msg">
> + Streams.clear();<br class="gmail_msg">
> + Streams.resize(NumStreams);<br class="gmail_msg">
> + InputData.clear();<br class="gmail_msg">
> + OutputData.clear();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> +protected:<br class="gmail_msg">
> + struct StreamPair {<br class="gmail_msg">
> + std::unique_ptr<BinaryStream> Input;<br class="gmail_msg">
> + std::unique_ptr<WritableBinaryStream> Output;<br class="gmail_msg">
> + };<br class="gmail_msg">
> +<br class="gmail_msg">
> + void initializeInput(ArrayRef<uint8_t> Input) {<br class="gmail_msg">
> + InputData = Input;<br class="gmail_msg">
> +<br class="gmail_msg">
> + BrokenInputData.resize(InputData.size());<br class="gmail_msg">
> + if (!Input.empty()) {<br class="gmail_msg">
> + uint32_t PartitionIndex = InputData.size() / 2;<br class="gmail_msg">
> + uint32_t RightBytes = InputData.size() - PartitionIndex;<br class="gmail_msg">
> + uint32_t LeftBytes = PartitionIndex;<br class="gmail_msg">
> + if (RightBytes > 0)<br class="gmail_msg">
> + ::memcpy(&BrokenInputData[PartitionIndex], Input.data(), RightBytes);<br class="gmail_msg">
> + if (LeftBytes > 0)<br class="gmail_msg">
> + ::memcpy(&BrokenInputData[0], Input.data() + RightBytes, LeftBytes);<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (uint32_t I = 0; I < NumEndians; ++I) {<br class="gmail_msg">
> + auto InByteStream =<br class="gmail_msg">
> + llvm::make_unique<BinaryByteStream>(InputData, Endians[I]);<br class="gmail_msg">
> + auto InBrokenStream =<br class="gmail_msg">
> + llvm::make_unique<DiscontiguousStream>(BrokenInputData, Endians[I]);<br class="gmail_msg">
> +<br class="gmail_msg">
> + Streams[I * 2].Input = std::move(InByteStream);<br class="gmail_msg">
> + Streams[I * 2 + 1].Input = std::move(InBrokenStream);<br class="gmail_msg">
> + }<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + void initializeOutput(uint32_t Size) {<br class="gmail_msg">
> + OutputData.resize(Size);<br class="gmail_msg">
> + BrokenOutputData.resize(Size);<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (uint32_t I = 0; I < NumEndians; ++I) {<br class="gmail_msg">
> + Streams[I * 2].Output =<br class="gmail_msg">
> + llvm::make_unique<MutableBinaryByteStream>(OutputData, Endians[I]);<br class="gmail_msg">
> + Streams[I * 2 + 1].Output =<br class="gmail_msg">
> + llvm::make_unique<DiscontiguousStream>(BrokenOutputData, Endians[I]);<br class="gmail_msg">
> + }<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + void initializeOutputFromInput() {<br class="gmail_msg">
> + for (uint32_t I = 0; I < NumEndians; ++I) {<br class="gmail_msg">
> + Streams[I * 2].Output =<br class="gmail_msg">
> + llvm::make_unique<MutableBinaryByteStream>(InputData, Endians[I]);<br class="gmail_msg">
> + Streams[I * 2 + 1].Output =<br class="gmail_msg">
> + llvm::make_unique<DiscontiguousStream>(BrokenInputData, Endians[I]);<br class="gmail_msg">
> + }<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + void initializeInputFromOutput() {<br class="gmail_msg">
> + for (uint32_t I = 0; I < NumEndians; ++I) {<br class="gmail_msg">
> + Streams[I * 2].Input =<br class="gmail_msg">
> + llvm::make_unique<BinaryByteStream>(OutputData, Endians[I]);<br class="gmail_msg">
> + Streams[I * 2 + 1].Input =<br class="gmail_msg">
> + llvm::make_unique<DiscontiguousStream>(BrokenOutputData, Endians[I]);<br class="gmail_msg">
> + }<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + std::vector<uint8_t> InputData;<br class="gmail_msg">
> + std::vector<uint8_t> BrokenInputData;<br class="gmail_msg">
> +<br class="gmail_msg">
> + std::vector<uint8_t> OutputData;<br class="gmail_msg">
> + std::vector<uint8_t> BrokenOutputData;<br class="gmail_msg">
> +<br class="gmail_msg">
> + std::vector<StreamPair> Streams;<br class="gmail_msg">
> +};<br class="gmail_msg">
> +<br class="gmail_msg">
> +// Tests that a we can read from a BinaryByteStream without a StreamReader.<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, BinaryByteStreamProperties) {<br class="gmail_msg">
> + std::vector<uint8_t> InputData = {1, 2, 3, 4, 5};<br class="gmail_msg">
> + initializeInput(InputData);<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + ArrayRef<uint8_t> Buffer;<br class="gmail_msg">
> +<br class="gmail_msg">
> + // 1. If the read fits it should work.<br class="gmail_msg">
> + ASSERT_EQ(InputData.size(), Stream.Input->getLength());<br class="gmail_msg">
> + ASSERT_NO_ERROR(Stream.Input->readBytes(2, 1, Buffer));<br class="gmail_msg">
> + EXPECT_EQ(makeArrayRef(InputData).slice(2, 1), Buffer);<br class="gmail_msg">
> + ASSERT_NO_ERROR(Stream.Input->readBytes(0, 4, Buffer));<br class="gmail_msg">
> + EXPECT_EQ(makeArrayRef(InputData).slice(0, 4), Buffer);<br class="gmail_msg">
> +<br class="gmail_msg">
> + // 2. Reading past the bounds of the input should fail.<br class="gmail_msg">
> + EXPECT_ERROR(Stream.Input->readBytes(4, 2, Buffer));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +// Test that we can write to a BinaryStream without a StreamWriter.<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, MutableBinaryByteStreamProperties) {<br class="gmail_msg">
> + std::vector<uint8_t> InputData = {'T', 'e', 's', 't', '\0'};<br class="gmail_msg">
> + initializeInput(InputData);<br class="gmail_msg">
> + initializeOutput(InputData.size());<br class="gmail_msg">
> +<br class="gmail_msg">
> + // For every combination of input stream and output stream.<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + MutableArrayRef<uint8_t> Buffer;<br class="gmail_msg">
> + ASSERT_EQ(InputData.size(), Stream.Input->getLength());<br class="gmail_msg">
> +<br class="gmail_msg">
> + // 1. Try two reads that are supposed to work. One from offset 0, and one<br class="gmail_msg">
> + // from the middle.<br class="gmail_msg">
> + uint32_t Offsets[] = {0, 3};<br class="gmail_msg">
> + for (auto Offset : Offsets) {<br class="gmail_msg">
> + uint32_t ExpectedSize = Stream.Input->getLength() - Offset;<br class="gmail_msg">
> +<br class="gmail_msg">
> + // Read everything from Offset until the end of the input data.<br class="gmail_msg">
> + ArrayRef<uint8_t> Data;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Stream.Input->readBytes(Offset, ExpectedSize, Data));<br class="gmail_msg">
> + ASSERT_EQ(ExpectedSize, Data.size());<br class="gmail_msg">
> +<br class="gmail_msg">
> + // Then write it to the destination.<br class="gmail_msg">
> + ASSERT_NO_ERROR(Stream.Output->writeBytes(0, Data));<br class="gmail_msg">
> +<br class="gmail_msg">
> + // Then we read back what we wrote, it should match the corresponding<br class="gmail_msg">
> + // slice of the original input data.<br class="gmail_msg">
> + ArrayRef<uint8_t> Data2;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Stream.Output->readBytes(Offset, ExpectedSize, Data2));<br class="gmail_msg">
> + EXPECT_EQ(makeArrayRef(InputData).drop_front(Offset), Data2);<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + std::vector<uint8_t> BigData = {0, 1, 2, 3, 4};<br class="gmail_msg">
> + // 2. If the write is too big, it should fail.<br class="gmail_msg">
> + EXPECT_ERROR(Stream.Output->writeBytes(3, BigData));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +// Test that FixedStreamArray works correctly.<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, FixedStreamArray) {<br class="gmail_msg">
> + std::vector<uint32_t> Ints = {90823, 12908, 109823, 209823};<br class="gmail_msg">
> + ArrayRef<uint8_t> IntBytes(reinterpret_cast<uint8_t *>(Ints.data()),<br class="gmail_msg">
> + Ints.size() * sizeof(uint32_t));<br class="gmail_msg">
> +<br class="gmail_msg">
> + initializeInput(IntBytes);<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + MutableArrayRef<uint8_t> Buffer;<br class="gmail_msg">
> + ASSERT_EQ(InputData.size(), Stream.Input->getLength());<br class="gmail_msg">
> +<br class="gmail_msg">
> + FixedStreamArray<uint32_t> Array(*Stream.Input);<br class="gmail_msg">
> + auto Iter = Array.begin();<br class="gmail_msg">
> + ASSERT_EQ(Ints[0], *Iter++);<br class="gmail_msg">
> + ASSERT_EQ(Ints[1], *Iter++);<br class="gmail_msg">
> + ASSERT_EQ(Ints[2], *Iter++);<br class="gmail_msg">
> + ASSERT_EQ(Ints[3], *Iter++);<br class="gmail_msg">
> + ASSERT_EQ(Array.end(), Iter);<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +// Test that VarStreamArray works correctly.<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, VarStreamArray) {<br class="gmail_msg">
> + StringLiteral Strings("1. Test2. Longer Test3. Really Long Test4. Super "<br class="gmail_msg">
> + "Extra Longest Test Of All");<br class="gmail_msg">
> + ArrayRef<uint8_t> StringBytes(<br class="gmail_msg">
> + reinterpret_cast<const uint8_t *>(Strings.data()), Strings.size());<br class="gmail_msg">
> + initializeInput(StringBytes);<br class="gmail_msg">
> +<br class="gmail_msg">
> + struct StringExtractor {<br class="gmail_msg">
> + public:<br class="gmail_msg">
> + Error operator()(BinaryStreamRef Stream, uint32_t &Len, StringRef &Item) {<br class="gmail_msg">
> + if (Index == 0)<br class="gmail_msg">
> + Len = strlen("1. Test");<br class="gmail_msg">
> + else if (Index == 1)<br class="gmail_msg">
> + Len = strlen("2. Longer Test");<br class="gmail_msg">
> + else if (Index == 2)<br class="gmail_msg">
> + Len = strlen("3. Really Long Test");<br class="gmail_msg">
> + else<br class="gmail_msg">
> + Len = strlen("4. Super Extra Longest Test Of All");<br class="gmail_msg">
> + ArrayRef<uint8_t> Bytes;<br class="gmail_msg">
> + if (auto EC = Stream.readBytes(0, Len, Bytes))<br class="gmail_msg">
> + return EC;<br class="gmail_msg">
> + Item =<br class="gmail_msg">
> + StringRef(reinterpret_cast<const char *>(Bytes.data()), Bytes.size());<br class="gmail_msg">
> + ++Index;<br class="gmail_msg">
> + return Error::success();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + private:<br class="gmail_msg">
> + uint32_t Index = 0;<br class="gmail_msg">
> + };<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + VarStreamArray<StringRef, StringExtractor> Array(*Stream.Input);<br class="gmail_msg">
> + auto Iter = Array.begin();<br class="gmail_msg">
> + ASSERT_EQ("1. Test", *Iter++);<br class="gmail_msg">
> + ASSERT_EQ("2. Longer Test", *Iter++);<br class="gmail_msg">
> + ASSERT_EQ("3. Really Long Test", *Iter++);<br class="gmail_msg">
> + ASSERT_EQ("4. Super Extra Longest Test Of All", *Iter++);<br class="gmail_msg">
> + ASSERT_EQ(Array.end(), Iter);<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StreamReaderBounds) {<br class="gmail_msg">
> + std::vector<uint8_t> Bytes;<br class="gmail_msg">
> +<br class="gmail_msg">
> + initializeInput(Bytes);<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + StringRef S;<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> + EXPECT_EQ(0U, Reader.bytesRemaining());<br class="gmail_msg">
> + EXPECT_ERROR(Reader.readFixedString(S, 1));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + Bytes.resize(5);<br class="gmail_msg">
> + initializeInput(Bytes);<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + StringRef S;<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> + EXPECT_EQ(Bytes.size(), Reader.bytesRemaining());<br class="gmail_msg">
> + EXPECT_NO_ERROR(Reader.readFixedString(S, 5));<br class="gmail_msg">
> + EXPECT_ERROR(Reader.readFixedString(S, 6));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StreamReaderIntegers) {<br class="gmail_msg">
> + support::ulittle64_t Little{908234};<br class="gmail_msg">
> + support::ubig32_t Big{28907823};<br class="gmail_msg">
> + short NS = 2897;<br class="gmail_msg">
> + int NI = -89723;<br class="gmail_msg">
> + unsigned long NUL = 902309023UL;<br class="gmail_msg">
> + constexpr uint32_t Size =<br class="gmail_msg">
> + sizeof(Little) + sizeof(Big) + sizeof(NS) + sizeof(NI) + sizeof(NUL);<br class="gmail_msg">
> +<br class="gmail_msg">
> + initializeOutput(Size);<br class="gmail_msg">
> + initializeInputFromOutput();<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + BinaryStreamWriter Writer(*Stream.Output);<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeObject(Little));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeObject(Big));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeInteger(NS));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeInteger(NI));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeInteger(NUL));<br class="gmail_msg">
> +<br class="gmail_msg">
> + const support::ulittle64_t *Little2;<br class="gmail_msg">
> + const support::ubig32_t *Big2;<br class="gmail_msg">
> + short NS2;<br class="gmail_msg">
> + int NI2;<br class="gmail_msg">
> + unsigned long NUL2;<br class="gmail_msg">
> +<br class="gmail_msg">
> + // 1. Reading fields individually.<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readObject(Little2));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readObject(Big2));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readInteger(NS2));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readInteger(NI2));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readInteger(NUL2));<br class="gmail_msg">
> + ASSERT_EQ(0U, Reader.bytesRemaining());<br class="gmail_msg">
> +<br class="gmail_msg">
> + EXPECT_EQ(Little, *Little2);<br class="gmail_msg">
> + EXPECT_EQ(Big, *Big2);<br class="gmail_msg">
> + EXPECT_EQ(NS, NS2);<br class="gmail_msg">
> + EXPECT_EQ(NI, NI2);<br class="gmail_msg">
> + EXPECT_EQ(NUL, NUL2);<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StreamReaderIntegerArray) {<br class="gmail_msg">
> + // 1. Arrays of integers<br class="gmail_msg">
> + std::vector<int> Ints = {1, 2, 3, 4, 5};<br class="gmail_msg">
> + ArrayRef<uint8_t> IntBytes(reinterpret_cast<uint8_t *>(&Ints[0]),<br class="gmail_msg">
> + Ints.size() * sizeof(int));<br class="gmail_msg">
> +<br class="gmail_msg">
> + initializeInput(IntBytes);<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> + ArrayRef<int> IntsRef;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readArray(IntsRef, Ints.size()));<br class="gmail_msg">
> + ASSERT_EQ(0U, Reader.bytesRemaining());<br class="gmail_msg">
> + EXPECT_EQ(makeArrayRef(Ints), IntsRef);<br class="gmail_msg">
> +<br class="gmail_msg">
> + Reader.setOffset(0);<br class="gmail_msg">
> + FixedStreamArray<int> FixedIntsRef;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readArray(FixedIntsRef, Ints.size()));<br class="gmail_msg">
> + ASSERT_EQ(0U, Reader.bytesRemaining());<br class="gmail_msg">
> + ASSERT_EQ(Ints, std::vector<int>(FixedIntsRef.begin(), FixedIntsRef.end()));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StreamReaderEnum) {<br class="gmail_msg">
> + enum class MyEnum : int64_t { Foo = -10, Bar = 0, Baz = 10 };<br class="gmail_msg">
> +<br class="gmail_msg">
> + std::vector<MyEnum> Enums = {MyEnum::Bar, MyEnum::Baz, MyEnum::Foo};<br class="gmail_msg">
> +<br class="gmail_msg">
> + initializeOutput(Enums.size() * sizeof(MyEnum));<br class="gmail_msg">
> + initializeInputFromOutput();<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + BinaryStreamWriter Writer(*Stream.Output);<br class="gmail_msg">
> + for (auto Value : Enums)<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeEnum(Value));<br class="gmail_msg">
> +<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> +<br class="gmail_msg">
> + ArrayRef<MyEnum> Array;<br class="gmail_msg">
> + FixedStreamArray<MyEnum> FSA;<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (size_t I = 0; I < Enums.size(); ++I) {<br class="gmail_msg">
> + MyEnum Value;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readEnum(Value));<br class="gmail_msg">
> + EXPECT_EQ(Enums[I], Value);<br class="gmail_msg">
> + }<br class="gmail_msg">
> + ASSERT_EQ(0U, Reader.bytesRemaining());<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StreamReaderObject) {<br class="gmail_msg">
> + struct Foo {<br class="gmail_msg">
> + int X;<br class="gmail_msg">
> + double Y;<br class="gmail_msg">
> + char Z;<br class="gmail_msg">
> + };<br class="gmail_msg">
> +<br class="gmail_msg">
> + std::vector<Foo> Foos;<br class="gmail_msg">
> + Foos.push_back({-42, 42.42, 42});<br class="gmail_msg">
> + Foos.push_back({100, 3.1415, static_cast<char>(-89)});<br class="gmail_msg">
> +<br class="gmail_msg">
> + const uint8_t *Bytes = reinterpret_cast<const uint8_t *>(&Foos[0]);<br class="gmail_msg">
> +<br class="gmail_msg">
> + initializeInput(makeArrayRef(Bytes, 2 * sizeof(Foo)));<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + // 1. Reading object pointers.<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> + const Foo *FPtrOut = nullptr;<br class="gmail_msg">
> + const Foo *GPtrOut = nullptr;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readObject(FPtrOut));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readObject(GPtrOut));<br class="gmail_msg">
> + EXPECT_EQ(0U, Reader.bytesRemaining());<br class="gmail_msg">
> + EXPECT_EQ(0, ::memcmp(&Foos[0], FPtrOut, sizeof(Foo)));<br class="gmail_msg">
> + EXPECT_EQ(0, ::memcmp(&Foos[1], GPtrOut, sizeof(Foo)));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StreamReaderStrings) {<br class="gmail_msg">
> + std::vector<uint8_t> Bytes = {'O', 'n', 'e', '\0', 'T', 'w', 'o',<br class="gmail_msg">
> + '\0', 'T', 'h', 'r', 'e', 'e', '\0',<br class="gmail_msg">
> + 'F', 'o', 'u', 'r', '\0'};<br class="gmail_msg">
> + initializeInput(Bytes);<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> +<br class="gmail_msg">
> + StringRef S1;<br class="gmail_msg">
> + StringRef S2;<br class="gmail_msg">
> + StringRef S3;<br class="gmail_msg">
> + StringRef S4;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readCString(S1));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readCString(S2));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readCString(S3));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readCString(S4));<br class="gmail_msg">
> + ASSERT_EQ(0U, Reader.bytesRemaining());<br class="gmail_msg">
> +<br class="gmail_msg">
> + EXPECT_EQ("One", S1);<br class="gmail_msg">
> + EXPECT_EQ("Two", S2);<br class="gmail_msg">
> + EXPECT_EQ("Three", S3);<br class="gmail_msg">
> + EXPECT_EQ("Four", S4);<br class="gmail_msg">
> +<br class="gmail_msg">
> + S1 = S2 = S3 = S4 = "";<br class="gmail_msg">
> + Reader.setOffset(0);<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readFixedString(S1, 3));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.skip(1));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readFixedString(S2, 3));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.skip(1));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readFixedString(S3, 5));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.skip(1));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readFixedString(S4, 4));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.skip(1));<br class="gmail_msg">
> + ASSERT_EQ(0U, Reader.bytesRemaining());<br class="gmail_msg">
> +<br class="gmail_msg">
> + EXPECT_EQ("One", S1);<br class="gmail_msg">
> + EXPECT_EQ("Two", S2);<br class="gmail_msg">
> + EXPECT_EQ("Three", S3);<br class="gmail_msg">
> + EXPECT_EQ("Four", S4);<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StreamWriterBounds) {<br class="gmail_msg">
> + initializeOutput(5);<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + BinaryStreamWriter Writer(*Stream.Output);<br class="gmail_msg">
> +<br class="gmail_msg">
> + // 1. Can write a string that exactly fills the buffer.<br class="gmail_msg">
> + EXPECT_EQ(5U, Writer.bytesRemaining());<br class="gmail_msg">
> + EXPECT_NO_ERROR(Writer.writeFixedString("abcde"));<br class="gmail_msg">
> + EXPECT_EQ(0U, Writer.bytesRemaining());<br class="gmail_msg">
> +<br class="gmail_msg">
> + // 2. Can write an empty string even when you're full<br class="gmail_msg">
> + EXPECT_NO_ERROR(Writer.writeFixedString(""));<br class="gmail_msg">
> + EXPECT_ERROR(Writer.writeFixedString("a"));<br class="gmail_msg">
> +<br class="gmail_msg">
> + // 3. Can't write a string that is one character too long.<br class="gmail_msg">
> + Writer.setOffset(0);<br class="gmail_msg">
> + EXPECT_ERROR(Writer.writeFixedString("abcdef"));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StreamWriterIntegerArrays) {<br class="gmail_msg">
> + // 3. Arrays of integers<br class="gmail_msg">
> + std::vector<int> SourceInts = {1, 2, 3, 4, 5};<br class="gmail_msg">
> + ArrayRef<uint8_t> SourceBytes(reinterpret_cast<uint8_t *>(&SourceInts[0]),<br class="gmail_msg">
> + SourceInts.size() * sizeof(int));<br class="gmail_msg">
> +<br class="gmail_msg">
> + initializeInput(SourceBytes);<br class="gmail_msg">
> + initializeOutputFromInput();<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> + BinaryStreamWriter Writer(*Stream.Output);<br class="gmail_msg">
> + ArrayRef<int> Ints;<br class="gmail_msg">
> + ArrayRef<int> Ints2;<br class="gmail_msg">
> + // First read them, then write them, then read them back.<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readArray(Ints, SourceInts.size()));<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeArray(Ints));<br class="gmail_msg">
> +<br class="gmail_msg">
> + BinaryStreamReader ReaderBacker(*Stream.Output);<br class="gmail_msg">
> + ASSERT_NO_ERROR(ReaderBacker.readArray(Ints2, SourceInts.size()));<br class="gmail_msg">
> +<br class="gmail_msg">
> + EXPECT_EQ(makeArrayRef(SourceInts), Ints2);<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, StringWriterStrings) {<br class="gmail_msg">
> + StringRef Strings[] = {"First", "Second", "Third", "Fourth"};<br class="gmail_msg">
> +<br class="gmail_msg">
> + size_t Length = 0;<br class="gmail_msg">
> + for (auto S : Strings)<br class="gmail_msg">
> + Length += S.size() + 1;<br class="gmail_msg">
> + initializeOutput(Length);<br class="gmail_msg">
> + initializeInputFromOutput();<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (auto &Stream : Streams) {<br class="gmail_msg">
> + BinaryStreamWriter Writer(*Stream.Output);<br class="gmail_msg">
> + for (auto S : Strings)<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeCString(S));<br class="gmail_msg">
> + std::vector<StringRef> InStrings;<br class="gmail_msg">
> + BinaryStreamReader Reader(*Stream.Input);<br class="gmail_msg">
> + while (!Reader.empty()) {<br class="gmail_msg">
> + StringRef S;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readCString(S));<br class="gmail_msg">
> + InStrings.push_back(S);<br class="gmail_msg">
> + }<br class="gmail_msg">
> + EXPECT_EQ(makeArrayRef(Strings), makeArrayRef(InStrings));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +namespace {<br class="gmail_msg">
> +struct BinaryItemStreamObject {<br class="gmail_msg">
> + explicit BinaryItemStreamObject(ArrayRef<uint8_t> Bytes) : Bytes(Bytes) {}<br class="gmail_msg">
> +<br class="gmail_msg">
> + ArrayRef<uint8_t> Bytes;<br class="gmail_msg">
> +};<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +namespace llvm {<br class="gmail_msg">
> +template <> struct BinaryItemTraits<BinaryItemStreamObject> {<br class="gmail_msg">
> + static size_t length(const BinaryItemStreamObject &Item) {<br class="gmail_msg">
> + return Item.Bytes.size();<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + static ArrayRef<uint8_t> bytes(const BinaryItemStreamObject &Item) {<br class="gmail_msg">
> + return Item.Bytes;<br class="gmail_msg">
> + }<br class="gmail_msg">
> +};<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +namespace {<br class="gmail_msg">
> +<br class="gmail_msg">
> +TEST_F(BinaryStreamTest, BinaryItemStream) {<br class="gmail_msg">
> + std::vector<BinaryItemStreamObject> Objects;<br class="gmail_msg">
> +<br class="gmail_msg">
> + struct Foo {<br class="gmail_msg">
> + int X;<br class="gmail_msg">
> + double Y;<br class="gmail_msg">
> + };<br class="gmail_msg">
> + std::vector<Foo> Foos = {{1, 1.0}, {2, 2.0}, {3, 3.0}};<br class="gmail_msg">
> + BumpPtrAllocator Allocator;<br class="gmail_msg">
> + for (const auto &F : Foos) {<br class="gmail_msg">
> + uint8_t *Ptr = Allocator.Allocate<uint8_t>(sizeof(Foo));<br class="gmail_msg">
> + MutableArrayRef<uint8_t> Buffer(Ptr, sizeof(Foo));<br class="gmail_msg">
> + MutableBinaryByteStream Stream(Buffer, llvm::support::big);<br class="gmail_msg">
> + BinaryStreamWriter Writer(Stream);<br class="gmail_msg">
> + ASSERT_NO_ERROR(Writer.writeObject(F));<br class="gmail_msg">
> + Objects.push_back(BinaryItemStreamObject(Buffer));<br class="gmail_msg">
> + }<br class="gmail_msg">
> +<br class="gmail_msg">
> + BinaryItemStream<BinaryItemStreamObject> ItemStream(big);<br class="gmail_msg">
> + ItemStream.setItems(Objects);<br class="gmail_msg">
> + BinaryStreamReader Reader(ItemStream);<br class="gmail_msg">
> +<br class="gmail_msg">
> + for (const auto &F : Foos) {<br class="gmail_msg">
> + const Foo *F2;<br class="gmail_msg">
> + ASSERT_NO_ERROR(Reader.readObject(F2));<br class="gmail_msg">
> +<br class="gmail_msg">
> + EXPECT_EQ(F.X, F2->X);<br class="gmail_msg">
> + EXPECT_DOUBLE_EQ(F.Y, F2->Y);<br class="gmail_msg">
> + }<br class="gmail_msg">
> +}<br class="gmail_msg">
> +<br class="gmail_msg">
> +} // end anonymous namespace<br class="gmail_msg">
><br class="gmail_msg">
> Modified: llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt<br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt?rev=296555&r1=296554&r2=296555&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt?rev=296555&r1=296554&r2=296555&view=diff</a><br class="gmail_msg">
> ==============================================================================<br class="gmail_msg">
> --- llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt (original)<br class="gmail_msg">
> +++ llvm/trunk/unittests/DebugInfo/PDB/CMakeLists.txt Tue Feb 28 19:03:53 2017<br class="gmail_msg">
> @@ -5,6 +5,7 @@ set(LLVM_LINK_COMPONENTS<br class="gmail_msg">
> )<br class="gmail_msg">
><br class="gmail_msg">
> set(DebugInfoPDBSources<br class="gmail_msg">
> + BinaryStreamTest.cpp<br class="gmail_msg">
> HashTableTest.cpp<br class="gmail_msg">
> MappedBlockStreamTest.cpp<br class="gmail_msg">
> StringTableBuilderTest.cpp<br class="gmail_msg">
><br class="gmail_msg">
><br class="gmail_msg">
> _______________________________________________<br class="gmail_msg">
> llvm-commits mailing list<br class="gmail_msg">
> <a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
<br class="gmail_msg">
</blockquote></div></blockquote></div></blockquote></div>