<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Feb 25, 2017 at 2:20 AM, Zachary Turner via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="gmail-cremed gmail-cremed cremed">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: zturner<br>
Date: Fri Feb 24 19:20:08 2017<br>
New Revision: 296220<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=296220&view=rev" rel="noreferrer" target="_blank" class="gmail-cremed gmail-cremed cremed">http://llvm.org/viewvc/llvm-<wbr>project?rev=296220&view=rev</a><br>
Log:<br>
Re-enable BinaryStreamTest.<wbr>StreamReaderObject.<br>
<br>
I had an invalid pointer / size calculation that was causing<br>
a stack smash. Should be fixed now.<br>
<br>
Modified:<br>
llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>BinaryStreamTest.cpp<br>
llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>MappedBlockStreamTest.cpp<br>
<br>
Modified: llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>BinaryStreamTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/PDB/BinaryStreamTest.cpp?rev=296220&r1=296219&r2=296220&view=diff" rel="noreferrer" target="_blank" class="gmail-cremed gmail-cremed cremed">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>BinaryStreamTest.cpp?rev=<wbr>296220&r1=296219&r2=296220&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>BinaryStreamTest.cpp (original)<br>
+++ llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>BinaryStreamTest.cpp Fri Feb 24 19:20:08 2017<br>
@@ -443,39 +443,33 @@ TEST_F(BinaryStreamTest, StreamReaderEnu<br>
}<br>
}<br>
<br>
-//TEST_F(BinaryStreamTest, StreamReaderObject) {<br>
-// struct Foo {<br>
-// int X;<br>
-// double Y;<br>
-// char Z;<br>
-// };<br>
-//<br>
-// std::vector<Foo> Foos;<br>
-// Foos.push_back({-42, 42.42, 42});<br>
-// Foos.push_back({100, 3.1415, -89});<br></blockquote><div><br></div><div>Note that this was triggering -Wc++11-narrowing, which I have silenced in r296249. Please double-check whether that's the right thing to do.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
-//<br>
-// std::vector<uint8_t> Bytes;<br>
-// Bytes.resize(2 * sizeof(Foo));<br>
-// Foo *FPtr = reinterpret_cast<Foo *>(&Bytes[0]);<br>
-// Foo *GPtr = FPtr + 1;<br>
-//<br>
-// ::memcpy(FPtr, &Foos[0], sizeof(Foo));<br>
-// ::memcpy(GPtr + sizeof(Foo), &Foos[1], sizeof(Foo));<br>
-//<br>
-// initialize(Bytes, 0);<br>
-//<br>
-// for (auto IS : InputStreams) {<br>
-// // 1. Reading object pointers.<br>
-// BinaryStreamReader Reader(*IS);<br>
-// const Foo *FPtrOut = nullptr;<br>
-// const Foo *GPtrOut = nullptr;<br>
-// ASSERT_NO_ERROR(Reader.<wbr>readObject(FPtrOut));<br>
-// ASSERT_NO_ERROR(Reader.<wbr>readObject(GPtrOut));<br>
-// EXPECT_EQ(0U, Reader.bytesRemaining());<br>
-// EXPECT_EQ(0, ::memcmp(FPtr, FPtrOut, sizeof(Foo)));<br>
-// EXPECT_EQ(0, ::memcmp(GPtr, GPtrOut, sizeof(Foo)));<br>
-// }<br>
-//}<br>
+TEST_F(BinaryStreamTest, StreamReaderObject) {<br>
+ struct Foo {<br>
+ int X;<br>
+ double Y;<br>
+ char Z;<br>
+ };<br>
+<br>
+ std::vector<Foo> Foos;<br>
+ Foos.push_back({-42, 42.42, 42});<br>
+ Foos.push_back({100, 3.1415, -89});<br>
+<br>
+ const uint8_t *Bytes = reinterpret_cast<const uint8_t *>(&Foos[0]);<br>
+<br>
+ initialize(makeArrayRef(Bytes, 2 * sizeof(Foo)), 0);<br>
+<br>
+ for (auto IS : InputStreams) {<br>
+ // 1. Reading object pointers.<br>
+ BinaryStreamReader Reader(*IS);<br>
+ const Foo *FPtrOut = nullptr;<br>
+ const Foo *GPtrOut = nullptr;<br>
+ ASSERT_NO_ERROR(Reader.<wbr>readObject(FPtrOut));<br>
+ ASSERT_NO_ERROR(Reader.<wbr>readObject(GPtrOut));<br>
+ EXPECT_EQ(0U, Reader.bytesRemaining());<br>
+ EXPECT_EQ(0, ::memcmp(&Foos[0], FPtrOut, sizeof(Foo)));<br>
+ EXPECT_EQ(0, ::memcmp(&Foos[1], GPtrOut, sizeof(Foo)));<br>
+ }<br>
+}<br>
<br>
TEST_F(BinaryStreamTest, StreamReaderStrings) {<br>
std::vector<uint8_t> Bytes = {'O', 'n', 'e', '\0', 'T', 'w', 'o',<br>
<br>
Modified: llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>MappedBlockStreamTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/PDB/MappedBlockStreamTest.cpp?rev=296220&r1=296219&r2=296220&view=diff" rel="noreferrer" target="_blank" class="gmail-cremed gmail-cremed cremed">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>MappedBlockStreamTest.cpp?rev=<wbr>296220&r1=296219&r2=296220&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>MappedBlockStreamTest.cpp (original)<br>
+++ llvm/trunk/unittests/<wbr>DebugInfo/PDB/<wbr>MappedBlockStreamTest.cpp Fri Feb 24 19:20:08 2017<br>
@@ -37,7 +37,7 @@ public:<br>
uint32_t block_size() const { return 1; }<br>
uint32_t block_count() const { return Blocks.size(); }<br>
<br>
- endianness getEndian() const { return little; }<br>
+ endianness getEndian() const override { return little; }<br>
<br>
Error readBytes(uint32_t Offset, uint32_t Size,<br>
ArrayRef<uint8_t> &Buffer) override {<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" class="gmail-cremed gmail-cremed cremed">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="gmail-cremed gmail-cremed cremed">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>