diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 13 | ||||
| -rw-r--r-- | lib/Bitcode/Writer/BitcodeWriter.cpp | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index ca372d6..c0487d5 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -313,16 +313,15 @@ bool BitcodeReader::ParseTypeTable() { ResultTy = PointerType::get(getTypeByID(Record[0], true)); break; case bitc::TYPE_CODE_FUNCTION: { - // FUNCTION: [vararg, retty, #pararms, paramty N] - if (Record.size() < 3 || Record.size() < Record[2]+3) + // FUNCTION: [vararg, attrid, retty, #pararms, paramty N] + if (Record.size() < 4 || Record.size() < Record[3]+4) return Error("Invalid FUNCTION type record"); std::vector<const Type*> ArgTys; - for (unsigned i = 0, e = Record[2]; i != e; ++i) - ArgTys.push_back(getTypeByID(Record[3+i], true)); + for (unsigned i = 0, e = Record[3]; i != e; ++i) + ArgTys.push_back(getTypeByID(Record[4+i], true)); - // FIXME: PARAM TYS. - ResultTy = FunctionType::get(getTypeByID(Record[1], true), ArgTys, - Record[0]); + ResultTy = FunctionType::get(getTypeByID(Record[2], true), ArgTys, + Record[0], getParamAttrs(Record[1])); break; } case bitc::TYPE_CODE_STRUCT: { // STRUCT: [ispacked, #elts, eltty x N] diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 7a875a0..4ca6c24 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -145,11 +145,11 @@ static void WriteTypeTable(const ValueEnumerator &VE, BitstreamWriter &Stream) { case Type::FunctionTyID: { const FunctionType *FT = cast<FunctionType>(T); - // FUNCTION: [isvararg, #pararms, paramty x N] + // FUNCTION: [isvararg, attrid, #pararms, paramty x N] Code = bitc::TYPE_CODE_FUNCTION; TypeVals.push_back(FT->isVarArg()); + TypeVals.push_back(VE.getParamAttrID(FT->getParamAttrs())); TypeVals.push_back(VE.getTypeID(FT->getReturnType())); - // FIXME: PARAM ATTR ID! TypeVals.push_back(FT->getNumParams()); for (unsigned i = 0, e = FT->getNumParams(); i != e; ++i) TypeVals.push_back(VE.getTypeID(FT->getParamType(i))); |