diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-07-18 09:46:30 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-07-18 09:46:30 +0200 |
| commit | 4389409e2657e4cec098180299b2d41b1a3a40f7 (patch) | |
| tree | bdeb765d6687ec0aa175d6cbef3458b18b76b1d1 /compiler/ccgstmts.nim | |
| parent | 32afdc09c6e2e6b32566df9e70cb71ae43eb9355 (diff) | |
| parent | 6eedac3207cad9f7b4bfe8d631a9373a91b85846 (diff) | |
| download | Nim-4389409e2657e4cec098180299b2d41b1a3a40f7.tar.gz | |
fix merge conflict
Diffstat (limited to 'compiler/ccgstmts.nim')
| -rw-r--r-- | compiler/ccgstmts.nim | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/ccgstmts.nim b/compiler/ccgstmts.nim index 8a0e07686..9a8d3bcd3 100644 --- a/compiler/ccgstmts.nim +++ b/compiler/ccgstmts.nim @@ -1146,5 +1146,9 @@ proc genAsgn(p: BProc, e: PNode, fastAsgn: bool) = proc genStmts(p: BProc, t: PNode) = var a: TLoc + + let isPush = hintExtendedContext in p.config.notes + if isPush: pushInfoContext(p.config, t.info) expr(p, t, a) + if isPush: popInfoContext(p.config) internalAssert p.config, a.k in {locNone, locTemp, locLocalVar} |