mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-11-02 07:11:49 +00:00
Fix bug: test/Regression/2002-03-08-NameCollision2.ll
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1839 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
df00605a9d
commit
34538145f4
@ -1110,8 +1110,8 @@ Module : MethodList {
|
||||
//
|
||||
MethodList : MethodList Method {
|
||||
$$ = $1;
|
||||
if (!$2->getParent())
|
||||
$1->getMethodList().push_back($2);
|
||||
assert($2->getParent() == 0 && "Method already in module!");
|
||||
$1->getMethodList().push_back($2);
|
||||
CurMeth.MethodDone();
|
||||
}
|
||||
| MethodList MethodProto {
|
||||
@ -1184,6 +1184,11 @@ MethodHeaderH : OptInternal TypesV STRINGCONSTANT '(' ArgList ')' {
|
||||
// or it needs to be.
|
||||
if (!CurMeth.isDeclare && !M->isExternal())
|
||||
ThrowException("Redefinition of method '" + MethodName + "'!");
|
||||
|
||||
// If we found a preexisting method prototype, remove it from the module,
|
||||
// so that we don't get spurious conflicts with global & local variables.
|
||||
//
|
||||
CurModule.CurrentModule->getMethodList().remove(M);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1232,8 +1237,8 @@ Method : BasicBlockList END {
|
||||
|
||||
MethodProto : DECLARE { CurMeth.isDeclare = true; } MethodHeaderH {
|
||||
$$ = CurMeth.CurrentMethod;
|
||||
if (!$$->getParent())
|
||||
CurModule.CurrentModule->getMethodList().push_back($$);
|
||||
assert($$->getParent() == 0 && "Method already in module!");
|
||||
CurModule.CurrentModule->getMethodList().push_back($$);
|
||||
CurMeth.MethodDone();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user