diff options
| -rw-r--r-- | include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h | 3 | ||||
| -rw-r--r-- | lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp | 20 |
2 files changed, 1 insertions, 22 deletions
diff --git a/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h b/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h index 85a7dea914..ebe5a972e5 100644 --- a/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h +++ b/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h @@ -87,8 +87,7 @@ namespace naclbitc { TYPE_CODE_INTEGER = 7, // INTEGER: [width] TYPE_CODE_POINTER = 8, // POINTER: [pointee type] - TYPE_CODE_FUNCTION_OLD = 9, // FUNCTION: [vararg, attrid, retty, - // paramty x N] + TYPE_CODE_FUNCTION_OLD = 9, // Not used in PNaCl. TYPE_CODE_HALF = 10, // HALF diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp index c1fbe08edb..a38b18afa1 100644 --- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp +++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp @@ -480,26 +480,6 @@ bool NaClBitcodeReader::ParseTypeTableBody() { ResultTy = PointerType::get(ResultTy, AddressSpace); break; } - case naclbitc::TYPE_CODE_FUNCTION_OLD: { - // FIXME: attrid is dead, remove it in LLVM 4.0 - // FUNCTION: [vararg, attrid, retty, paramty x N] - if (Record.size() < 3) - return Error("Invalid FUNCTION type record"); - SmallVector<Type*, 8> ArgTys; - for (unsigned i = 3, e = Record.size(); i != e; ++i) { - if (Type *T = getTypeByID(Record[i])) - ArgTys.push_back(T); - else - break; - } - - ResultTy = getTypeByID(Record[2]); - if (ResultTy == 0 || ArgTys.size() < Record.size()-3) - return Error("invalid type in function type"); - - ResultTy = FunctionType::get(ResultTy, ArgTys, Record[0]); - break; - } case naclbitc::TYPE_CODE_FUNCTION: { // FUNCTION: [vararg, retty, paramty x N] if (Record.size() < 2) |