From 5e85be4326a46a32159494c65d3fa177a0f05588 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Sun, 30 Dec 2012 10:32:17 +0000 Subject: [PATCH] Remove the Function::getFnAttributes method in favor of using the AttributeSet directly. This is in preparation for removing the use of the 'Attribute' class as a collection of attributes. That will shift to the AttributeSet class instead. llvm-svn: 171254 --- clang/lib/CodeGen/CGCall.cpp | 3 ++- clang/lib/CodeGen/CodeGenModule.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index cdac2fc7620e..b55043bc89a6 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -2238,7 +2238,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, AttributeList); llvm::BasicBlock *InvokeDest = 0; - if (!Attrs.getFnAttributes().hasAttribute(llvm::Attribute::NoUnwind)) + if (!Attrs.hasAttribute(llvm::AttributeSet::FunctionIndex, + llvm::Attribute::NoUnwind)) InvokeDest = getInvokeDest(); llvm::CallSite CS; diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 2e7a61ab2974..7012fa84ae2c 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -576,7 +576,8 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D, // (noinline wins over always_inline, and we can't specify both in IR) if ((D->hasAttr() || D->hasAttr()) && - !F->getFnAttributes().hasAttribute(llvm::Attribute::NoInline)) + !F->getAttributes().hasAttribute(llvm::AttributeSet::FunctionIndex, + llvm::Attribute::NoInline)) F->addFnAttr(llvm::Attribute::AlwaysInline); // FIXME: Communicate hot and cold attributes to LLVM more directly.