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

fixes recently introduced regression

Browse source
This commit is contained in:
Andreas Rumpf 2016-12-21 12:15:47 +01:00
commit 22ce05ef16
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/cgen.nim
View file

@ -732,12 +732,10 @@ proc genProcNoForward(m: BModule, prc: PSym) =
# dependency to a compilerproc:
discard cgsym(m, prc.name.s)
return
if sfImportc in prc.flags:
if lfNoDecl in prc.loc.flags:
fillProcLoc(m, prc)
if lfHeader in prc.loc.flags:
useHeader(m, prc)
elif lfNoDecl notin prc.loc.flags:
genProcPrototype(m, prc)
useHeader(m, prc)
genProcPrototype(m, prc)
elif prc.typ.callConv == ccInline:
# We add inline procs to the calling module to enable C based inlining.
# This also means that a check with ``q.declaredThings`` is wrong, we need
@ -762,13 +760,17 @@ proc genProcNoForward(m: BModule, prc: PSym) =
symInDynamicLib(q, prc)
else:
symInDynamicLibPartial(m, prc)
else:
elif sfImportc notin prc.flags:
var q = findPendingModule(m, prc)
fillProcLoc(q, prc)
useHeader(m, prc)
genProcPrototype(m, prc)
if q != nil and not containsOrIncl(q.declaredThings, prc.id):
genProcAux(q, prc)
else:
fillProcLoc(m, prc)
useHeader(m, prc)
if sfInfixCall notin prc.flags: genProcPrototype(m, prc)
proc requestConstImpl(p: BProc, sym: PSym) =
var m = p.module