RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

For PR1336:

Browse Source 
When upgrading global vars, look for conflicts with functions as well. This
fixes test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll

llvm-svn: 36103
This commit is contained in:
Reid Spencer 2007-04-16 02:56:33 +00:00
parent 85f055a567
commit 15a5b3e2b2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -934,8 +934,9 @@ ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
// of this global in the module and emit warnings if there are conflicts.
if (!Name.empty()) {
// The global has a name. See if there's an existing one of the same name.
if (CurModule.CurrentModule->getNamedGlobal(Name)) {
// We found an existing global ov the same name. This isn't allowed
if (CurModule.CurrentModule->getNamedGlobal(Name) ||
CurModule.CurrentModule->getFunction(Name)) {
// We found an existing global of the same name. This isn't allowed
// in LLVM 2.0. Consequently, we must alter the name of the global so it
// can at least compile. This can happen because of type planes
// There is alread a global of the same name which means there is a
@ -2999,7 +3000,7 @@ FunctionHeaderH
AI->setName("");
}
} else if (Conflict) {
// We have two globals with the same name and different types.
// We have two globals with the same name and different types.
// Previously, this was permitted because the symbol table had
// "type planes" and names only needed to be distinct within a
// type plane. After PR411 was fixed, this is no loner the case.