Merge and remove Prepare_lambda (#435)

Author: Keryan-dev

.depend

@@ -3771,7 +3771,6 @@ middle_end/flambda/flambda_middle_end.cmo : \
     utils/profile.cmi \
     lambda/printlambda.cmi \
     middle_end/flambda/parser/print_fexpr.cmi \
-    middle_end/flambda/from_lambda/prepare_lambda.cmi \
     utils/misc.cmi \
     middle_end/flambda/inlining/inlining_report.cmi \
     middle_end/flambda/from_lambda/ilambda.cmi \
@@ -3794,7 +3793,6 @@ middle_end/flambda/flambda_middle_end.cmx : \
     utils/profile.cmx \
     lambda/printlambda.cmx \
     middle_end/flambda/parser/print_fexpr.cmx \
-    middle_end/flambda/from_lambda/prepare_lambda.cmx \
     utils/misc.cmx \
     middle_end/flambda/inlining/inlining_report.cmx \
     middle_end/flambda/from_lambda/ilambda.cmx \
@@ -4060,7 +4058,6 @@ middle_end/flambda/flambda_middle_end.cmo : \
     utils/profile.cmi \
     lambda/printlambda.cmi \
     middle_end/flambda/parser/print_fexpr.cmi \
-    middle_end/flambda/from_lambda/prepare_lambda.cmi \
     utils/misc.cmi \
     middle_end/flambda/inlining/inlining_report.cmi \
     middle_end/flambda/from_lambda/ilambda.cmi \
@@ -4083,7 +4080,6 @@ middle_end/flambda/flambda_middle_end.cmx : \
     utils/profile.cmx \
     lambda/printlambda.cmx \
     middle_end/flambda/parser/print_fexpr.cmx \
-    middle_end/flambda/from_lambda/prepare_lambda.cmx \
     utils/misc.cmx \
     middle_end/flambda/inlining/inlining_report.cmx \
     middle_end/flambda/from_lambda/ilambda.cmx \
@@ -5188,33 +5184,6 @@ middle_end/flambda/from_lambda/lambda_to_flambda_primitives_helpers.cmi : \
     middle_end/flambda/basic/exn_continuation.cmi \
     lambda/debuginfo.cmi \
     middle_end/flambda/from_lambda/closure_conversion_aux.cmi
-middle_end/flambda/from_lambda/prepare_lambda.cmo : \
-    utils/targetint.cmi \
-    lambda/tag.cmi \
-    lambda/simplif.cmi \
-    lambda/printlambda.cmi \
-    utils/numbers.cmi \
-    utils/misc.cmi \
-    lambda/matching.cmi \
-    lambda/lambda.cmi \
-    typing/ident.cmi \
-    middle_end/flambda/compilenv_deps/compilation_unit.cmi \
-    middle_end/flambda/from_lambda/prepare_lambda.cmi
-middle_end/flambda/from_lambda/prepare_lambda.cmx : \
-    utils/targetint.cmx \
-    lambda/tag.cmx \
-    lambda/simplif.cmx \
-    lambda/printlambda.cmx \
-    utils/numbers.cmx \
-    utils/misc.cmx \
-    lambda/matching.cmx \
-    lambda/lambda.cmx \
-    typing/ident.cmx \
-    middle_end/flambda/compilenv_deps/compilation_unit.cmx \
-    middle_end/flambda/from_lambda/prepare_lambda.cmi
-middle_end/flambda/from_lambda/prepare_lambda.cmi : \
-    utils/numbers.cmi \
-    lambda/lambda.cmi
 middle_end/flambda/inlining/inlining_arguments.cmo : \
     middle_end/flambda/types/basic/or_unknown.cmi \
     utils/misc.cmi \

compilerlibs/Makefile.compilerlibs

@@ -362,7 +362,6 @@ MIDDLE_END_FLAMBDA_SIMPLIFY=\
 
 MIDDLE_END_FLAMBDA_FROM_LAMBDA=\
   middle_end/flambda/from_lambda/lambda_conversions.cmo \
-  middle_end/flambda/from_lambda/prepare_lambda.cmo \
   middle_end/flambda/from_lambda/ilambda.cmo \
   middle_end/flambda/from_lambda/closure_conversion_aux.cmo \
   middle_end/flambda/from_lambda/lambda_to_flambda_primitives_helpers.cmo \

driver/main_args.ml

@@ -764,10 +764,6 @@ let mk_dclambda f =
   "-dclambda", Arg.Unit f, " (undocumented)"
 ;;
 
-let mk_dprepared_lambda f =
-  "-dprepared-lambda", Arg.Unit f, " Print terms after [Prepare_lambda]"
-;;
-
 let mk_dilambda f =
   "-dilambda", Arg.Unit f, " Print Ilambda terms"
 ;;
@@ -1707,7 +1703,6 @@ struct
     mk_dump_into_file F._dump_into_file;
     mk_dump_pass F._dump_pass;
 
-    mk_dprepared_lambda F._dprepared_lambda;
     mk_dilambda F._dilambda;
 
     mk_args F._args;
@@ -1863,7 +1858,6 @@ module Make_opttop_options (F : Opttop_options) = struct
     mk_dstartup F._dstartup;
     mk_dump_pass F._dump_pass;
 
-    mk_dprepared_lambda F._dprepared_lambda;
     mk_dilambda F._dilambda;
   ]
 end;;

middle_end/flambda/flambda_middle_end.ml

@@ -31,14 +31,6 @@ let check_invariants unit =
     raise exn
   end
 
-let print_prepared_lambda ppf lam =
-  if !Clflags.dump_prepared_lambda then begin
-    Format.fprintf ppf "%sAfter Prepare_lambda:%s@ %a@."
-      (Flambda_colours.each_file ())
-      (Flambda_colours.normal ())
-      Printlambda.lambda lam
-  end
-
 let print_ilambda ppf (ilam : Ilambda.program) =
   if !Clflags.dump_ilambda then begin
     Format.fprintf ppf
@@ -113,14 +105,9 @@ let middle_end0 ppf ~prefixname ~backend ~filename ~module_ident
       ~module_block_size_in_words ~module_initializer =
   Misc.Color.setup !Clflags.color;
   Profile.record_call "flambda.0" (fun () ->
-    let prepared_lambda =
-      Profile.record_call "prepare_lambda" (fun () ->
-        Prepare_lambda.run module_initializer)
-    in
-    print_prepared_lambda ppf prepared_lambda;
     let ilambda =
       Profile.record_call "cps_conversion" (fun () ->
-        Cps_conversion.lambda_to_ilambda prepared_lambda)
+        Cps_conversion.lambda_to_ilambda module_initializer)
     in
     print_ilambda ppf ilambda;
     let ilambda =