diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-06-24 21:31:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 21:31:19 +0200 |
| commit | 890086baec8c23d65db20893c9ec5b50cee92335 (patch) | |
| tree | 9c2f9ce67957123c66db07367b52541abcd7a927 /compiler | |
| parent | 105a472dc5eb239c68d7e13d8eef93c8dc0311be (diff) | |
| parent | 8508dc46c8c5b1535f42d2ade3687bb85d7037e7 (diff) | |
| download | Nim-890086baec8c23d65db20893c9ec5b50cee92335.tar.gz | |
Merge pull request #8072 from LemonBoy/fix-6899-6280
Fix minor codegen issue with static data types
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ccgexprs.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim index 82cc3a1fb..0e8af5af5 100644 --- a/compiler/ccgexprs.nim +++ b/compiler/ccgexprs.nim @@ -59,7 +59,7 @@ proc genLiteral(p: BProc, n: PNode, ty: PType): Rope = else: result = rope("NIM_NIL") of nkStrLit..nkTripleStrLit: - case skipTypes(ty, abstractVarRange).kind + case skipTypes(ty, abstractVarRange + {tyStatic}).kind of tyNil: result = genNilStringLiteral(p.module, n.info) of tyString: @@ -385,7 +385,7 @@ proc genDeepCopy(p: BProc; dest, src: TLoc) = else: addrLoc(p.config, a) - var ty = skipTypes(dest.t, abstractVarRange) + var ty = skipTypes(dest.t, abstractVarRange + {tyStatic}) case ty.kind of tyPtr, tyRef, tyProc, tyTuple, tyObject, tyArray: # XXX optimize this |