Removed Eliminate_mutable_vars and mutable constructs of Ilambda (#461)

Author: Keryan-dev

.depend

@@ -3803,7 +3803,6 @@ middle_end/flambda/flambda_middle_end.cmo : \
     middle_end/flambda/terms/flambda.cmi \
     middle_end/flambda/parser/fexpr.cmo \
     middle_end/flambda/cmx/exported_code.cmi \
-    middle_end/flambda/from_lambda/eliminate_mutable_vars.cmi \
     middle_end/flambda/from_lambda/cps_conversion.cmi \
     middle_end/flambda/basic/continuation.cmi \
     middle_end/flambda/basic/code_id.cmi \
@@ -3824,7 +3823,6 @@ middle_end/flambda/flambda_middle_end.cmx : \
     middle_end/flambda/terms/flambda.cmx \
     middle_end/flambda/parser/fexpr.cmx \
     middle_end/flambda/cmx/exported_code.cmx \
-    middle_end/flambda/from_lambda/eliminate_mutable_vars.cmx \
     middle_end/flambda/from_lambda/cps_conversion.cmx \
     middle_end/flambda/basic/continuation.cmx \
     middle_end/flambda/basic/code_id.cmx \
@@ -4114,7 +4112,6 @@ middle_end/flambda/flambda_middle_end.cmo : \
     middle_end/flambda/terms/flambda.cmi \
     middle_end/flambda/parser/fexpr.cmo \
     middle_end/flambda/cmx/exported_code.cmi \
-    middle_end/flambda/from_lambda/eliminate_mutable_vars.cmi \
     middle_end/flambda/from_lambda/cps_conversion.cmi \
     middle_end/flambda/basic/continuation.cmi \
     middle_end/flambda/basic/code_id.cmi \
@@ -4135,7 +4132,6 @@ middle_end/flambda/flambda_middle_end.cmx : \
     middle_end/flambda/terms/flambda.cmx \
     middle_end/flambda/parser/fexpr.cmx \
     middle_end/flambda/cmx/exported_code.cmx \
-    middle_end/flambda/from_lambda/eliminate_mutable_vars.cmx \
     middle_end/flambda/from_lambda/cps_conversion.cmx \
     middle_end/flambda/basic/continuation.cmx \
     middle_end/flambda/basic/code_id.cmx \
@@ -5056,24 +5052,6 @@ middle_end/flambda/from_lambda/cps_conversion.cmx : \
 middle_end/flambda/from_lambda/cps_conversion.cmi : \
     lambda/lambda.cmi \
     middle_end/flambda/from_lambda/ilambda.cmi
-middle_end/flambda/from_lambda/eliminate_mutable_vars.cmo : \
-    utils/misc.cmi \
-    lambda/lambda.cmi \
-    middle_end/flambda/from_lambda/ilambda.cmi \
-    typing/ident.cmi \
-    middle_end/flambda/basic/continuation.cmi \
-    parsing/asttypes.cmi \
-    middle_end/flambda/from_lambda/eliminate_mutable_vars.cmi
-middle_end/flambda/from_lambda/eliminate_mutable_vars.cmx : \
-    utils/misc.cmx \
-    lambda/lambda.cmx \
-    middle_end/flambda/from_lambda/ilambda.cmx \
-    typing/ident.cmx \
-    middle_end/flambda/basic/continuation.cmx \
-    parsing/asttypes.cmi \
-    middle_end/flambda/from_lambda/eliminate_mutable_vars.cmi
-middle_end/flambda/from_lambda/eliminate_mutable_vars.cmi : \
-    middle_end/flambda/from_lambda/ilambda.cmi
 middle_end/flambda/from_lambda/ilambda.cmo : \
     utils/strongly_connected_components.cmi \
     lambda/printlambda.cmi \

compilerlibs/Makefile.compilerlibs

@@ -369,8 +369,7 @@ MIDDLE_END_FLAMBDA_FROM_LAMBDA=\
   middle_end/flambda/from_lambda/lambda_to_flambda_primitives_helpers.cmo \
   middle_end/flambda/from_lambda/lambda_to_flambda_primitives.cmo \
   middle_end/flambda/from_lambda/closure_conversion.cmo \
-  middle_end/flambda/from_lambda/cps_conversion.cmo \
-  middle_end/flambda/from_lambda/eliminate_mutable_vars.cmo
+  middle_end/flambda/from_lambda/cps_conversion.cmo
 
 
 MIDDLE_END_FLAMBDA_PARSER=\

middle_end/flambda/flambda_middle_end.ml

@@ -43,19 +43,6 @@ let print_ilambda ppf (ilam : Ilambda.program) =
       Ilambda.print ilam.expr
   end
 
-let print_ilambda_after_mutable_variable_elimination ppf
-      (ilam : Ilambda.program) =
-  if !Clflags.dump_ilambda then begin
-    Format.fprintf ppf
-      "\n%sAfter mutable variable elimination (return continuation %a) \
-       (exception continuation %a):%s@ %a@."
-      (Flambda_colours.each_file ())
-      Continuation.print ilam.return_continuation
-      Continuation.print ilam.exn_continuation.exn_handler
-      (Flambda_colours.normal ())
-      Ilambda.print ilam.expr
-  end
-
 let print_rawflambda ppf unit =
   if !Clflags.dump_rawflambda then begin
     Format.fprintf ppf "\n%sAfter closure conversion:%s@ %a@."
@@ -110,18 +97,6 @@ let middle_end0 ppf ~prefixname ~backend ~filename ~module_ident
         Cps_conversion.lambda_to_ilambda module_initializer)
     in
     print_ilambda ppf ilambda;
