From ad4cbc5d7d3d9f907cd12fc7bff480e61679043d Mon Sep 17 00:00:00 2001
From: Aymeric Fromherz
Date: Thu, 30 May 2024 13:39:18 +0200
Subject: Correct implementation of Join-MutBorrows: add markers when creating
 a new abstraction

---
 compiler/InterpreterLoopsMatchCtxs.ml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/InterpreterLoopsMatchCtxs.ml b/compiler/InterpreterLoopsMatchCtxs.ml
index be6f3ade..0ea832d7 100644
--- a/compiler/InterpreterLoopsMatchCtxs.ml
+++ b/compiler/InterpreterLoopsMatchCtxs.ml
@@ -666,14 +666,15 @@ module MakeJoinMatcher (S : MatchJoinState) : PrimMatcher = struct
       let borrow_ty = mk_ref_ty (RFVar rid) bv_ty kind in
 
       (* Generate the avalues for the abstraction *)
-      let mk_aborrow (bid : borrow_id) (bv : typed_value) : typed_avalue =
+      let mk_aborrow (pm : proj_marker) (bid : borrow_id) (bv : typed_value) :
+          typed_avalue =
         let bv_ty = bv.ty in
         cassert __FILE__ __LINE__ (ty_no_regions bv_ty) span
           "Nested borrows are not supported yet";
-        let value = ABorrow (AMutBorrow (PNone, bid, mk_aignored span bv_ty)) in
+        let value = ABorrow (AMutBorrow (pm, bid, mk_aignored span bv_ty)) in
         { value; ty = borrow_ty }
       in
-      let borrows = [ mk_aborrow bid0 bv0; mk_aborrow bid1 bv1 ] in
+      let borrows = [ mk_aborrow PLeft bid0 bv0; mk_aborrow PRight bid1 bv1 ] in
 
       let loan = AMutLoan (PNone, bid2, mk_aignored span bv_ty) in
       (* Note that an aloan has a borrow type *)
-- 
cgit v1.2.3