mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-11-01 15:11:24 +00:00
remove autoupgrade code for old function attributes format.
I still left another fixme regarding alignment, because I'm unsure how to remove that code without breaking things git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@156387 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
cbfc61bec1
commit
006c7b969a
@ -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])));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user