RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 02:33:06 +01:00
Code Issues Projects Releases Wiki Activity

[Bitcode] AtEndOfStream should only check against the size if it's known.

Browse Source 
This avoids an issue where AtEndOfStream mistakenly returns true at the /start/ of
a stream.

(In the rare case that the size is known and actually 0, the slow path will still
handle it correctly.)

llvm-svn: 221840
This commit is contained in:
Jordan Rose 2014-11-13 00:08:41 +00:00
parent 337f78bb79
commit e9440a3a3a
3 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Bitcode/BitstreamReader.h
View File

@ -227,7 +227,7 @@ public:
bool AtEndOfStream() {
if (BitsInCurWord != 0)
return false;
if (Size == NextChar)
if (Size != 0 && Size == NextChar)
return true;
fillCurWord();
return BitsInCurWord == 0;

56
unittests/Bitcode/BitstreamReaderTest.cpp Normal file
View File

@ -0,0 +1,56 @@
//===- BitstreamReaderTest.cpp - Tests for BitstreamReader ----------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#include "llvm/Bitcode/BitstreamReader.h"
#include "gtest/gtest.h"
using namespace llvm;
namespace {
TEST(BitstreamReaderTest, AtEndOfStream) {
uint8_t Bytes[4] = {
0x00, 0x01, 0x02, 0x03
};
BitstreamReader Reader(std::begin(Bytes), std::end(Bytes));
BitstreamCursor Cursor(Reader);
EXPECT_FALSE(Cursor.AtEndOfStream());
(void)Cursor.Read(8);
EXPECT_FALSE(Cursor.AtEndOfStream());
(void)Cursor.Read(24);
EXPECT_TRUE(Cursor.AtEndOfStream());
Cursor.JumpToBit(0);
EXPECT_FALSE(Cursor.AtEndOfStream());
Cursor.JumpToBit(32);
EXPECT_TRUE(Cursor.AtEndOfStream());
}
TEST(BitstreamReaderTest, AtEndOfStreamJump) {
uint8_t Bytes[4] = {
0x00, 0x01, 0x02, 0x03
};
BitstreamReader Reader(std::begin(Bytes), std::end(Bytes));
BitstreamCursor Cursor(Reader);
Cursor.JumpToBit(32);
EXPECT_TRUE(Cursor.AtEndOfStream());
}
TEST(BitstreamReaderTest, AtEndOfStreamEmpty) {
uint8_t Dummy = 0xFF;
BitstreamReader Reader(&Dummy, &Dummy);
BitstreamCursor Cursor(Reader);
EXPECT_TRUE(Cursor.AtEndOfStream());
}
} // end anonymous namespace

1
unittests/Bitcode/CMakeLists.txt
View File

@ -8,4 +8,5 @@ set(LLVM_LINK_COMPONENTS
add_llvm_unittest(BitcodeTests
BitReaderTest.cpp
BitstreamReaderTest.cpp
)