Correctly handle skewed streams in drop_front() method.
When calling BinaryStreamArray::drop_front(), if the stream is skewed it means we must never drop the first bytes of the stream since offsets which occur in records assume the existence of those bytes. So if we want to skip the first record in a stream, then what we really want to do is just set the begin pointer to the next record. But we shouldn't actually remove those bytes from the underlying view of the data. llvm-svn: 349066
This commit is contained in:
parent
046d100b41
commit
a05ae9db01
|
@ -474,7 +474,10 @@ PDBLinker::mergeDebugT(ObjFile *File, CVIndexMap *ObjectIndexMap) {
|
|||
|
||||
// Drop LF_PRECOMP record from the input stream, as it needs to be replaced
|
||||
// with the precompiled headers object type stream.
|
||||
Types.drop_front();
|
||||
// Note that we can't just call Types.drop_front(), as we explicitly want to
|
||||
// rebase the stream.
|
||||
Types.setUnderlyingStream(
|
||||
Types.getUnderlyingStream().drop_front(FirstType->RecordData.size()));
|
||||
}
|
||||
|
||||
// Fill in the temporary, caller-provided ObjectIndexMap.
|
||||
|
|
|
@ -139,7 +139,7 @@ public:
|
|||
this->Skew = Skew;
|
||||
}
|
||||
|
||||
void drop_front() { Stream = Stream.drop_front(begin()->length()); }
|
||||
void drop_front() { Skew += begin()->length(); }
|
||||
|
||||
private:
|
||||
BinaryStreamRef Stream;
|
||||
|
|
Loading…
Reference in New Issue