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

Fixed codegen for constant cstring with --gc:arc (#13326)

Browse source 
* Fixed codegen for constant cstring with --gc:arc, fixes  #13321

* Added test for #13321
This commit is contained in:
Ico Doornekamp 2020-02-04 17:39:27 +01:00 • committed by GitHub
commit bfe96e069b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/ccgexprs.nim
View file

@ -2974,7 +2974,7 @@ proc genBracedInit(p: BProc, n: PNode; isConst: bool): Rope =
of tyObject: of tyObject:
result = genConstObjConstr(p, n, isConst) result = genConstObjConstr(p, n, isConst)
of tyString, tyCString: of tyString, tyCString:
if optSeqDestructors in p.config.globalOptions and n.kind != nkNilLit: if optSeqDestructors in p.config.globalOptions and n.kind != nkNilLit and ty == tyString:
result = genStringLiteralV2Const(p.module, n, isConst) result = genStringLiteralV2Const(p.module, n, isConst)
else: else:
var d: TLoc var d: TLoc

16
tests/arc/tcstring.nim Normal file
View file

@ -0,0 +1,16 @@
discard """
cmd: "nim c --gc:arc -r $file"
nimout: '''hello
h
o
'''
"""
# Issue #13321: [codegen] --gc:arc does not properly emit cstring, results in SIGSEGV
let a = "hello".cstring
echo a
echo a[0]
echo a[4]
doAssert a[a.len] == '\0'