6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-17 21:29:20 +00:00
Code Issues Projects Releases Wiki Activity

For PR1243:

Browse Source 
Okay, really fix it this time. Make sure the CurFun.Linkage is set early
and consolidate some duplicate code.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35236 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2007-03-21 17:26:41 +00:00
parent bb1fd5770d
commit 91a9d54d9a
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2936,25 +2936,21 @@ FunctionHeaderH
CurModule.RenameMap[Key] = Conflict->getName();
Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
InsertValue(Fn, CurModule.Values);
} else if (CurFun.Linkage == GlobalValue::InternalLinkage) {
// We can safely rename the function we're defining
std::string NewName = makeNameUnique(FunctionName);
Fn = new Function(FT, CurFun.Linkage, NewName, M);
InsertValue(Fn, CurModule.Values);
RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
CurModule.RenameMap[Key] = NewName;
} else {
} else {
// We can't quietly rename either of these things, but we must
// rename one of them. Generate a warning about the renaming and
// elect to rename the thing we're now defining.
// rename one of them. Only if the function's linkage is internal can
// we forgo a warning message about the renamed function.
std::string NewName = makeNameUnique(FunctionName);
warning("Renaming function '" + FunctionName + "' as '" + NewName +
"' may cause linkage errors");
if (CurFun.Linkage != GlobalValue::InternalLinkage) {
warning("Renaming function '" + FunctionName + "' as '" + NewName +
"' may cause linkage errors");
}
// Elect to rename the thing we're now defining.
Fn = new Function(FT, CurFun.Linkage, NewName, M);
InsertValue(Fn, CurModule.Values);
RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
CurModule.RenameMap[Key] = NewName;
}
}
} else {
// There's no conflict, just define the function
Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
@ -3005,7 +3001,7 @@ BEGIN
;
FunctionHeader
: OptLinkage FunctionHeaderH BEGIN {
: OptLinkage { CurFun.Linkage = $1; } FunctionHeaderH BEGIN {
$$ = CurFun.CurrentFunction;
// Make sure that we keep track of the linkage type even if there was a