| Index: lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
|
| diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
|
| index 8b8e9072a877a65c90b20a49847815d08669417f..019a65cf7b1abf4bdadd7a716769d7aab48ba9bc 100644
|
| --- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
|
| +++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
|
| @@ -986,7 +986,7 @@ bool NaClBitcodeReader::ParseBitcodeInto(Module *M) {
|
| M->setDataLayout("e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"
|
| "f32:32:32-f64:64:64-p:32:32:32-v128:32:32");
|
|
|
| - if (InitStream()) return Error(Header.Unsupported());
|
| + if (InitStream()) return true; // InitSream will set the error string.
|
|
|
| // We expect a number of well-defined blocks, though we don't necessarily
|
| // need to understand them all.
|
| @@ -1753,22 +1753,26 @@ bool NaClBitcodeReader::InitStreamFromBuffer() {
|
| return Error("Bitcode stream should be a multiple of 4 bytes in length");
|
|
|
| if (Header.Read(BufPtr, BufEnd))
|
| - return Error("Invalid PNaCl bitcode header");
|
| + return Error(Header.Unsupported());
|
|
|
| StreamFile.reset(new NaClBitstreamReader(BufPtr, BufEnd));
|
| Stream.init(*StreamFile);
|
|
|
| - return AcceptHeader();
|
| + if (AcceptHeader())
|
| + return Error(Header.Unsupported());
|
| + return false;
|
| }
|
|
|
| bool NaClBitcodeReader::InitLazyStream() {
|
| StreamingMemoryObject *Bytes = new StreamingMemoryObject(LazyStreamer);
|
| if (Header.Read(Bytes))
|
| - return Error("Invalid PNaCl bitcode header");
|
| + return Error(Header.Unsupported());
|
|
|
| StreamFile.reset(new NaClBitstreamReader(Bytes, Header.getHeaderSize()));
|
| Stream.init(*StreamFile);
|
| - return AcceptHeader();
|
| + if (AcceptHeader())
|
| + return Error(Header.Unsupported());
|
| + return false;
|
| }
|
|
|
| //===----------------------------------------------------------------------===//
|
|
|