Added detection of end-of-stream in deserializer.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43736
91177308-0d34-0410-b5e6-
96231b3b80d8
void RegisterPtr(const void* Ptr) {
RegisterPtr(ReadInt(),Ptr);
}
void RegisterPtr(const void* Ptr) {
RegisterPtr(ReadInt(),Ptr);
}
private:
void ReadRecord();
private:
void ReadRecord();
class Serializer {
BitstreamWriter& Stream;
SmallVector<uint64_t,10> Record;
class Serializer {
BitstreamWriter& Stream;
SmallVector<uint64_t,10> Record;
typedef DenseMap<const void*,unsigned> MapTy;
MapTy PtrMap;
typedef DenseMap<const void*,unsigned> MapTy;
MapTy PtrMap;
void Flush() { if (inRecord()) EmitRecord(); }
void Flush() { if (inRecord()) EmitRecord(); }
+ void EnterBlock(unsigned BlockID = 8, unsigned CodeLen = 3);
+ void ExitBlock();
+
private:
void EmitRecord();
inline bool inRecord() { return Record.size() > 0; }
private:
void EmitRecord();
inline bool inRecord() { return Record.size() > 0; }
// FIXME: Check if we haven't run off the edge of the stream.
// FIXME: Handle abbreviations.
// FIXME: Check if we haven't run off the edge of the stream.
// FIXME: Handle abbreviations.
+ assert (Record.size() == 0);
+
unsigned Code;
while (true) {
unsigned Code;
while (true) {
+ if (Stream.AtEndOfStream())
+ return;
+
Code = Stream.ReadCode();
if (Code == bitc::ENTER_SUBBLOCK) {
Code = Stream.ReadCode();
if (Code == bitc::ENTER_SUBBLOCK) {
assert (Record.size() == 0);
Stream.ReadRecord(Code,Record);
assert (Record.size() == 0);
Stream.ReadRecord(Code,Record);
- assert (Record.size() > 0);
+ assert (Record.size() > 0 || Stream.AtEndOfStream());
+}
+
+bool Deserializer::AtEnd() {
+ if (inRecord())
+ return false;
+
+ ReadRecord();
+
+ return Stream.AtEndOfStream();
}
uint64_t Deserializer::ReadInt() {
}
uint64_t Deserializer::ReadInt() {
using namespace llvm;
Serializer::Serializer(BitstreamWriter& stream, unsigned BlockID)
using namespace llvm;
Serializer::Serializer(BitstreamWriter& stream, unsigned BlockID)
- : Stream(stream), inBlock(BlockID >= 8) {
+ : Stream(stream), BlockLevel(0) {
- if (inBlock) Stream.EnterSubblock(8,3);
+ if (BlockID >= 8)
+ EnterBlock(8,3);
}
Serializer::~Serializer() {
if (inRecord())
EmitRecord();
}
Serializer::~Serializer() {
if (inRecord())
EmitRecord();
Stream.ExitBlock();
Stream.FlushToWord();
Stream.ExitBlock();
Stream.FlushToWord();
+void Serializer::EnterBlock(unsigned BlockID,unsigned CodeLen) {
+ Flush();
+ Stream.EnterSubblock(BlockID,CodeLen);
+ ++BlockLevel;
+}
+
+void Serializer::ExitBlock() {
+ assert (BlockLevel > 0);
+ --BlockLevel;
+ Flush();
+ Stream.ExitBlock();
+}
+
void Serializer::EmitInt(unsigned X) {
void Serializer::EmitInt(unsigned X) {
+ assert (BlockLevel > 0);
#define INT_EMIT(TYPE)\
void SerializeTrait<TYPE>::Emit(Serializer&S, TYPE X) { S.EmitInt(X); }
#define INT_EMIT(TYPE)\
void SerializeTrait<TYPE>::Emit(Serializer&S, TYPE X) { S.EmitInt(X); }