diff options
author | Bill Wendling <isanbard@gmail.com> | 2012-10-10 07:36:56 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2012-10-10 07:36:56 +0000 |
commit | a7912f8894afb5d115650f15e8d7577ba092d1c5 (patch) | |
tree | e9c685bc436216af9ec1843452f2610143157ab9 /clang/lib/CodeGen/ItaniumCXXABI.cpp | |
parent | bbcdf4e2a5d57fed745d4c2a549c57c25f1e3aec (diff) | |
download | bcm5719-llvm-a7912f8894afb5d115650f15e8d7577ba092d1c5.tar.gz bcm5719-llvm-a7912f8894afb5d115650f15e8d7577ba092d1c5.zip |
Remove the final bits of Attributes being declared in the Attribute
namespace. Use the attribute's enum value instead. No functionality change
intended.
llvm-svn: 165611
Diffstat (limited to 'clang/lib/CodeGen/ItaniumCXXABI.cpp')
-rw-r--r-- | clang/lib/CodeGen/ItaniumCXXABI.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/ItaniumCXXABI.cpp b/clang/lib/CodeGen/ItaniumCXXABI.cpp index 3c92581c646..4d944301d2c 100644 --- a/clang/lib/CodeGen/ItaniumCXXABI.cpp +++ b/clang/lib/CodeGen/ItaniumCXXABI.cpp @@ -950,9 +950,10 @@ static llvm::Constant *getGuardAcquireFn(CodeGenModule &CGM, llvm::FunctionType *FTy = llvm::FunctionType::get(CGM.getTypes().ConvertType(CGM.getContext().IntTy), GuardPtrTy, /*isVarArg=*/false); - + llvm::Attributes::Builder B; + B.addAttribute(llvm::Attributes::NoUnwind); return CGM.CreateRuntimeFunction(FTy, "__cxa_guard_acquire", - llvm::Attribute::NoUnwind); + llvm::Attributes::get(B)); } static llvm::Constant *getGuardReleaseFn(CodeGenModule &CGM, @@ -960,9 +961,10 @@ static llvm::Constant *getGuardReleaseFn(CodeGenModule &CGM, // void __cxa_guard_release(__guard *guard_object); llvm::FunctionType *FTy = llvm::FunctionType::get(CGM.VoidTy, GuardPtrTy, /*isVarArg=*/false); - + llvm::Attributes::Builder B; + B.addAttribute(llvm::Attributes::NoUnwind); return CGM.CreateRuntimeFunction(FTy, "__cxa_guard_release", - llvm::Attribute::NoUnwind); + llvm::Attributes::get(B)); } static llvm::Constant *getGuardAbortFn(CodeGenModule &CGM, @@ -970,9 +972,10 @@ static llvm::Constant *getGuardAbortFn(CodeGenModule &CGM, // void __cxa_guard_abort(__guard *guard_object); llvm::FunctionType *FTy = llvm::FunctionType::get(CGM.VoidTy, GuardPtrTy, /*isVarArg=*/false); - + llvm::Attributes::Builder B; + B.addAttribute(llvm::Attributes::NoUnwind); return CGM.CreateRuntimeFunction(FTy, "__cxa_guard_abort", - llvm::Attribute::NoUnwind); + llvm::Attributes::get(B)); } namespace { |