summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2018-06-13 20:01:47 +0200
committerGitHub <noreply@github.com>2018-06-13 20:01:47 +0200
commit89dd1e3592e5f869bd2845c587ddec9c749d4d7b (patch)
tree06cb4d79e977df349120fac8b64c365cf1f122ba
parente80be6173d854ecb50e19ba1459529432fc5efbe (diff)
parented4f1f4c4368238efc1686189e04e87b419e276a (diff)
downloadNim-89dd1e3592e5f869bd2845c587ddec9c749d4d7b.tar.gz
Merge pull request #8030 from c-blake/devel
hotfix 3221ac094398492e09ea618638204793b0990eca broke gc:regions/aka …
-rw-r--r--lib/system/mmdisp.nim3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/system/mmdisp.nim b/lib/system/mmdisp.nim
index 2c9b1e502..b33ca93f2 100644
--- a/lib/system/mmdisp.nim
+++ b/lib/system/mmdisp.nim
@@ -562,7 +562,8 @@ else:
 when not declared(nimNewSeqOfCap):
   proc nimNewSeqOfCap(typ: PNimType, cap: int): pointer {.compilerproc.} =
     when defined(gcRegions):
-      result = newStr(typ, cap, ntfNoRefs notin typ.base.flags)
+      let s = mulInt(cap, typ.base.size)  # newStr already adds GenericSeqSize
+      result = newStr(typ, s, ntfNoRefs notin typ.base.flags)
     else:
       let s = addInt(mulInt(cap, typ.base.size), GenericSeqSize)
       when declared(newObjNoInit):