Return lists of lvals to formals

Author: MQuaresma

compiler/entry/jazz2cl.ml

@@ -117,7 +117,7 @@ let parse_and_print print arch call_conv ecoutput joutput output file funname =
      let formals',pre_ghost_instr,post_ghost_instr = CL_vsimpl.GhostVector.unfold_vectors proc.formals proc.ret_vars in
      let prog' = pre_ghost_instr @ proc.prog @ post_ghost_instr in
      let cfg = CL_vsimpl.Cfg.cfg_of_prog_rev prog' in
-     let clean_cfg = CL_vsimpl.SimplVector.simpl_cfg cfg formals' in
+     let clean_cfg = CL_vsimpl.SimplVector.simpl_cfg cfg proc.ret_vars in
      let prog' = CL_vsimpl.Cfg.prog_of_cfg clean_cfg in
      let (pre_epred, pre_rpred) = proc.pre in
      let (post_epred, post_rpred) = proc.post in

compiler/src/toCL.ml

@@ -1892,7 +1892,7 @@ module Mk(O:BaseOp) = struct
         | Lvar x -> [a], [], O.assgn_to_instr trans a e
         | Lnone _ | Lmem _ | Laset _ |Lasub _ -> assert false
       end
-    | Copn(xs, _, o, es) -> [], [], pp_sopn i.i_loc.base_loc xs o es trans
+    | Copn(xs, _, o, es) -> xs, [], pp_sopn i.i_loc.base_loc xs o es trans
 
   let pp_c env fds c =
     (* FIXME: this is really a bad complexity *)