mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-26 12:20:42 +00:00
s/AttrListPtr/AttributeSet/g to better label what this class is going to be in the near future.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169651 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -982,7 +982,7 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) {
|
||||
if (Callee == 0)
|
||||
return false;
|
||||
Instruction *Caller = CS.getInstruction();
|
||||
const AttrListPtr &CallerPAL = CS.getAttributes();
|
||||
const AttributeSet &CallerPAL = CS.getAttributes();
|
||||
|
||||
// Okay, this is a cast from a function to a different type. Unless doing so
|
||||
// would cause a type conversion of one of our arguments, change this call to
|
||||
@@ -1123,7 +1123,7 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) {
|
||||
// Add the new return attributes.
|
||||
if (RAttrs.hasAttributes())
|
||||
attrVec.push_back(
|
||||
AttributeWithIndex::get(AttrListPtr::ReturnIndex,
|
||||
AttributeWithIndex::get(AttributeSet::ReturnIndex,
|
||||
Attributes::get(FT->getContext(), RAttrs)));
|
||||
|
||||
AI = CS.arg_begin();
|
||||
@@ -1176,13 +1176,13 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) {
|
||||
|
||||
Attributes FnAttrs = CallerPAL.getFnAttributes();
|
||||
if (FnAttrs.hasAttributes())
|
||||
attrVec.push_back(AttributeWithIndex::get(AttrListPtr::FunctionIndex,
|
||||
attrVec.push_back(AttributeWithIndex::get(AttributeSet::FunctionIndex,
|
||||
FnAttrs));
|
||||
|
||||
if (NewRetTy->isVoidTy())
|
||||
Caller->setName(""); // Void type should not have a name.
|
||||
|
||||
const AttrListPtr &NewCallerPAL = AttrListPtr::get(Callee->getContext(),
|
||||
const AttributeSet &NewCallerPAL = AttributeSet::get(Callee->getContext(),
|
||||
attrVec);
|
||||
|
||||
Instruction *NC;
|
||||
@@ -1243,7 +1243,7 @@ InstCombiner::transformCallThroughTrampoline(CallSite CS,
|
||||
Value *Callee = CS.getCalledValue();
|
||||
PointerType *PTy = cast<PointerType>(Callee->getType());
|
||||
FunctionType *FTy = cast<FunctionType>(PTy->getElementType());
|
||||
const AttrListPtr &Attrs = CS.getAttributes();
|
||||
const AttributeSet &Attrs = CS.getAttributes();
|
||||
|
||||
// If the call already has the 'nest' attribute somewhere then give up -
|
||||
// otherwise 'nest' would occur twice after splicing in the chain.
|
||||
@@ -1258,7 +1258,7 @@ InstCombiner::transformCallThroughTrampoline(CallSite CS,
|
||||
PointerType *NestFPTy = cast<PointerType>(NestF->getType());
|
||||
FunctionType *NestFTy = cast<FunctionType>(NestFPTy->getElementType());
|
||||
|
||||
const AttrListPtr &NestAttrs = NestF->getAttributes();
|
||||
const AttributeSet &NestAttrs = NestF->getAttributes();
|
||||
if (!NestAttrs.isEmpty()) {
|
||||
unsigned NestIdx = 1;
|
||||
Type *NestTy = 0;
|
||||
@@ -1288,7 +1288,7 @@ InstCombiner::transformCallThroughTrampoline(CallSite CS,
|
||||
// Add any result attributes.
|
||||
Attributes Attr = Attrs.getRetAttributes();
|
||||
if (Attr.hasAttributes())
|
||||
NewAttrs.push_back(AttributeWithIndex::get(AttrListPtr::ReturnIndex,
|
||||
NewAttrs.push_back(AttributeWithIndex::get(AttributeSet::ReturnIndex,
|
||||
Attr));
|
||||
|
||||
{
|
||||
@@ -1321,7 +1321,7 @@ InstCombiner::transformCallThroughTrampoline(CallSite CS,
|
||||
// Add any function attributes.
|
||||
Attr = Attrs.getFnAttributes();
|
||||
if (Attr.hasAttributes())
|
||||
NewAttrs.push_back(AttributeWithIndex::get(AttrListPtr::FunctionIndex,
|
||||
NewAttrs.push_back(AttributeWithIndex::get(AttributeSet::FunctionIndex,
|
||||
Attr));
|
||||
|
||||
// The trampoline may have been bitcast to a bogus type (FTy).
|
||||
@@ -1361,7 +1361,7 @@ InstCombiner::transformCallThroughTrampoline(CallSite CS,
|
||||
NestF->getType() == PointerType::getUnqual(NewFTy) ?
|
||||
NestF : ConstantExpr::getBitCast(NestF,
|
||||
PointerType::getUnqual(NewFTy));
|
||||
const AttrListPtr &NewPAL = AttrListPtr::get(FTy->getContext(), NewAttrs);
|
||||
const AttributeSet &NewPAL = AttributeSet::get(FTy->getContext(), NewAttrs);
|
||||
|
||||
Instruction *NewCaller;
|
||||
if (InvokeInst *II = dyn_cast<InvokeInst>(Caller)) {
|
||||
|
||||
Reference in New Issue
Block a user