diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2014-02-10 00:21:46 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2014-02-10 00:21:46 +0100 |
| commit | c8df0e312a83d0f9a03b7b75a1452734cb94ecdf (patch) | |
| tree | e023e18c9efe38cc2654843520b1cf5f6660694c | |
| parent | b9c0a4addca20bf730b3481fca71beadaeb512fd (diff) | |
| parent | 93f2af1cb340eacdffc0c8cd7a9ebe86f6275d02 (diff) | |
| download | Nim-c8df0e312a83d0f9a03b7b75a1452734cb94ecdf.tar.gz | |
Merge pull request #896 from reactormonk/set_fix
Set fix. fixes #887
| -rw-r--r-- | compiler/ccgexprs.nim | 2 | ||||
| -rw-r--r-- | tests/stdlib/testequivalence.nim (renamed from tests/sets/testequivalence.nim) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim index 031ab8d70..01f23850b 100644 --- a/compiler/ccgexprs.nim +++ b/compiler/ccgexprs.nim @@ -1376,7 +1376,7 @@ proc genSetOp(p: BProc, e: PNode, d: var TLoc, op: TMagic) = getTemp(p, getSysType(tyInt), i) # our counter initLocExpr(p, e.sons[1], a) initLocExpr(p, e.sons[2], b) - if d.k == locNone: getTemp(p, a.t, d) + if d.k == locNone: getTemp(p, getSysType(tyBool), d) lineF(p, cpsStmts, lookupOpr[op], [rdLoc(i), toRope(size), rdLoc(d), rdLoc(a), rdLoc(b)]) of mEqSet: diff --git a/tests/sets/testequivalence.nim b/tests/stdlib/testequivalence.nim index 7c5d9e3e9..7c5d9e3e9 100644 --- a/tests/sets/testequivalence.nim +++ b/tests/stdlib/testequivalence.nim |