aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Bitcode/Reader/BitcodeReader.cpp2
-rw-r--r--lib/IR/AttributeImpl.h4
-rw-r--r--lib/IR/Attributes.cpp37
-rw-r--r--lib/IR/Core.cpp4
4 files changed, 25 insertions, 22 deletions
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 59cda22..3bd64a9 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -477,7 +477,7 @@ bool BitcodeReader::ParseAttributeBlock() {
for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
Attribute ReconstitutedAttr =
Attribute::decodeLLVMAttributesForBitcode(Context, Record[i+1]);
- Record[i+1] = ReconstitutedAttr.getBitMask();
+ Record[i+1] = ReconstitutedAttr.Raw();
}
for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
diff --git a/lib/IR/AttributeImpl.h b/lib/IR/AttributeImpl.h
index 1164d68..10f30e7 100644
--- a/lib/IR/AttributeImpl.h
+++ b/lib/IR/AttributeImpl.h
@@ -57,7 +57,7 @@ public:
bool operator==(StringRef Kind) const;
bool operator!=(StringRef Kind) const;
- uint64_t getBitMask() const; // FIXME: Remove.
+ uint64_t Raw() const; // FIXME: Remove.
static uint64_t getAttrMask(Attribute::AttrKind Val);
@@ -93,7 +93,7 @@ public:
ArrayRef<AttributeWithIndex> AttrList){
for (unsigned i = 0, e = AttrList.size(); i != e; ++i) {
ID.AddInteger(AttrList[i].Index);
- ID.AddInteger(AttrList[i].Attrs.getBitMask());
+ ID.AddInteger(AttrList[i].Attrs.Raw());
}
}
};
diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index a1f306c..5024a63 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -45,7 +45,7 @@ Attribute Attribute::get(LLVMContext &Context, AttrBuilder &B) {
// Otherwise, build a key to look up the existing attributes.
LLVMContextImpl *pImpl = Context.pImpl;
FoldingSetNodeID ID;
- ID.AddInteger(B.getBitMask());
+ ID.AddInteger(B.Raw());
void *InsertPoint;
AttributeImpl *PA = pImpl->AttrsSet.FindNodeOrInsertPos(ID, InsertPoint);
@@ -53,7 +53,7 @@ Attribute Attribute::get(LLVMContext &Context, AttrBuilder &B) {
if (!PA) {
// If we didn't find any existing attributes of the same shape then create a
// new one and insert it.
- PA = new AttributeImpl(Context, B.getBitMask());
+ PA = new AttributeImpl(Context, B.Raw());
pImpl->AttrsSet.InsertNode(PA, InsertPoint);
}
@@ -103,8 +103,8 @@ bool Attribute::operator!=(AttrKind K) const {
return !(*this == K);
}
-uint64_t Attribute::getBitMask() const {
- return pImpl ? pImpl->getBitMask() : 0;
+uint64_t Attribute::Raw() const {
+ return pImpl ? pImpl->Raw() : 0;
}
Attribute Attribute::typeIncompatible(Type *Ty) {
@@ -139,10 +139,10 @@ uint64_t Attribute::encodeLLVMAttributesForBitcode(Attribute Attrs) {
// Store the alignment in the bitcode as a 16-bit raw value instead of a 5-bit
// log2 encoded value. Shift the bits above the alignment up by 11 bits.
- uint64_t EncodedAttrs = Attrs.getBitMask() & 0xffff;
+ uint64_t EncodedAttrs = Attrs.Raw() & 0xffff;
if (Attrs.hasAttribute(Attribute::Alignment))
EncodedAttrs |= Attrs.getAlignment() << 16;
- EncodedAttrs |= (Attrs.getBitMask() & (0xffffULL << 21)) << 11;
+ EncodedAttrs |= (Attrs.Raw() & (0xffffULL << 21)) << 11;
return EncodedAttrs;
}
@@ -320,7 +320,7 @@ AttrBuilder &AttrBuilder::addRawValue(uint64_t Val) {
}
AttrBuilder &AttrBuilder::addAttributes(const Attribute &A) {
- uint64_t Mask = A.getBitMask();
+ uint64_t Mask = A.Raw();
for (Attribute::AttrKind I = Attribute::None; I != Attribute::EndAttrKinds;
I = Attribute::AttrKind(I + 1)) {
@@ -338,7 +338,7 @@ AttrBuilder &AttrBuilder::addAttributes(const Attribute &A) {
}
AttrBuilder &AttrBuilder::removeAttributes(const Attribute &A){
- uint64_t Mask = A.getBitMask();
+ uint64_t Mask = A.Raw();
for (Attribute::AttrKind I = Attribute::None; I != Attribute::EndAttrKinds;
I = Attribute::AttrKind(I + 1)) {
@@ -364,14 +364,14 @@ bool AttrBuilder::hasAttributes() const {
}
bool AttrBuilder::hasAttributes(const Attribute &A) const {
- return getBitMask() & A.getBitMask();
+ return Raw() & A.Raw();
}
bool AttrBuilder::hasAlignmentAttr() const {
return Alignment != 0;
}
-uint64_t AttrBuilder::getBitMask() const {
+uint64_t AttrBuilder::Raw() const {
uint64_t Mask = 0;
for (DenseSet<Attribute::AttrKind>::const_iterator I = Attrs.begin(),
@@ -438,7 +438,7 @@ bool AttributeImpl::operator!=(StringRef Kind) const {
return !(*this == Kind);
}
-uint64_t AttributeImpl::getBitMask() const {
+uint64_t AttributeImpl::Raw() const {
// FIXME: Remove this.
return cast<ConstantInt>(Data)->getZExtValue();
}
@@ -485,15 +485,15 @@ uint64_t AttributeImpl::getAttrMask(Attribute::AttrKind Val) {
}
bool AttributeImpl::hasAttribute(Attribute::AttrKind A) const {
- return (getBitMask() & getAttrMask(A)) != 0;
+ return (Raw() & getAttrMask(A)) != 0;
}
bool AttributeImpl::hasAttributes() const {
- return getBitMask() != 0;
+ return Raw() != 0;
}
uint64_t AttributeImpl::getAlignment() const {
- return getBitMask() & getAttrMask(Attribute::Alignment);
+ return Raw() & getAttrMask(Attribute::Alignment);
}
void AttributeImpl::setAlignment(unsigned Align) {
@@ -501,7 +501,7 @@ void AttributeImpl::setAlignment(unsigned Align) {
}
uint64_t AttributeImpl::getStackAlignment() const {
- return getBitMask() & getAttrMask(Attribute::StackAlignment);
+ return Raw() & getAttrMask(Attribute::StackAlignment);
}
void AttributeImpl::setStackAlignment(unsigned Align) {
@@ -511,9 +511,12 @@ void AttributeImpl::setStackAlignment(unsigned Align) {
void AttributeImpl::Profile(FoldingSetNodeID &ID, Constant *Data,
ArrayRef<Constant*> Vals) {
ID.AddInteger(cast<ConstantInt>(Data)->getZExtValue());
+#if 0
+ // FIXME: Not yet supported.
for (ArrayRef<Constant*>::iterator I = Vals.begin(), E = Vals.end();
I != E; ++I)
ID.AddPointer(*I);
+#endif
}
//===----------------------------------------------------------------------===//
@@ -611,9 +614,9 @@ unsigned AttributeSet::getStackAlignment(unsigned Index) const {
return getAttributes(Index).getStackAlignment();
}
-uint64_t AttributeSet::getBitMask(unsigned Index) const {
+uint64_t AttributeSet::Raw(unsigned Index) const {
// FIXME: Remove this.
- return getAttributes(Index).getBitMask();
+ return getAttributes(Index).Raw();
}
/// getAttributes - The attributes for the specified index are returned.
diff --git a/lib/IR/Core.cpp b/lib/IR/Core.cpp
index 2024ac9..12cb971 100644
--- a/lib/IR/Core.cpp
+++ b/lib/IR/Core.cpp
@@ -1401,7 +1401,7 @@ void LLVMRemoveFunctionAttr(LLVMValueRef Fn, LLVMAttribute PA) {
LLVMAttribute LLVMGetFunctionAttr(LLVMValueRef Fn) {
Function *Func = unwrap<Function>(Fn);
const AttributeSet PAL = Func->getAttributes();
- return (LLVMAttribute)PAL.getBitMask(AttributeSet::FunctionIndex);
+ return (LLVMAttribute)PAL.Raw(AttributeSet::FunctionIndex);
}
/*--.. Operations on parameters ............................................--*/
@@ -1477,7 +1477,7 @@ void LLVMRemoveAttribute(LLVMValueRef Arg, LLVMAttribute PA) {
LLVMAttribute LLVMGetAttribute(LLVMValueRef Arg) {
Argument *A = unwrap<Argument>(Arg);
return (LLVMAttribute)A->getParent()->getAttributes().
- getBitMask(A->getArgNo()+1);
+ Raw(A->getArgNo()+1);
}
generated by cgit v1.1 at 2025-03-15 07:53:49 +0000