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

Merge pull request #8072 from LemonBoy/fix-6899-6280

Browse source 
Fix minor codegen issue with static data types
This commit is contained in:
Andreas Rumpf 2018-06-24 21:31:19 +02:00 • committed by GitHub
commit 890086baec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/ccgexprs.nim
View file

@ -59,7 +59,7 @@ proc genLiteral(p: BProc, n: PNode, ty: PType): Rope =
else: else:
result = rope("NIM_NIL") result = rope("NIM_NIL")
of nkStrLit..nkTripleStrLit: of nkStrLit..nkTripleStrLit:
case skipTypes(ty, abstractVarRange).kind case skipTypes(ty, abstractVarRange + {tyStatic}).kind
of tyNil: of tyNil:
result = genNilStringLiteral(p.module, n.info) result = genNilStringLiteral(p.module, n.info)
of tyString: of tyString:
@ -385,7 +385,7 @@ proc genDeepCopy(p: BProc; dest, src: TLoc) =
else: else:
addrLoc(p.config, a) addrLoc(p.config, a)
var ty = skipTypes(dest.t, abstractVarRange) var ty = skipTypes(dest.t, abstractVarRange + {tyStatic})
case ty.kind case ty.kind
of tyPtr, tyRef, tyProc, tyTuple, tyObject, tyArray: of tyPtr, tyRef, tyProc, tyTuple, tyObject, tyArray:
# XXX optimize this # XXX optimize this