mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
Have AttributeSet::getRetAttributes() return an AttributeSet instead of Attribute.
This further restricts the use of the Attribute class to the Attribute family of classes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173098 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
c5f1bc88a2
commit
3fc4b96b50
@ -254,9 +254,7 @@ public:
|
||||
}
|
||||
|
||||
/// \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;
|
||||
|
@ -544,9 +544,18 @@ AttributeWithIndex AttributeWithIndex::get(LLVMContext &C, unsigned Idx,
|
||||
// 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,
|
||||
}
|
||||
|
||||
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);
|
||||
// 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();
|
||||
|
||||
if (Kind == Attribute::Alignment)
|
||||
uint64_t Mask = 0;
|
||||
|
||||
for (AttrBuilder::iterator I = B.begin(), E = B.end(); I != E; ++I)
|
||||
Mask |= AttributeImpl::getAttrMask(*I);
|
||||
|
||||
Attribute A = Attribute::decodeLLVMAttributesForBitcode(C, Mask);
|
||||
if (B.getAlignment())
|
||||
A.setAlignment(B.getAlignment());
|
||||
else if (Kind == Attribute::StackAlignment)
|
||||
if (B.getStackAlignment())
|
||||
A.setStackAlignment(B.getStackAlignment());
|
||||
|
||||
Attrs.push_back(AttributeWithIndex::get(Idx, A));
|
||||
}
|
||||
|
||||
return get(C, Attrs);
|
||||
return get(C, AttributeWithIndex::get(Idx, A));
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
@ -519,7 +519,8 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,
|
||||
|
||||
// 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 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,
|
||||
|
||||
// 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
|
||||
|
@ -700,9 +700,6 @@ bool DAE::RemoveDeadStuffFromFunction(Function *F) {
|
||||
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 @@ bool DAE::RemoveDeadStuffFromFunction(Function *F) {
|
||||
|
||||
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).
|
||||
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 @@ bool DAE::RemoveDeadStuffFromFunction(Function *F) {
|
||||
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
|
||||
|
@ -1287,10 +1287,10 @@ InstCombiner::transformCallThroughTrampoline(CallSite CS,
|
||||
// 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 @@ InstCombiner::transformCallThroughTrampoline(CallSite CS,
|
||||
|
||||
// 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));
|
||||
|
Loading…
Reference in New Issue
Block a user