diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-05-16 17:32:18 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-05-16 17:32:18 +0200 |
| commit | 503f7806765f0cc6f072f578e272d12d3f9cce56 (patch) | |
| tree | f6ad4a0cdf637ae9335f73cae482b3deb36fb353 /compiler/ccgexprs.nim | |
| parent | 224eec595a6112c7aa3a4c06afacc99167580464 (diff) | |
| parent | 3e52bb6535a70339cf4a15123be09916ef0c31f6 (diff) | |
| download | Nim-503f7806765f0cc6f072f578e272d12d3f9cce56.tar.gz | |
Merge branch 'zahary' into araq2
Diffstat (limited to 'compiler/ccgexprs.nim')
| -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 b03f7c5aa..f981f9595 100644 --- a/compiler/ccgexprs.nim +++ b/compiler/ccgexprs.nim @@ -267,7 +267,7 @@ proc genAssignment(p: BProc, dest, src: TLoc, flags: TAssignmentFlags) = # little HACK to support the new 'var T' as return type: linefmt(p, cpsStmts, "$1 = $2;$n", rdLoc(dest), rdLoc(src)) return - let ty = skipTypes(dest.t, abstractRange) + let ty = skipTypes(dest.t, abstractRange + tyUserTypeClasses) case ty.kind of tyRef: genRefAssign(p, dest, src, flags) @@ -756,7 +756,7 @@ proc genRecordField(p: BProc, e: PNode, d: var TLoc) = genRecordFieldAux(p, e, d, a) var r = rdLoc(a) var f = e.sons[1].sym - let ty = skipTypes(a.t, abstractInst) + let ty = skipTypes(a.t, abstractInst + tyUserTypeClasses) if ty.kind == tyTuple: # we found a unique tuple type which lacks field information # so we use Field$i |