diff options
| author | ringabout <43030857+ringabout@users.noreply.github.com> | 2022-12-17 16:10:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-17 09:10:56 +0100 |
| commit | d83f66a24d990f2e4a135a4a64e1c464702b953d (patch) | |
| tree | 79d7e691bbfcde637b03fd116367e1d8617e5c37 | |
| parent | 7fa983f5e6b5f52a20e477e2443c8fdede244290 (diff) | |
| download | Nim-d83f66a24d990f2e4a135a4a64e1c464702b953d.tar.gz | |
fixes #21116; always mangles the param (#21121)
* fixes #21116; always mangles the param * idOrSig * fixes tests * Apply suggestions from code review
| -rw-r--r-- | compiler/ccgtypes.nim | 6 | ||||
| -rw-r--r-- | tests/ccgbugs/t21116.nim | 10 | ||||
| -rw-r--r-- | tests/ccgbugs/tnoalias.nim | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim index d7b56de5b..3c9f9d923 100644 --- a/compiler/ccgtypes.nim +++ b/compiler/ccgtypes.nim @@ -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) diff --git a/tests/ccgbugs/t21116.nim b/tests/ccgbugs/t21116.nim new file mode 100644 index 000000000..6418df539 --- /dev/null +++ b/tests/ccgbugs/t21116.nim @@ -0,0 +1,10 @@ +discard """ + target: "c cpp" + disabled: windows +""" +# bug #21116 +import std/os + +proc p(glob: string) = + for _ in walkFiles(glob): discard +p("dir/*") diff --git a/tests/ccgbugs/tnoalias.nim b/tests/ccgbugs/tnoalias.nim index f200992d7..96c3d390b 100644 --- a/tests/ccgbugs/tnoalias.nim +++ b/tests/ccgbugs/tnoalias.nim @@ -1,5 +1,5 @@ discard """ - ccodecheck: "\\i@'NI* NIM_NOALIAS field;' @'NIM_CHAR* NIM_NOALIAS x,' @'void* NIM_NOALIAS q'" + ccodecheck: "\\i@'NI* NIM_NOALIAS field;' @'NIM_CHAR* NIM_NOALIAS x__0qEngDE9aYoYsF8tWnyPacw,' @'void* NIM_NOALIAS q'" """ type |