mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-18 12:29:21 +00:00
For PR1336:
When upgrading global vars, look for conflicts with functions as well. This fixes test/Transforms/GlobalDCE/2002-08-17-FunctionDGE.ll git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36103 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
3e35c8d15e
commit
53bd704b99
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user