diff options
Diffstat (limited to 'lib/CodeGen/CGCall.cpp')
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 55588241ad..c29230f75b 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -1037,9 +1037,7 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI, if (RetAI.getInReg()) SRETAttrs.addAttribute(llvm::Attribute::InReg); PAL.push_back(llvm:: - AttributeWithIndex::get(Index, - llvm::Attribute::get(getLLVMContext(), - SRETAttrs))); + AttributeSet::get(getLLVMContext(), Index, SRETAttrs)); ++Index; // sret disables readnone and readonly @@ -1054,9 +1052,9 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI, if (RetAttrs.hasAttributes()) PAL.push_back(llvm:: - AttributeWithIndex::get(llvm::AttributeSet::ReturnIndex, - llvm::Attribute::get(getLLVMContext(), - RetAttrs))); + AttributeSet::get(getLLVMContext(), + llvm::AttributeSet::ReturnIndex, + RetAttrs)); for (CGFunctionInfo::const_arg_iterator it = FI.arg_begin(), ie = FI.arg_end(); it != ie; ++it) { @@ -1065,13 +1063,9 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI, llvm::AttrBuilder Attrs; if (AI.getPaddingType()) { - if (AI.getPaddingInReg()) { - llvm::AttrBuilder PadAttrs; - PadAttrs.addAttribute(llvm::Attribute::InReg); - - llvm::Attribute A =llvm::Attribute::get(getLLVMContext(), PadAttrs); - PAL.push_back(llvm::AttributeWithIndex::get(Index, A)); - } + if (AI.getPaddingInReg()) + PAL.push_back(llvm::AttributeSet::get(getLLVMContext(), Index, + llvm::Attribute::InReg)); // Increment Index if there is padding. ++Index; } @@ -1097,9 +1091,8 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI, unsigned Extra = STy->getNumElements()-1; // 1 will be added below. if (Attrs.hasAttributes()) for (unsigned I = 0; I < Extra; ++I) - PAL.push_back(llvm::AttributeWithIndex::get(Index + I, - llvm::Attribute::get(getLLVMContext(), - Attrs))); + PAL.push_back(llvm::AttributeSet::get(getLLVMContext(), Index + I, + Attrs)); Index += Extra; } break; @@ -1134,16 +1127,14 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI, } if (Attrs.hasAttributes()) - PAL.push_back(llvm::AttributeWithIndex::get(Index, - llvm::Attribute::get(getLLVMContext(), - Attrs))); + PAL.push_back(llvm::AttributeSet::get(getLLVMContext(), Index, Attrs)); ++Index; } if (FuncAttrs.hasAttributes()) PAL.push_back(llvm:: - AttributeWithIndex::get(llvm::AttributeSet::FunctionIndex, - llvm::Attribute::get(getLLVMContext(), - FuncAttrs))); + AttributeSet::get(getLLVMContext(), + llvm::AttributeSet::FunctionIndex, + FuncAttrs)); } /// An argument came in as a promoted argument; demote it back to its |