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

remove autoupgrade code for old function attributes format.

Browse Source 
I still left another fixme regarding alignment, because I'm unsure how to remove that code without breaking things

llvm-svn: 156387
This commit is contained in:
Nuno Lopes 2012-05-08 17:07:35 +00:00
parent 1231cbed55
commit 5567843ed2
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,12 +458,6 @@ bool BitcodeReader::ParseAttributeBlock() {
if (Record.size() & 1)
return Error("Invalid ENTRY record");
// 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 used for return value attributes but used to be
// used for function attributes.
Attributes RetAttribute;
Attributes FnAttribute;
for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
// FIXME: remove in LLVM 3.0
// The alignment is stored as a 16-bit raw value from bits 31--16.
@ -480,34 +474,10 @@ bool BitcodeReader::ParseAttributeBlock() {
Attributes((Record[i+1] & (0xffffull << 32)) >> 11);
Record[i+1] = ReconstitutedAttr.Raw();
if (Record[i] == 0)
RetAttribute = ReconstitutedAttr;
else if (Record[i] == ~0U)
FnAttribute = ReconstitutedAttr;
}
Attributes OldRetAttrs = (Attribute::NoUnwind|Attribute::NoReturn|
Attribute::ReadOnly|Attribute::ReadNone);
if (FnAttribute == Attribute::None && RetAttribute != Attribute::None &&
(RetAttribute & OldRetAttrs)) {
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 (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 (Attributes(Record[i+1]) != Attribute::None)
if (Attributes(Record[i+1]) != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(Record[i],
Attributes(Record[i+1])));
}