s/AttrListPtr/AttributeSet/g to better label what this class is going to be in the near future.

llvm-svn: 169652
This commit is contained in:
Bill Wendling 2012-12-07 23:17:26 +00:00
parent e94d843e43
commit 3087d026da
4 changed files with 11 additions and 11 deletions

View File

@ -1049,7 +1049,7 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI,
if (RetAttrs.hasAttributes())
PAL.push_back(llvm::
AttributeWithIndex::get(llvm::AttrListPtr::ReturnIndex,
AttributeWithIndex::get(llvm::AttributeSet::ReturnIndex,
llvm::Attributes::get(getLLVMContext(),
RetAttrs)));
@ -1136,7 +1136,7 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI,
}
if (FuncAttrs.hasAttributes())
PAL.push_back(llvm::
AttributeWithIndex::get(llvm::AttrListPtr::FunctionIndex,
AttributeWithIndex::get(llvm::AttributeSet::FunctionIndex,
llvm::Attributes::get(getLLVMContext(),
FuncAttrs)));
}
@ -2230,7 +2230,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
unsigned CallingConv;
CodeGen::AttributeListType AttributeList;
CGM.ConstructAttributeList(CallInfo, TargetDecl, AttributeList, CallingConv);
llvm::AttrListPtr Attrs = llvm::AttrListPtr::get(getLLVMContext(),
llvm::AttributeSet Attrs = llvm::AttributeSet::get(getLLVMContext(),
AttributeList);
llvm::BasicBlock *InvokeDest = 0;

View File

@ -1640,7 +1640,7 @@ void CodeGenFunction::EmitAsmStmt(const AsmStmt &S) {
llvm::InlineAsm::get(FTy, AsmString, Constraints, HasSideEffect,
/* IsAlignStack */ false, AsmDialect);
llvm::CallInst *Result = Builder.CreateCall(IA, Args);
Result->addAttribute(llvm::AttrListPtr::FunctionIndex,
Result->addAttribute(llvm::AttributeSet::FunctionIndex,
llvm::Attributes::get(getLLVMContext(),
llvm::Attributes::NoUnwind));

View File

@ -533,7 +533,7 @@ void CodeGenModule::SetLLVMFunctionAttributes(const Decl *D,
unsigned CallingConv;
AttributeListType AttributeList;
ConstructAttributeList(Info, D, AttributeList, CallingConv);
F->setAttributes(llvm::AttrListPtr::get(getLLVMContext(), AttributeList));
F->setAttributes(llvm::AttributeSet::get(getLLVMContext(), AttributeList));
F->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));
}
@ -1143,7 +1143,7 @@ CodeGenModule::GetOrCreateLLVMFunction(StringRef MangledName,
if (D.getDecl())
SetFunctionAttributes(D, F, IsIncompleteFunction);
if (ExtraAttrs.hasAttributes())
F->addAttribute(llvm::AttrListPtr::FunctionIndex, ExtraAttrs);
F->addAttribute(llvm::AttributeSet::FunctionIndex, ExtraAttrs);
// This is the first use or definition of a mangled name. If there is a
// deferred decl with this name, remember that we need to emit it at the end
@ -1819,7 +1819,7 @@ static void ReplaceUsesOfNonProtoTypeWithRealFunction(llvm::GlobalValue *Old,
// Get the attribute list.
llvm::SmallVector<llvm::AttributeWithIndex, 8> AttrVec;
llvm::AttrListPtr AttrList = CI->getAttributes();
llvm::AttributeSet AttrList = CI->getAttributes();
// Get any return attributes.
llvm::Attributes RAttrs = AttrList.getRetAttributes();
@ -1827,7 +1827,7 @@ static void ReplaceUsesOfNonProtoTypeWithRealFunction(llvm::GlobalValue *Old,
// Add the return attributes.
if (RAttrs.hasAttributes())
AttrVec.push_back(llvm::
AttributeWithIndex::get(llvm::AttrListPtr::ReturnIndex,
AttributeWithIndex::get(llvm::AttributeSet::ReturnIndex,
RAttrs));
// If the function was passed too few arguments, don't transform. If extra
@ -1854,7 +1854,7 @@ static void ReplaceUsesOfNonProtoTypeWithRealFunction(llvm::GlobalValue *Old,
llvm::Attributes FnAttrs = AttrList.getFnAttributes();
if (FnAttrs.hasAttributes())
AttrVec.push_back(llvm::
AttributeWithIndex::get(llvm::AttrListPtr::FunctionIndex,
AttributeWithIndex::get(llvm::AttributeSet::FunctionIndex,
FnAttrs));
// Okay, we can transform this. Create the new call instruction and copy
@ -1864,7 +1864,7 @@ static void ReplaceUsesOfNonProtoTypeWithRealFunction(llvm::GlobalValue *Old,
ArgList.clear();
if (!NewCall->getType()->isVoidTy())
NewCall->takeName(CI);
NewCall->setAttributes(llvm::AttrListPtr::get(OldFn->getContext(), AttrVec));
NewCall->setAttributes(llvm::AttributeSet::get(OldFn->getContext(), AttrVec));
NewCall->setCallingConv(CI->getCallingConv());
// Finally, remove the old call, replacing any uses with the new one.

View File

@ -1019,7 +1019,7 @@ void X86_32TargetCodeGenInfo::SetTargetAttributes(const Decl *D,
// Now add the 'alignstack' attribute with a value of 16.
llvm::AttrBuilder B;
B.addStackAlignmentAttr(16);
Fn->addAttribute(llvm::AttrListPtr::FunctionIndex,
Fn->addAttribute(llvm::AttributeSet::FunctionIndex,
llvm::Attributes::get(CGM.getLLVMContext(), B));
}
}