encode and read param attrs along with function type. WE can now roundtrip Olden/voronoi loslessly

llvm-svn: 36735
This commit is contained in:
Chris Lattner 2007-05-04 03:41:34 +00:00
parent da3b0264f7
commit 2f3c85827e
2 changed files with 8 additions and 9 deletions

View File

@ -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]

View File

@ -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)));