Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Feb 4, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f24f5a3
Fixed codegen for constant cstring with --gc:arc, fixes #13321
zevv Feb 4, 2020
cb5c22d
Added test for #13321
zevv Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/ccgexprs.nim
View file
Open in desktop
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
View file
Open in desktop
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'