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

fixes #21116; always mangles the param (#21121)

Browse source 
* fixes #21116; always mangles the param

* idOrSig

* fixes tests

* Apply suggestions from code review
This commit is contained in:
ringabout 2022-12-17 16:10:56 +08:00 • committed by GitHub
commit d83f66a24d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/ccgtypes.nim
View file

@ -48,11 +48,9 @@ proc fillBackendName(m: BModule; s: PSym) =
writeMangledName(m.ndi, s, m.config)
proc fillParamName(m: BModule; s: PSym) =
## we cannot use 'sigConflicts' here since we have a BModule, not a BProc.
## Fortunately C's scoping rules are sane enough so that that doesn't
## cause any trouble.
if s.loc.r == "":
var res = s.name.s.mangle
res.add idOrSig(s, res, m.sigConflicts)
# Take into account if HCR is on because of the following scenario:
# if a module gets imported and it has some more importc symbols in it,
# some param names might receive the "_0" suffix to distinguish from what
@ -69,8 +67,6 @@ proc fillParamName(m: BModule; s: PSym) =
# and a function called in main or proxy uses `socket` as a parameter name.
# That would lead to either needing to reload `proxy` or to overwrite the
# executable file for the main module, which is running (or both!) -> error.
if m.hcrOn or isKeyword(s.name) or m.g.config.cppDefines.contains(res):
res.add "_0"
s.loc.r = res.rope
writeMangledName(m.ndi, s, m.config)