diff options
| -rw-r--r-- | src/libexpr/eval-inline.hh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/eval-inline.hh index 57a9e4c63c21..722273ddadc2 100644 --- a/src/libexpr/eval-inline.hh +++ b/src/libexpr/eval-inline.hh @@ -21,13 +21,16 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s2)) void EvalState::forceValue(Value & v) { if (v.type == tThunk) { - ValueType saved = v.type; + Env * env = v.thunk.env; + Expr * expr = v.thunk.expr; try { v.type = tBlackhole; //checkInterrupt(); - v.thunk.expr->eval(*this, *v.thunk.env, v); + expr->eval(*this, *env, v); } catch (Error & e) { - v.type = saved; + v.type = tThunk; + v.thunk.env = env; + v.thunk.expr = expr; throw; } } |