r175836 - Apply the 'nobuiltin' attribute to call sites when the user specifies `-fno-builtin' on the command line.
Bill Wendling
isanbard at gmail.com
Thu Feb 21 16:13:35 PST 2013
Author: void
Date: Thu Feb 21 18:13:35 2013
New Revision: 175836
URL: http://llvm.org/viewvc/llvm-project?rev=175836&view=rev
Log:
Apply the 'nobuiltin' attribute to call sites when the user specifies `-fno-builtin' on the command line.
Modified:
cfe/trunk/lib/CodeGen/CGCall.cpp
cfe/trunk/lib/CodeGen/CodeGenModule.cpp
cfe/trunk/lib/CodeGen/CodeGenModule.h
Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=175836&r1=175835&r2=175836&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCall.cpp Thu Feb 21 18:13:35 2013
@@ -969,7 +969,8 @@ llvm::Type *CodeGenTypes::GetFunctionTyp
void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI,
const Decl *TargetDecl,
AttributeListType &PAL,
- unsigned &CallingConv) {
+ unsigned &CallingConv,
+ bool AttrOnCallSite) {
llvm::AttrBuilder FuncAttrs;
llvm::AttrBuilder RetAttrs;
@@ -1028,6 +1029,9 @@ void CodeGenModule::ConstructAttributeLi
FuncAttrs.addAttribute("target-features", Features.getString());
}
+ if (AttrOnCallSite && !CodeGenOpts.SimplifyLibCalls)
+ FuncAttrs.addAttribute(llvm::Attribute::NoBuiltin);
+
QualType RetTy = FI.getReturnType();
unsigned Index = 1;
const ABIArgInfo &RetAI = FI.getReturnInfo();
@@ -2238,9 +2242,10 @@ RValue CodeGenFunction::EmitCall(const C
unsigned CallingConv;
CodeGen::AttributeListType AttributeList;
- CGM.ConstructAttributeList(CallInfo, TargetDecl, AttributeList, CallingConv);
+ CGM.ConstructAttributeList(CallInfo, TargetDecl, AttributeList,
+ CallingConv, true);
llvm::AttributeSet Attrs = llvm::AttributeSet::get(getLLVMContext(),
- AttributeList);
+ AttributeList);
llvm::BasicBlock *InvokeDest = 0;
if (!Attrs.hasAttribute(llvm::AttributeSet::FunctionIndex,
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=175836&r1=175835&r2=175836&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Thu Feb 21 18:13:35 2013
@@ -550,7 +550,7 @@ void CodeGenModule::SetLLVMFunctionAttri
llvm::Function *F) {
unsigned CallingConv;
AttributeListType AttributeList;
- ConstructAttributeList(Info, D, AttributeList, CallingConv);
+ ConstructAttributeList(Info, D, AttributeList, CallingConv, false);
F->setAttributes(llvm::AttributeSet::get(getLLVMContext(), AttributeList));
F->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));
}
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.h?rev=175836&r1=175835&r2=175836&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.h Thu Feb 21 18:13:35 2013
@@ -839,7 +839,8 @@ public:
void ConstructAttributeList(const CGFunctionInfo &Info,
const Decl *TargetDecl,
AttributeListType &PAL,
- unsigned &CallingConv);
+ unsigned &CallingConv,
+ bool AttrOnCallSite);
StringRef getMangledName(GlobalDecl GD);
void getBlockMangledName(GlobalDecl GD, MangleBuffer &Buffer,
More information about the cfe-commits
mailing list