RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 19:23:23 +01:00
Code Issues Projects Releases Wiki Activity

Have a single enum for "not a bitcode" error.

Browse Source 
This is more convenient for callers. No functionality change, this will
be used in a next patch to the gold plugin.

llvm-svn: 214218
This commit is contained in:
Rafael Espindola 2014-07-29 21:01:24 +00:00
parent d64b11dc6c
commit 74ac2cd9f3
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/Bitcode/ReaderWriter.h
View File

@ -142,7 +142,6 @@ namespace llvm {
const std::error_category &BitcodeErrorCategory();
enum class BitcodeError {
BitcodeStreamInvalidSize,
ConflictingMETADATA_KINDRecords,
CouldNotFindFunctionInStream,
ExpectedConstant,

12
lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -3350,12 +3350,8 @@ std::error_code BitcodeReader::InitStreamFromBuffer() {
const unsigned char *BufPtr = (const unsigned char*)Buffer->getBufferStart();
const unsigned char *BufEnd = BufPtr+Buffer->getBufferSize();
if (Buffer->getBufferSize() & 3) {
if (!isRawBitcode(BufPtr, BufEnd) && !isBitcodeWrapper(BufPtr, BufEnd))
return Error(BitcodeError::InvalidBitcodeSignature);
else
return Error(BitcodeError::BitcodeStreamInvalidSize);
}
if (Buffer->getBufferSize() & 3)
return Error(BitcodeError::InvalidBitcodeSignature);
// If we have a wrapper header, parse it and ignore the non-bc file contents.
// The magic number is 0x0B17C0DE stored in little endian.
@ -3378,7 +3374,7 @@ std::error_code BitcodeReader::InitLazyStream() {
unsigned char buf[16];
if (Bytes->readBytes(0, 16, buf) == -1)
return Error(BitcodeError::BitcodeStreamInvalidSize);
return Error(BitcodeError::InvalidBitcodeSignature);
if (!isBitcode(buf, buf + 16))
return Error(BitcodeError::InvalidBitcodeSignature);
@ -3401,8 +3397,6 @@ class BitcodeErrorCategoryType : public std::error_category {
std::string message(int IE) const override {
BitcodeError E = static_cast<BitcodeError>(IE);
switch (E) {
case BitcodeError::BitcodeStreamInvalidSize:
return "Bitcode stream length should be >= 16 bytes and a multiple of 4";
case BitcodeError::ConflictingMETADATA_KINDRecords:
return "Conflicting METADATA_KIND records";
case BitcodeError::CouldNotFindFunctionInStream: