From f5e1f3338acb9e6282b5c6d60aa10ef81172a129 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Tue, 30 Nov 2021 09:55:43 +0100 Subject: Fix another bug --- src/Interpreter.ml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Interpreter.ml b/src/Interpreter.ml index 068c175c..e24f565e 100644 --- a/src/Interpreter.ml +++ b/src/Interpreter.ml @@ -1763,7 +1763,10 @@ let eval_rvalue (config : C.config) (ctx : C.eval_ctx) (rvalue : E.rvalue) : let ctx2, v = prepare_rplace config access p ctx in (* Compute the rvalue - simply a shared borrow with a fresh id *) let ctx3, bid = C.fresh_borrow_id ctx2 in - let rv_ty = T.Ref (T.Erased, v.ty, Shared) in + (* Note that the reference is *mutable* if we do a two-phase borrow *) + let rv_ty = + T.Ref (T.Erased, v.ty, if bkind = E.Shared then Shared else Mut) + in let bc = if bkind = E.Shared then V.SharedBorrow bid else V.InactivatedMutBorrow bid -- cgit v1.2.3