Skip to content

Commit

Permalink
Fixed codegen for constant cstring with --gc:arc (#13326)
Browse files Browse the repository at this point in the history
* Fixed codegen for constant cstring with --gc:arc, fixes  #13321

* Added test for #13321
  • Loading branch information
zevv authored Feb 4, 2020
1 parent 7cc03b4 commit bfe96e0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/ccgexprs.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2974,7 +2974,7 @@ proc genBracedInit(p: BProc, n: PNode; isConst: bool): Rope =
of tyObject:
result = genConstObjConstr(p, n, isConst)
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)
else:
var d: TLoc
Expand Down
16 changes: 16 additions & 0 deletions tests/arc/tcstring.nim
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit bfe96e0

Please sign in to comment.