Reduce code duplication a bit. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221785 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-11-12 14:48:38 +00:00
parent e4e7ad3101
commit 8c2a55264a
2 changed files with 6 additions and 11 deletions

View File

@ -199,19 +199,14 @@ class BitstreamCursor {
public: public:
BitstreamCursor() : BitStream(nullptr), NextChar(0) {} BitstreamCursor() { init(nullptr); }
explicit BitstreamCursor(BitstreamReader &R) : BitStream(&R) { explicit BitstreamCursor(BitstreamReader &R) { init(&R); }
NextChar = 0;
CurWord = 0;
BitsInCurWord = 0;
CurCodeSize = 2;
}
void init(BitstreamReader &R) { void init(BitstreamReader *R) {
freeState(); freeState();
BitStream = &R; BitStream = R;
NextChar = 0; NextChar = 0;
CurWord = 0; CurWord = 0;
BitsInCurWord = 0; BitsInCurWord = 0;

View File

@ -3417,7 +3417,7 @@ std::error_code BitcodeReader::InitStreamFromBuffer() {
return Error(BitcodeError::InvalidBitcodeWrapperHeader); return Error(BitcodeError::InvalidBitcodeWrapperHeader);
StreamFile.reset(new BitstreamReader(BufPtr, BufEnd)); StreamFile.reset(new BitstreamReader(BufPtr, BufEnd));
Stream.init(*StreamFile); Stream.init(&*StreamFile);
return std::error_code(); return std::error_code();
} }
@ -3427,7 +3427,7 @@ std::error_code BitcodeReader::InitLazyStream() {
// see it. // see it.
StreamingMemoryObject *Bytes = new StreamingMemoryObject(LazyStreamer); StreamingMemoryObject *Bytes = new StreamingMemoryObject(LazyStreamer);
StreamFile.reset(new BitstreamReader(Bytes)); StreamFile.reset(new BitstreamReader(Bytes));
Stream.init(*StreamFile); Stream.init(&*StreamFile);
unsigned char buf[16]; unsigned char buf[16];
if (Bytes->readBytes(0, 16, buf) == -1) if (Bytes->readBytes(0, 16, buf) == -1)