jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reset location when creating a method dispatcher

Browse source 
When creating a method dispatcher, the location of the underlying
method was copied. Under some circumstances, the name of the
location (loc.r) was already initialized, in which case the
method dispatcher shared a name with one of the methods, leading
to a C compiler error. By setting loc.r to nil when copying
the dispatcher information from the original method, we ensure
that the dispatcher C function gets its proper name.
This commit is contained in:
Reimer Behrends 2014-11-01 04:07:42 +01:00
commit 1fc8bab643
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/cgmeth.nim
View file

@ -100,6 +100,7 @@ proc methodDef*(s: PSym, fromCache: bool) =
if disp.typ.callConv == ccInline: disp.typ.callConv = ccDefault if disp.typ.callConv == ccInline: disp.typ.callConv = ccDefault
disp.ast = copyTree(s.ast) disp.ast = copyTree(s.ast)
disp.ast.sons[bodyPos] = ast.emptyNode disp.ast.sons[bodyPos] = ast.emptyNode
disp.loc.r = nil
if s.typ.sons[0] != nil: if s.typ.sons[0] != nil:
disp.ast.sons[resultPos].sym = copySym(s.ast.sons[resultPos].sym) disp.ast.sons[resultPos].sym = copySym(s.ast.sons[resultPos].sym)
attachDispatcher(s, newSymNode(disp)) attachDispatcher(s, newSymNode(disp))