| Index: lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
|
| diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
|
| index fca2ee760e09af1c50b2356626c1931c8b8e191b..3e5f58d9e08a50f854e11ce9aff2a126aed0c60e 100644
|
| --- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
|
| +++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
|
| @@ -1848,12 +1848,13 @@ std::error_code NaClBitcodeReader::InitStreamFromBuffer() {
|
| if (Header.Read(HeaderPtr, BufEnd))
|
| return Error(InvalidBitstream, Header.Unsupported());
|
|
|
| - StreamFile.reset(new NaClBitstreamReader(BufPtr, BufEnd,
|
| - Header.getHeaderSize()));
|
| - Stream.init(StreamFile.get());
|
| -
|
| if (AcceptHeader())
|
| return Error(InvalidBitstream, Header.Unsupported());
|
| +
|
| + StreamFile.reset(new NaClBitstreamReader(
|
| + getNonStreamedMemoryObject(BufPtr, BufEnd), Header));
|
| + Stream.init(StreamFile.get());
|
| +
|
| return std::error_code();
|
| }
|
|
|
| @@ -1861,11 +1862,11 @@ std::error_code NaClBitcodeReader::InitLazyStream() {
|
| if (Header.Read(LazyStreamer))
|
| return Error(InvalidBitstream, Header.Unsupported());
|
|
|
| - StreamFile.reset(new NaClBitstreamReader(LazyStreamer,
|
| - Header.getHeaderSize()));
|
| - Stream.init(StreamFile.get());
|
| if (AcceptHeader())
|
| return Error(InvalidBitstream, Header.Unsupported());
|
| +
|
| + StreamFile.reset(new NaClBitstreamReader(LazyStreamer, Header));
|
| + Stream.init(StreamFile.get());
|
| return std::error_code();
|
| }
|
|
|
|
|