replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make the autoupgrade code for ret attributes dramatically simpler 

and actually work.  We can now read the llvm 2.3 bc file from PR2849

llvm-svn: 57122
This commit is contained in:
Chris Lattner 2008-10-05 18:22:09 +00:00
parent c181b01681
commit 4744ed5f94
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -355,10 +355,10 @@ bool BitcodeReader::ParseAttributeBlock() {
if (Record.size() & 1)
return Error("Invalid ENTRY record");
// FIXME : Remove this backword compatibility one day.
// FIXME : Remove this autoupgrade code in LLVM 3.0.
// If Function attributes are using index 0 then transfer them
// to index ~0. Index 0 is strictly used for return value
// attributes.
// to index ~0. Index 0 is used for return value attributes but used to be
// used for function attributes.
Attributes RetAttribute = Attribute::None;
Attributes FnAttribute = Attribute::None;
for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
@ -367,39 +367,31 @@ bool BitcodeReader::ParseAttributeBlock() {
else if (Record[i] == ~0U)
FnAttribute = Record[i+1];
}
bool useUpdatedAttrs = false;
if (FnAttribute == Attribute::None && RetAttribute != Attribute::None) {
if (RetAttribute & Attribute::NoUnwind) {
FnAttribute = FnAttribute | Attribute::NoUnwind;
RetAttribute = RetAttribute ^ Attribute::NoUnwind;
useUpdatedAttrs = true;
}
if (RetAttribute & Attribute::NoReturn) {
FnAttribute = FnAttribute | Attribute::NoReturn;
RetAttribute = RetAttribute ^ Attribute::NoReturn;
useUpdatedAttrs = true;
}
if (RetAttribute & Attribute::ReadOnly) {
FnAttribute = FnAttribute | Attribute::ReadOnly;
RetAttribute = RetAttribute ^ Attribute::ReadOnly;
useUpdatedAttrs = true;
}
if (RetAttribute & Attribute::ReadNone) {
FnAttribute = FnAttribute | Attribute::ReadNone;
RetAttribute = RetAttribute ^ Attribute::ReadNone;
useUpdatedAttrs = true;
unsigned OldRetAttrs = (Attribute::NoUnwind|Attribute::NoReturn|
Attribute::ReadOnly|Attribute::ReadNone);
if (FnAttribute == Attribute::None && RetAttribute != Attribute::None &&
(RetAttribute & OldRetAttrs) != 0) {
if (FnAttribute == Attribute::None) { // add a slot so they get added.
Record.push_back(~0U);
Record.push_back(0);
}
FnAttribute |= RetAttribute & OldRetAttrs;
RetAttribute &= ~OldRetAttrs;
}
for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
if (useUpdatedAttrs && Record[i] == 0
&& RetAttribute != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(0, RetAttribute));
else if (Record[i+1] != Attribute::None)
if (Record[i] == 0) {
if (RetAttribute != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(0, RetAttribute));
} else if (Record[i] == ~0U) {
if (FnAttribute != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(~0U, FnAttribute));
} else if (Record[i+1] != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(Record[i], Record[i+1]));
}
if (useUpdatedAttrs && FnAttribute != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(~0, FnAttribute));
MAttributes.push_back(AttrListPtr::get(Attrs.begin(), Attrs.end()));
Attrs.clear();