-    let ilambda =
-      if ilambda.uses_mutable_variables then begin
-        let ilambda =
-          Profile.record_call "eliminate_mutable_variables" (fun () ->
-            Eliminate_mutable_vars.run ilambda)
-        in
-        print_ilambda_after_mutable_variable_elimination ppf ilambda;
-        ilambda
-      end else begin
-        ilambda
-      end
-    in
     let flambda =
       Profile.record_call "closure_conversion" (fun () ->
         Closure_conversion.ilambda_to_flambda ~backend ~module_ident

middle_end/flambda/from_lambda/closure_conversion.ml

@@ -482,9 +482,6 @@ let rec close acc env (ilam : Ilambda.t) : Acc.t * Expr_with_acc.t =
         |> Expr_with_acc.create_let
     in
     close_named acc env ~let_bound_var:var defining_expr cont
-  | Let_mutable _ ->
-    Misc.fatal_error "[Let_mutable] should have been removed by \
-      [Eliminate_mutable_vars]"
   | Let_rec (defs, body) -> close_let_rec acc env ~defs ~body
   | Let_cont { name; is_exn_handler; params; recursive; body;
       handler; } ->
@@ -673,9 +670,6 @@ and close_named acc env ~let_bound_var (named : Ilambda.named)
   | Prim { prim; args; loc; exn_continuation; } ->
     close_primitive acc env ~let_bound_var named prim ~args loc
       exn_continuation k
-  | Assign _ | Mutable_read _ ->
-    Misc.fatal_error "[Assign] and [Mutable_read] should have been removed \
-      by [Eliminate_mutable_vars]"
 
 and close_let_rec acc env ~defs ~body =
   let env =

middle_end/flambda/from_lambda/cps_conversion.ml

@@ -36,7 +36,6 @@ module Env : sig
   val current_unit_id : t -> Ident.t
 
   val is_mutable : t -> Ident.t -> bool
-  val has_mutables : t -> bool
 
   val register_mutable_variable
      : t
@@ -86,7 +85,6 @@ module Env : sig
 end = struct
   type t = {
     current_unit_id : Ident.t;
-    has_mutables : bool ref; (* for now *)
     current_values_of_mutables_in_scope
       : (Ident.t * Lambda.value_kind) Ident.Map.t;
     mutables_needed_by_continuations : Ident.Set.t Continuation.Map.t;
@@ -105,7 +103,6 @@ end = struct
       ]
     in
     { current_unit_id;
-      has_mutables = ref false;
       current_values_of_mutables_in_scope = Ident.Map.empty;
       mutables_needed_by_continuations;
       try_stack = [];
@@ -119,9 +116,6 @@ end = struct
   let is_mutable t id =
     Ident.Map.mem id t.current_values_of_mutables_in_scope
 
-  let has_mutables t =
-    !(t.has_mutables)
-
   let register_mutable_variable t id kind =
     if Ident.Map.mem id t.current_values_of_mutables_in_scope then begin
       Misc.fatal_errorf "Redefinition of mutable variable %a"
@@ -1292,7 +1286,7 @@ and cps_switch env (switch : L.lambda_switch) ~scrutinee (k : Continuation.t)
           | Apply_cont (cont, trap, args) ->
             let consts_rev = (arm, cont, trap, args) :: consts_rev in
             consts_rev, wrappers
-          | Let _ | Let_mutable _ | Let_rec _ | Let_cont _ | Apply _
+          | Let _ | Let_rec _ | Let_cont _ | Apply _
           | Switch _ ->
             let consts_rev = (arm, cont, None, []) :: consts_rev in
             let wrappers = (cont, action) :: wrappers in
@@ -1400,5 +1394,4 @@ let lambda_to_ilambda lam : Ilambda.program =
     exn_continuation = {
       exn_handler = exn_continuation;
       extra_args = [] };
-    uses_mutable_variables = Env.has_mutables env;
   }