Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 1e06ebb8 authored by Léo Gourdin's avatar Léo Gourdin
Browse files

fix bug in merge

parent fe4d2149
......@@ -353,7 +353,7 @@ let write_initial_node initial code' new_order =
let write_pathmap initial esize pm' =
let path = get_some @@ PTree.get initial !pm' in
let npsize = Camlcoq.Nat.of_int (esize + (Camlcoq.Nat.to_int path.psize)) in
let path' = { psize = npsize; input_regs = path.input_regs; output_regs = path.output_regs } in
let path' = { psize = npsize; input_regs = path.input_regs; pre_output_regs = path.pre_output_regs; output_regs = path.output_regs } in
pm' := PTree.set initial path' !pm'
let rec write_tree exp current code' new_order =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment