diff options
author | Bill Wendling <isanbard@gmail.com> | 2012-10-14 06:39:53 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2012-10-14 06:39:53 +0000 |
commit | 5886b7bfc82385dfd35b7602304c86075e1d72e6 (patch) | |
tree | b818eb58d9335787f839a6e1757f5350185bb157 /lib/VMCore | |
parent | a19a53065fcaa6fafce902efde38fcae7b0bdea4 (diff) | |
download | external_llvm-5886b7bfc82385dfd35b7602304c86075e1d72e6.zip external_llvm-5886b7bfc82385dfd35b7602304c86075e1d72e6.tar.gz external_llvm-5886b7bfc82385dfd35b7602304c86075e1d72e6.tar.bz2 |
Remove the bitwise NOT operator from the Attributes class. Replace it with the equivalent from the builder class.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165892 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore')
-rw-r--r-- | lib/VMCore/Attributes.cpp | 18 | ||||
-rw-r--r-- | lib/VMCore/Core.cpp | 5 | ||||
-rw-r--r-- | lib/VMCore/Function.cpp | 2 | ||||
-rw-r--r-- | lib/VMCore/Instructions.cpp | 4 |
4 files changed, 16 insertions, 13 deletions
diff --git a/lib/VMCore/Attributes.cpp b/lib/VMCore/Attributes.cpp index 4f3200b..326afc7 100644 --- a/lib/VMCore/Attributes.cpp +++ b/lib/VMCore/Attributes.cpp @@ -110,9 +110,6 @@ Attributes &Attributes::operator &= (const Attributes &A) { Attrs.Bits &= A.Raw(); return *this; } -Attributes Attributes::operator ~ () const { - return Attributes(~Raw()); -} uint64_t Attributes::Raw() const { return Attrs.Bits; @@ -242,8 +239,10 @@ removeAttribute(Attributes::AttrVal Val) { return *this; } -void Attributes::Builder::removeAttributes(const Attributes &A) { +Attributes::Builder &Attributes::Builder:: +removeAttributes(const Attributes &A) { Bits &= ~A.Raw(); + return *this; } bool Attributes::Builder::hasAttribute(Attributes::AttrVal A) const { @@ -548,7 +547,8 @@ AttrListPtr AttrListPtr::addAttr(unsigned Idx, Attributes Attrs) const { return get(NewAttrList); } -AttrListPtr AttrListPtr::removeAttr(unsigned Idx, Attributes Attrs) const { +AttrListPtr AttrListPtr::removeAttr(LLVMContext &C, unsigned Idx, + Attributes Attrs) const { #ifndef NDEBUG // FIXME it is not obvious how this should work for alignment. // For now, say we can't pass in alignment, which no current use does. @@ -558,8 +558,9 @@ AttrListPtr AttrListPtr::removeAttr(unsigned Idx, Attributes Attrs) const { if (AttrList == 0) return AttrListPtr(); Attributes OldAttrs = getAttributes(Idx); - Attributes NewAttrs = OldAttrs & ~Attrs; - if (NewAttrs == OldAttrs) + Attributes::Builder NewAttrs = + Attributes::Builder(OldAttrs).removeAttributes(Attrs); + if (NewAttrs == Attributes::Builder(OldAttrs)) return *this; SmallVector<AttributeWithIndex, 8> NewAttrList; @@ -572,7 +573,8 @@ AttrListPtr AttrListPtr::removeAttr(unsigned Idx, Attributes Attrs) const { // If there are attributes already at this index, merge them in. assert(OldAttrList[i].Index == Idx && "Attribute isn't set?"); - Attrs = OldAttrList[i].Attrs & ~Attrs; + Attrs = Attributes::get(C, Attributes::Builder(OldAttrList[i].Attrs). + removeAttributes(Attrs)); ++i; if (Attrs) // If any attributes left for this parameter, add them. NewAttrList.push_back(AttributeWithIndex::get(Idx, Attrs)); diff --git a/lib/VMCore/Core.cpp b/lib/VMCore/Core.cpp index 7973325..bafdfa3 100644 --- a/lib/VMCore/Core.cpp +++ b/lib/VMCore/Core.cpp @@ -1388,7 +1388,8 @@ void LLVMAddFunctionAttr(LLVMValueRef Fn, LLVMAttribute PA) { void LLVMRemoveFunctionAttr(LLVMValueRef Fn, LLVMAttribute PA) { Function *Func = unwrap<Function>(Fn); const AttrListPtr PAL = Func->getAttributes(); - const AttrListPtr PALnew = PAL.removeAttr(~0U, Attributes(PA)); + const AttrListPtr PALnew = PAL.removeAttr(Func->getContext(), ~0U, + Attributes(PA)); Func->setAttributes(PALnew); } @@ -1673,7 +1674,7 @@ void LLVMRemoveInstrAttribute(LLVMValueRef Instr, unsigned index, LLVMAttribute PA) { CallSite Call = CallSite(unwrap<Instruction>(Instr)); Call.setAttributes( - Call.getAttributes().removeAttr(index, Attributes(PA))); + Call.getAttributes().removeAttr(Call->getContext(), index, Attributes(PA))); } void LLVMSetInstrParamAlignment(LLVMValueRef Instr, unsigned index, diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index 5c2a03c..15e9f7c 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -255,7 +255,7 @@ void Function::addAttribute(unsigned i, Attributes attr) { void Function::removeAttribute(unsigned i, Attributes attr) { AttrListPtr PAL = getAttributes(); - PAL = PAL.removeAttr(i, attr); + PAL = PAL.removeAttr(getContext(), i, attr); setAttributes(PAL); } diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp index 74c0c6e..15bc3ae 100644 --- a/lib/VMCore/Instructions.cpp +++ b/lib/VMCore/Instructions.cpp @@ -338,7 +338,7 @@ void CallInst::addAttribute(unsigned i, Attributes attr) { void CallInst::removeAttribute(unsigned i, Attributes attr) { AttrListPtr PAL = getAttributes(); - PAL = PAL.removeAttr(i, attr); + PAL = PAL.removeAttr(getContext(), i, attr); setAttributes(PAL); } @@ -594,7 +594,7 @@ void InvokeInst::addAttribute(unsigned i, Attributes attr) { void InvokeInst::removeAttribute(unsigned i, Attributes attr) { AttrListPtr PAL = getAttributes(); - PAL = PAL.removeAttr(i, attr); + PAL = PAL.removeAttr(getContext(), i, attr); setAttributes(PAL); } |