6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-10-20 09:24:58 +00:00
Code Issues Projects Releases Wiki Activity

For PR1187:

Browse Source 
When a naming conflict arises, allow internal linkage functions to be
renamed without warning or error.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34024 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2007-02-08 00:21:06 +00:00
parent 49b8b55c29
commit 0ec8200811
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/llvm-upgrade/UpgradeParser.y
View File

@ -1655,13 +1655,13 @@ OptAssign
};
OptLinkage
: INTERNAL { $$ = GlobalValue::InternalLinkage; }
: INTERNAL { $$ = GlobalValue::InternalLinkage; }
| LINKONCE { $$ = GlobalValue::LinkOnceLinkage; }
| WEAK { $$ = GlobalValue::WeakLinkage; }
| APPENDING { $$ = GlobalValue::AppendingLinkage; }
| DLLIMPORT { $$ = GlobalValue::DLLImportLinkage; }
| DLLEXPORT { $$ = GlobalValue::DLLExportLinkage; }
| EXTERN_WEAK { $$ = GlobalValue::ExternalWeakLinkage; }
| EXTERN_WEAK { $$ = GlobalValue::ExternalWeakLinkage; }
| /*empty*/ { $$ = GlobalValue::ExternalLinkage; }
;
@ -2620,15 +2620,39 @@ FunctionHeaderH
warning("Renaming function '" + FunctionName + "' as '" + NewName +
"' may cause linkage errors");
Fn = new Function(FT, GlobalValue::ExternalLinkage, NewName,
CurModule.CurrentModule);
InsertValue(Fn, CurModule.Values);
RenameMapKey Key = std::make_pair(FunctionName,PFT);
CurModule.RenameMap[Key] = NewName;
} else if (Fn->hasInternalLinkage()) {
// The function we are creating conflicts in name with another function
// that has internal linkage. We'll rename that one quietly to get rid
// of the conflict.
Fn->setName(makeNameUnique(Fn->getName()));
RenameMapKey Key = std::make_pair(FunctionName,PFT);
CurModule.RenameMap[Key] = Fn->getName();
Fn = new Function(FT, GlobalValue::ExternalLinkage, FunctionName,
CurModule.CurrentModule);
InsertValue(Fn, CurModule.Values);
} else if (CurFun.Linkage == GlobalValue::InternalLinkage) {
// The function we are creating has internal linkage and conflicts with
// another function of the same name. We'll just rename this one
// quietly because its internal linkage can't conflict with anything
// else.
std::string NewName = makeNameUnique(FunctionName);
Fn = new Function(FT, GlobalValue::ExternalLinkage, NewName,
CurModule.CurrentModule);
InsertValue(Fn, CurModule.Values);
RenameMapKey Key = std::make_pair(FunctionName,PFT);
CurModule.RenameMap[Key] = NewName;
} else {
// The types are the same. Either the existing or the current function
// needs to be a forward declaration. If not, they're attempting to
// redefine a function.
// The types are the same and they are both external linkage. Either
// the existing or the current function needs to be a forward
// declaration. If not, they're attempting to redefine two external
// functions. This wasn't allowed in llvm 1.9 and it isn't allowed now.
if (!CurFun.isDeclare && !Fn->isDeclaration())
error("Redefinition of function '" + FunctionName + "'");