summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorOscar Nihlgård <oscarnihlgard@gmail.com>2018-07-14 16:00:52 +0200
committerAndreas Rumpf <rumpf_a@web.de>2018-07-14 16:00:51 +0200
commit332469692d5053c6c935163e196b117b6979c8e7 (patch)
tree0450ab0f1e04ab2f756c387025b87cc95e18c1d8
parent9b98add6c714474e261df1a0a17819282dfd1975 (diff)
downloadNim-332469692d5053c6c935163e196b117b6979c8e7.tar.gz
Bugfix for modules with multi byte characters in the name (#8319)
-rw-r--r--compiler/ccgtypes.nim2
-rw-r--r--tests/misc/åäö.nim5
2 files changed, 5 insertions, 2 deletions
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index 66ad34c32..a16255f6e 100644
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -48,7 +48,7 @@ proc mangleName(m: BModule; s: PSym): Rope =
   result = s.loc.r
   if result == nil:
     result = s.name.s.mangle.rope
-    add(result, idOrSig(s, m.module.name.s, m.sigConflicts))
+    add(result, idOrSig(s, m.module.name.s.mangle, m.sigConflicts))
     s.loc.r = result
     writeMangledName(m.ndi, s, m.config)
 
diff --git a/tests/misc/åäö.nim b/tests/misc/åäö.nim
index 69bb3e22c..b3caa9861 100644
--- a/tests/misc/åäö.nim
+++ b/tests/misc/åäö.nim
@@ -5,4 +5,7 @@ discard """
 # Tests that module names can contain multi byte characters
 
 let a = 1
-doAssert åäö.a == 1
\ No newline at end of file
+doAssert åäö.a == 1
+
+proc inlined() {.inline.} = discard
+inlined()
\ No newline at end of file