6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-12 23:37:33 +00:00
Code Issues Projects Releases Wiki Activity

Revert everything to r171366 to try to fix the build.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171450 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-01-03 02:01:50 +00:00
parent 43f3928c79
commit e5ab1bee8c
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/IR/AttributeImpl.h
View File

@ -45,7 +45,7 @@ public:
bool contains(Attribute::AttrKind Kind) const;
bool contains(StringRef Kind) const;
bool hasAttribute(Attribute::AttrKind A) const;
bool hasAttribute(uint64_t A) const;
bool hasAttributes() const;
bool hasAttributes(const Attribute &A) const;
@ -69,7 +69,7 @@ public:
uint64_t getBitMask() const; // FIXME: Remove.
static uint64_t getAttrMask(Attribute::AttrKind Val);
static uint64_t getAttrMask(uint64_t Val);
void Profile(FoldingSetNodeID &ID) const {
Profile(ID, Data, Vals);

25
lib/IR/Attributes.cpp
View File

@ -233,15 +233,8 @@ std::string Attribute::getAsString() const {
// AttrBuilder Implementation
//===----------------------------------------------------------------------===//
void AttrBuilder::clear() {
AttrSet.clear();
Alignment = StackAlignment = Bits = 0;
}
AttrBuilder &AttrBuilder::addAttribute(Attribute::AttrKind Val){
Bits |= AttributeImpl::getAttrMask(Val);
AttrSet.insert(Val);
return *this;
}
@ -255,31 +248,19 @@ AttrBuilder &AttrBuilder::addAlignmentAttr(unsigned Align) {
assert(isPowerOf2_32(Align) && "Alignment must be a power of two.");
assert(Align <= 0x40000000 && "Alignment too large.");
Bits |= (Log2_32(Align) + 1) << 16;
AttrSet.insert(Attribute::Alignment);
Alignment = Align;
return *this;
}
AttrBuilder &AttrBuilder::addStackAlignmentAttr(unsigned Align) {
AttrBuilder &AttrBuilder::addStackAlignmentAttr(unsigned Align){
// Default alignment, allow the target to define how to align it.
if (Align == 0) return *this;
assert(isPowerOf2_32(Align) && "Alignment must be a power of two.");
assert(Align <= 0x100 && "Alignment too large.");
Bits |= (Log2_32(Align) + 1) << 26;
AttrSet.insert(Attribute::StackAlignment);
StackAlignment = Align;
return *this;
}
AttrBuilder &AttrBuilder::removeAttribute(Attribute::AttrKind Val) {
Bits &= ~AttributeImpl::getAttrMask(Val);
AttrSet.erase(Val);
if (Val == Attribute::Alignment)
Alignment = 0;
else if (Val == Attribute::StackAlignment)
StackAlignment = 0;
return *this;
}
@ -359,7 +340,7 @@ uint64_t AttributeImpl::getBitMask() const {
return cast<ConstantInt>(Data)->getZExtValue();
}
uint64_t AttributeImpl::getAttrMask(Attribute::AttrKind Val) {
uint64_t AttributeImpl::getAttrMask(uint64_t Val) {
switch (Val) {
case Attribute::None: return 0;
case Attribute::ZExt: return 1 << 0;
@ -395,7 +376,7 @@ uint64_t AttributeImpl::getAttrMask(Attribute::AttrKind Val) {
llvm_unreachable("Unsupported attribute type");
}
bool AttributeImpl::hasAttribute(Attribute::AttrKind A) const {
bool AttributeImpl::hasAttribute(uint64_t A) const {
return (getBitMask() & getAttrMask(A)) != 0;
}