[llvm-commits] [llvm] r173098 - in /llvm/trunk: include/llvm/IR/Attributes.h lib/IR/Attributes.cpp lib/Transforms/IPO/ArgumentPromotion.cpp lib/Transforms/IPO/DeadArgumentElimination.cpp lib/Transforms/InstCombine/InstCombineCalls.cpp
Bill Wendling
isanbard at gmail.com
Mon Jan 21 14:44:49 PST 2013
Author: void
Date: Mon Jan 21 16:44:49 2013
New Revision: 173098
URL: http://llvm.org/viewvc/llvm-project?rev=173098&view=rev
Log:
Have AttributeSet::getRetAttributes() return an AttributeSet instead of Attribute.
This further restricts the use of the Attribute class to the Attribute family of
classes.
Modified:
llvm/trunk/include/llvm/IR/Attributes.h
llvm/trunk/lib/IR/Attributes.cpp
llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp
Modified: llvm/trunk/include/llvm/IR/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Attributes.h?rev=173098&r1=173097&r2=173098&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/Attributes.h (original)
+++ llvm/trunk/include/llvm/IR/Attributes.h Mon Jan 21 16:44:49 2013
@@ -254,9 +254,7 @@
}
/// \brief The attributes for the ret value are returned.
- Attribute getRetAttributes() const {
- return getAttributes(ReturnIndex);
- }
+ AttributeSet getRetAttributes() const;
/// \brief The function attributes are returned.
AttributeSet getFnAttributes() const;
Modified: llvm/trunk/lib/IR/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Attributes.cpp?rev=173098&r1=173097&r2=173098&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Attributes.cpp (original)
+++ llvm/trunk/lib/IR/Attributes.cpp Mon Jan 21 16:44:49 2013
@@ -544,9 +544,18 @@
// AttributeSetImpl Definition
//===----------------------------------------------------------------------===//
+AttributeSet AttributeSet::getRetAttributes() const {
+ // FIXME: Remove.
+ return AttrList && hasAttributes(ReturnIndex) ?
+ AttributeSet::get(AttrList->getContext(),
+ AttributeWithIndex::get(ReturnIndex,
+ getAttributes(ReturnIndex))) :
+ AttributeSet();
+}
+
AttributeSet AttributeSet::getFnAttributes() const {
// FIXME: Remove.
- return AttrList ?
+ return AttrList && hasAttributes(FunctionIndex) ?
AttributeSet::get(AttrList->getContext(),
AttributeWithIndex::get(FunctionIndex,
getAttributes(FunctionIndex))) :
@@ -588,20 +597,22 @@
}
AttributeSet AttributeSet::get(LLVMContext &C, unsigned Idx, AttrBuilder &B) {
- SmallVector<AttributeWithIndex, 8> Attrs;
- for (AttrBuilder::iterator I = B.begin(), E = B.end(); I != E; ++I) {
- Attribute::AttrKind Kind = *I;
- Attribute A = Attribute::get(C, Kind);
-
- if (Kind == Attribute::Alignment)
- A.setAlignment(B.getAlignment());
- else if (Kind == Attribute::StackAlignment)
- A.setStackAlignment(B.getStackAlignment());
+ // FIXME: This should be implemented as a loop that creates the
+ // AttributeWithIndexes that then are used to create the AttributeSet.
+ if (!B.hasAttributes())
+ return AttributeSet();
- Attrs.push_back(AttributeWithIndex::get(Idx, A));
- }
+ uint64_t Mask = 0;
+
+ for (AttrBuilder::iterator I = B.begin(), E = B.end(); I != E; ++I)
+ Mask |= AttributeImpl::getAttrMask(*I);
- return get(C, Attrs);
+ Attribute A = Attribute::decodeLLVMAttributesForBitcode(C, Mask);
+ if (B.getAlignment())
+ A.setAlignment(B.getAlignment());
+ if (B.getStackAlignment())
+ A.setStackAlignment(B.getStackAlignment());
+ return get(C, AttributeWithIndex::get(Idx, A));
}
//===----------------------------------------------------------------------===//
Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=173098&r1=173097&r2=173098&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Mon Jan 21 16:44:49 2013
@@ -519,7 +519,8 @@
// Add any return attributes.
if (PAL.hasAttributes(AttributeSet::ReturnIndex))
- AttributesVec.push_back(AttributeWithIndex::get(AttributeSet::ReturnIndex,
+ AttributesVec.push_back(AttributeWithIndex::get(F->getContext(),
+ AttributeSet::ReturnIndex,
PAL.getRetAttributes()));
// First, determine the new argument list
@@ -639,7 +640,8 @@
// Add any return attributes.
if (CallPAL.hasAttributes(AttributeSet::ReturnIndex))
- AttributesVec.push_back(AttributeWithIndex::get(AttributeSet::ReturnIndex,
+ AttributesVec.push_back(AttributeWithIndex::get(F->getContext(),
+ AttributeSet::ReturnIndex,
CallPAL.getRetAttributes()));
// Loop over the operands, inserting GEP and loads in the caller as
Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=173098&r1=173097&r2=173098&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Mon Jan 21 16:44:49 2013
@@ -700,9 +700,6 @@
SmallVector<AttributeWithIndex, 8> AttributesVec;
const AttributeSet &PAL = F->getAttributes();
- // The existing function return attributes.
- Attribute RAttrs = PAL.getRetAttributes();
-
// Find out the new return value.
Type *RetTy = FTy->getReturnType();
Type *NRetTy = NULL;
@@ -757,21 +754,26 @@
assert(NRetTy && "No new return type found?");
+ // The existing function return attributes.
+ AttributeSet RAttrs = PAL.getRetAttributes();
+
// Remove any incompatible attributes, but only if we removed all return
// values. Otherwise, ensure that we don't have any conflicting attributes
// here. Currently, this should not be possible, but special handling might be
// required when new return value attributes are added.
if (NRetTy->isVoidTy())
RAttrs =
- Attribute::get(NRetTy->getContext(), AttrBuilder(RAttrs).
- removeAttributes(Attribute::typeIncompatible(NRetTy)));
+ AttributeSet::get(NRetTy->getContext(), AttributeSet::ReturnIndex,
+ AttrBuilder(RAttrs, AttributeSet::ReturnIndex).
+ removeAttributes(Attribute::typeIncompatible(NRetTy)));
else
- assert(!AttrBuilder(RAttrs).
+ assert(!AttrBuilder(RAttrs, AttributeSet::ReturnIndex).
hasAttributes(Attribute::typeIncompatible(NRetTy)) &&
"Return attributes no longer compatible?");
- if (RAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(AttributeSet::ReturnIndex,
+ if (RAttrs.hasAttributes(AttributeSet::ReturnIndex))
+ AttributesVec.push_back(AttributeWithIndex::get(NRetTy->getContext(),
+ AttributeSet::ReturnIndex,
RAttrs));
// Remember which arguments are still alive.
@@ -835,14 +837,16 @@
const AttributeSet &CallPAL = CS.getAttributes();
// The call return attributes.
- Attribute RAttrs = CallPAL.getRetAttributes();
+ AttributeSet RAttrs = CallPAL.getRetAttributes();
// Adjust in case the function was changed to return void.
RAttrs =
- Attribute::get(NF->getContext(), AttrBuilder(RAttrs).
+ AttributeSet::get(NF->getContext(), AttributeSet::ReturnIndex,
+ AttrBuilder(RAttrs, AttributeSet::ReturnIndex).
removeAttributes(Attribute::typeIncompatible(NF->getReturnType())));
- if (RAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(AttributeSet::ReturnIndex,
+ if (RAttrs.hasAttributes(AttributeSet::ReturnIndex))
+ AttributesVec.push_back(AttributeWithIndex::get(NF->getContext(),
+ AttributeSet::ReturnIndex,
RAttrs));
// Declare these outside of the loops, so we can reuse them for the second
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp?rev=173098&r1=173097&r2=173098&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp Mon Jan 21 16:44:49 2013
@@ -1287,10 +1287,10 @@
// mean appending it. Likewise for attributes.
// Add any result attributes.
- Attribute Attr = Attrs.getRetAttributes();
if (Attrs.hasAttributes(AttributeSet::ReturnIndex))
- NewAttrs.push_back(AttributeWithIndex::get(AttributeSet::ReturnIndex,
- Attr));
+ NewAttrs.push_back(AttributeWithIndex::get(Caller->getContext(),
+ AttributeSet::ReturnIndex,
+ Attrs.getRetAttributes()));
{
unsigned Idx = 1;
@@ -1310,7 +1310,7 @@
// Add the original argument and attributes.
NewArgs.push_back(*I);
- Attr = Attrs.getParamAttributes(Idx);
+ Attribute Attr = Attrs.getParamAttributes(Idx);
if (Attr.hasAttributes())
NewAttrs.push_back
(AttributeWithIndex::get(Idx + (Idx >= NestIdx), Attr));
More information about the llvm-commits
mailing list