diff options
author | Duncan Sands <baldrick@free.fr> | 2008-05-26 19:58:59 +0000 |
---|---|---|
committer | Duncan Sands <baldrick@free.fr> | 2008-05-26 19:58:59 +0000 |
commit | 28c3cff8250b3fe2adc6479306fe7dbdb48a1bdb (patch) | |
tree | 7228a30f4d1d804257ae14016a3b4c254de30c06 /lib | |
parent | 78ecf0d7b1ee7b1c44825d746b2f64e3a14aeb9b (diff) | |
download | llvm-28c3cff8250b3fe2adc6479306fe7dbdb48a1bdb.tar.gz llvm-28c3cff8250b3fe2adc6479306fe7dbdb48a1bdb.tar.bz2 llvm-28c3cff8250b3fe2adc6479306fe7dbdb48a1bdb.tar.xz |
Factor code to copy global value attributes like
the section or the visibility from one global
value to another: copyAttributesFrom. This is
particularly useful for duplicating functions:
previously this was done by explicitly copying
each attribute in turn at each place where a
new function was created out of an old one, with
the result that obscure attributes were regularly
forgotten (like the collector or the section).
Hopefully now everything is uniform and nothing
is forgotten.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51567 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Linker/LinkModules.cpp | 18 | ||||
-rw-r--r-- | lib/Transforms/IPO/ArgumentPromotion.cpp | 6 | ||||
-rw-r--r-- | lib/Transforms/IPO/DeadArgumentElimination.cpp | 9 | ||||
-rw-r--r-- | lib/Transforms/IPO/ExtractGV.cpp | 5 | ||||
-rw-r--r-- | lib/Transforms/IPO/StructRetPromotion.cpp | 2 | ||||
-rw-r--r-- | lib/Transforms/Utils/CloneFunction.cpp | 11 | ||||
-rw-r--r-- | lib/Transforms/Utils/CloneModule.cpp | 5 | ||||
-rw-r--r-- | lib/VMCore/Function.cpp | 12 | ||||
-rw-r--r-- | lib/VMCore/Globals.cpp | 21 |
9 files changed, 47 insertions, 42 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index fae7d9d748..66c68ca87f 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -351,20 +351,10 @@ static void ForceRenaming(GlobalValue *GV, const std::string &Name) { /// CopyGVAttributes - copy additional attributes (those not needed to construct /// a GlobalValue) from the SrcGV to the DestGV. static void CopyGVAttributes(GlobalValue *DestGV, const GlobalValue *SrcGV) { - // Propagate alignment, visibility and section info. - DestGV->setAlignment(std::max(DestGV->getAlignment(), SrcGV->getAlignment())); - DestGV->setSection(SrcGV->getSection()); - DestGV->setVisibility(SrcGV->getVisibility()); - if (const Function *SrcF = dyn_cast<Function>(SrcGV)) { - Function *DestF = cast<Function>(DestGV); - DestF->setCallingConv(SrcF->getCallingConv()); - DestF->setParamAttrs(SrcF->getParamAttrs()); - if (SrcF->hasCollector()) - DestF->setCollector(SrcF->getCollector()); - } else if (const GlobalVariable *SrcVar = dyn_cast<GlobalVariable>(SrcGV)) { - GlobalVariable *DestVar = cast<GlobalVariable>(DestGV); - DestVar->setThreadLocal(SrcVar->isThreadLocal()); - } + // Use the maximum alignment, rather than just copying the alignment of SrcGV. + unsigned Alignment = std::max(DestGV->getAlignment(), SrcGV->getAlignment()); + DestGV->copyAttributesFrom(SrcGV); + DestGV->setAlignment(Alignment); } /// GetLinkageResult - This analyzes the two global values and determines what diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp index b3d783d2ae..7dd94f5bc8 100644 --- a/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -478,15 +478,13 @@ Function *ArgPromotion::DoPromotion(Function *F, // Create the new function body and insert it into the module... Function *NF = Function::Create(NFTy, F->getLinkage(), F->getName()); - NF->setCallingConv(F->getCallingConv()); + NF->copyAttributesFrom(F); // Recompute the parameter attributes list based on the new arguments for // the function. NF->setParamAttrs(PAListPtr::get(ParamAttrsVec.begin(), ParamAttrsVec.end())); ParamAttrsVec.clear(); - - if (F->hasCollector()) - NF->setCollector(F->getCollector()); + F->getParent()->getFunctionList().insert(F, NF); NF->takeName(F); diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index 9b3efe0962..2dab695224 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -163,10 +163,7 @@ bool DAE::DeleteDeadVarargs(Function &Fn) { // Create the new function body and insert it into the module... Function *NF = Function::Create(NFTy, Fn.getLinkage()); - NF->setCallingConv(Fn.getCallingConv()); - NF->setParamAttrs(Fn.getParamAttrs()); - if (Fn.hasCollector()) - NF->setCollector(Fn.getCollector()); + NF->copyAttributesFrom(&Fn); Fn.getParent()->getFunctionList().insert(&Fn, NF); NF->takeName(&Fn); @@ -556,10 +553,8 @@ void DAE::RemoveDeadArgumentsFromFunction(Function *F) { // Create the new function body and insert it into the module... Function *NF = Function::Create(NFTy, F->getLinkage()); - NF->setCallingConv(F->getCallingConv()); + NF->copyAttributesFrom(F); NF->setParamAttrs(NewPAL); - if (F->hasCollector()) - NF->setCollector(F->getCollector()); F->getParent()->getFunctionList().insert(F, NF); NF->takeName(F); diff --git a/lib/Transforms/IPO/ExtractGV.cpp b/lib/Transforms/IPO/ExtractGV.cpp index 46232b880b..03a8e5cebc 100644 --- a/lib/Transforms/IPO/ExtractGV.cpp +++ b/lib/Transforms/IPO/ExtractGV.cpp @@ -123,10 +123,7 @@ namespace { if (std::find(Named.begin(), Named.end(), &*I) == Named.end()) { Function *New = Function::Create(I->getFunctionType(), GlobalValue::ExternalLinkage); - New->setCallingConv(I->getCallingConv()); - New->setParamAttrs(I->getParamAttrs()); - if (I->hasCollector()) - New->setCollector(I->getCollector()); + New->copyAttributesFrom(I); // If it's not the named function, delete the body of the function I->dropAllReferences(); diff --git a/lib/Transforms/IPO/StructRetPromotion.cpp b/lib/Transforms/IPO/StructRetPromotion.cpp index f857dce669..174a6fa767 100644 --- a/lib/Transforms/IPO/StructRetPromotion.cpp +++ b/lib/Transforms/IPO/StructRetPromotion.cpp @@ -232,7 +232,7 @@ Function *SRETPromotion::cloneFunctionBody(Function *F, FunctionType *NFTy = FunctionType::get(STy, Params, FTy->isVarArg()); Function *NF = Function::Create(NFTy, F->getLinkage(), F->getName()); - NF->setCallingConv(F->getCallingConv()); + NF->copyAttributesFrom(F); NF->setParamAttrs(PAListPtr::get(ParamAttrsVec.begin(), ParamAttrsVec.end())); F->getParent()->getFunctionList().insert(F, NF); NF->getBasicBlockList().splice(NF->begin(), F->getBasicBlockList()); diff --git a/lib/Transforms/Utils/CloneFunction.cpp b/lib/Transforms/Utils/CloneFunction.cpp index 57369143b4..9e3fe32992 100644 --- a/lib/Transforms/Utils/CloneFunction.cpp +++ b/lib/Transforms/Utils/CloneFunction.cpp @@ -80,11 +80,8 @@ void llvm::CloneFunctionInto(Function *NewFunc, const Function *OldFunc, assert(ValueMap.count(I) && "No mapping from source argument specified!"); #endif - // Clone the parameter attributes - NewFunc->setParamAttrs(OldFunc->getParamAttrs()); - - // Clone the calling convention - NewFunc->setCallingConv(OldFunc->getCallingConv()); + // Clone any attributes. + NewFunc->copyAttributesFrom(OldFunc); // Loop over all of the basic blocks in the function, cloning them as // appropriate. Note that we save BE this way in order to handle cloning of @@ -339,8 +336,8 @@ void llvm::CloneAndPruneFunctionInto(Function *NewFunc, const Function *OldFunc, E = OldFunc->arg_end(); II != E; ++II) assert(ValueMap.count(II) && "No mapping from source argument specified!"); #endif - - PruningFunctionCloner PFC(NewFunc, OldFunc, ValueMap, Returns, + + PruningFunctionCloner PFC(NewFunc, OldFunc, ValueMap, Returns, NameSuffix, CodeInfo, TD); // Clone the entry block, and anything recursively reachable from it. diff --git a/lib/Transforms/Utils/CloneModule.cpp b/lib/Transforms/Utils/CloneModule.cpp index e75f915cb9..c94c531b01 100644 --- a/lib/Transforms/Utils/CloneModule.cpp +++ b/lib/Transforms/Utils/CloneModule.cpp @@ -65,10 +65,7 @@ Module *llvm::CloneModule(const Module *M, Function *NF = Function::Create(cast<FunctionType>(I->getType()->getElementType()), GlobalValue::ExternalLinkage, I->getName(), New); - NF->setCallingConv(I->getCallingConv()); - NF->setParamAttrs(I->getParamAttrs()); - if (I->hasCollector()) - NF->setCollector(I->getCollector()); + NF->copyAttributesFrom(I); ValueMap[I]= NF; } diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index 49e69e1b2c..2ab1194949 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -284,6 +284,18 @@ void Function::clearCollector() { } } +/// copyAttributesFrom - copy all additional attributes (those not needed to +/// create a Function) from the Function Src to this one. +void Function::copyAttributesFrom(const GlobalValue *Src) { + assert(isa<Function>(Src) && "Expected a Function!"); + GlobalValue::copyAttributesFrom(Src); + const Function *SrcF = cast<Function>(Src); + setCallingConv(SrcF->getCallingConv()); + setParamAttrs(SrcF->getParamAttrs()); + if (SrcF->hasCollector()) + setCollector(SrcF->getCollector()); +} + /// getIntrinsicID - This method returns the ID number of the specified /// function, or Intrinsic::not_intrinsic if the function is not an /// intrinsic, or if the pointer is null. This value is always defined to be diff --git a/lib/VMCore/Globals.cpp b/lib/VMCore/Globals.cpp index 1a328d80f6..229b0127a4 100644 --- a/lib/VMCore/Globals.cpp +++ b/lib/VMCore/Globals.cpp @@ -79,7 +79,16 @@ void GlobalValue::destroyConstant() { assert(0 && "You can't GV->destroyConstant()!"); abort(); } - + +/// copyAttributesFrom - copy all additional attributes (those not needed to +/// create a GlobalValue) from the GlobalValue Src to this one. +void GlobalValue::copyAttributesFrom(const GlobalValue *Src) { + setAlignment(Src->getAlignment()); + setSection(Src->getSection()); + setVisibility(Src->getVisibility()); +} + + //===----------------------------------------------------------------------===// // GlobalVariable Implementation //===----------------------------------------------------------------------===// @@ -160,6 +169,16 @@ void GlobalVariable::replaceUsesOfWithOnConstant(Value *From, Value *To, this->setOperand(0, cast<Constant>(To)); } +/// copyAttributesFrom - copy all additional attributes (those not needed to +/// create a GlobalVariable) from the GlobalVariable Src to this one. +void GlobalVariable::copyAttributesFrom(const GlobalValue *Src) { + assert(isa<GlobalVariable>(Src) && "Expected a GlobalVariable!"); + GlobalValue::copyAttributesFrom(Src); + const GlobalVariable *SrcVar = cast<GlobalVariable>(Src); + setThreadLocal(SrcVar->isThreadLocal()); +} + + //===----------------------------------------------------------------------===// // GlobalAlias Implementation //===----------------------------------------------------------------------===// |