Move the Lmap module into the flambda2 tree (#498)

.depend

@@ -75,13 +75,6 @@ utils/int_replace_polymorphic_compare.cmo : \
 utils/int_replace_polymorphic_compare.cmx : \
     utils/int_replace_polymorphic_compare.cmi
 utils/int_replace_polymorphic_compare.cmi :
-utils/lmap.cmo : \
-    utils/misc.cmi \
-    utils/lmap.cmi
-utils/lmap.cmx : \
-    utils/misc.cmx \
-    utils/lmap.cmi
-utils/lmap.cmi :
 utils/load_path.cmo : \
     utils/misc.cmi \
     utils/local_store.cmi \
@@ -3932,6 +3925,13 @@ middle_end/flambda/compilenv_deps/linkage_name.cmx : \
     middle_end/flambda/compilenv_deps/linkage_name.cmi
 middle_end/flambda/compilenv_deps/linkage_name.cmi : \
     utils/identifiable.cmi
+middle_end/flambda/compilenv_deps/lmap.cmo : \
+    utils/misc.cmi \
+    middle_end/flambda/compilenv_deps/lmap.cmi
+middle_end/flambda/compilenv_deps/lmap.cmx : \
+    utils/misc.cmx \
+    middle_end/flambda/compilenv_deps/lmap.cmi
+middle_end/flambda/compilenv_deps/lmap.cmi :
 middle_end/flambda/compilenv_deps/patricia_tree.cmo : \
     utils/numbers.cmi \
     utils/misc.cmi \
@@ -4120,21 +4120,21 @@ middle_end/flambda/basic/apply_cont_rewrite_id.cmi : \
     utils/identifiable.cmi
 middle_end/flambda/basic/closure_id.cmo : \
     middle_end/flambda/compilenv_deps/variable.cmi \
-    utils/lmap.cmi \
+    middle_end/flambda/compilenv_deps/lmap.cmi \
     utils/identifiable.cmi \
     middle_end/flambda/compilenv_deps/flambda_colours.cmi \
     middle_end/flambda/compilenv_deps/compilation_unit.cmi \
     middle_end/flambda/basic/closure_id.cmi
 middle_end/flambda/basic/closure_id.cmx : \
     middle_end/flambda/compilenv_deps/variable.cmx \
-    utils/lmap.cmx \
+    middle_end/flambda/compilenv_deps/lmap.cmx \
     utils/identifiable.cmx \
     middle_end/flambda/compilenv_deps/flambda_colours.cmx \
     middle_end/flambda/compilenv_deps/compilation_unit.cmx \
     middle_end/flambda/basic/closure_id.cmi
 middle_end/flambda/basic/closure_id.cmi : \
     middle_end/flambda/compilenv_deps/variable.cmi \
-    utils/lmap.cmi \
+    middle_end/flambda/compilenv_deps/lmap.cmi \
     utils/identifiable.cmi \
     middle_end/flambda/compilenv_deps/compilation_unit.cmi
 middle_end/flambda/basic/closure_origin.cmo : \
@@ -4152,7 +4152,7 @@ middle_end/flambda/basic/code_id.cmo : \
     middle_end/flambda/compilenv_deps/symbol.cmi \
     middle_end/flambda/compilenv_deps/patricia_tree.cmi \
     utils/numbers.cmi \
-    utils/lmap.cmi \
+    middle_end/flambda/compilenv_deps/lmap.cmi \
     middle_end/flambda/compilenv_deps/linkage_name.cmi \
     utils/identifiable.cmi \
     middle_end/flambda/compilenv_deps/flambda_colours.cmi \
@@ -4163,15 +4163,15 @@ middle_end/flambda/basic/code_id.cmx : \
     middle_end/flambda/compilenv_deps/symbol.cmx \
     middle_end/flambda/compilenv_deps/patricia_tree.cmx \
     utils/numbers.cmx \
-    utils/lmap.cmx \
+    middle_end/flambda/compilenv_deps/lmap.cmx \
     middle_end/flambda/compilenv_deps/linkage_name.cmx \
     utils/identifiable.cmx \
     middle_end/flambda/compilenv_deps/flambda_colours.cmx \
     middle_end/flambda/compilenv_deps/compilation_unit.cmx \
     middle_end/flambda/basic/code_id.cmi
 middle_end/flambda/basic/code_id.cmi : \
     middle_end/flambda/compilenv_deps/symbol.cmi \
-    utils/lmap.cmi \
+    middle_end/flambda/compilenv_deps/lmap.cmi \
     utils/identifiable.cmi \
     middle_end/flambda/compilenv_deps/compilation_unit.cmi
 middle_end/flambda/basic/code_id_or_symbol.cmo : \
@@ -4824,6 +4824,7 @@ middle_end/flambda/from_lambda/closure_conversion.cmo : \
     middle_end/flambda/naming/name_mode.cmi \
     utils/misc.cmi \
     middle_end/flambda/compilenv_deps/linkage_name.cmi \
+    middle_end/flambda/from_lambda/lambda_to_flambda_primitives_helpers.cmi \
     middle_end/flambda/from_lambda/lambda_to_flambda_primitives.cmi \
     middle_end/flambda/from_lambda/lambda_conversions.cmi \
     lambda/lambda.cmi \
@@ -4877,6 +4878,7 @@ middle_end/flambda/from_lambda/closure_conversion.cmx : \
     middle_end/flambda/naming/name_mode.cmx \
     utils/misc.cmx \
     middle_end/flambda/compilenv_deps/linkage_name.cmx \
+    middle_end/flambda/from_lambda/lambda_to_flambda_primitives_helpers.cmx \
     middle_end/flambda/from_lambda/lambda_to_flambda_primitives.cmx \
     middle_end/flambda/from_lambda/lambda_conversions.cmx \
     lambda/lambda.cmx \

compilerlibs/Makefile.compilerlibs

@@ -32,8 +32,7 @@ UTILS=utils/config.cmo utils/build_path_prefix_map.cmo utils/misc.cmo \
 	utils/consistbl.cmo utils/strongly_connected_components.cmo \
         utils/one_bit_fewer.cmo \
 	utils/targetint.cmo utils/int_replace_polymorphic_compare.cmo \
-	utils/domainstate.cmo utils/binutils.cmo utils/printing_cache.cmo \
-        utils/lmap.cmo
+	utils/domainstate.cmo utils/binutils.cmo utils/printing_cache.cmo
 UTILS_CMI=
 
 PARSING=parsing/location.cmo parsing/longident.cmo \
@@ -179,6 +178,7 @@ MIDDLE_END_CLOSURE=\
 MIDDLE_END_CLOSURE_CMI=
 
 MIDDLE_END_FLAMBDA_COMPILENV_DEPS=\
+  middle_end/flambda/compilenv_deps/lmap.cmo \
   middle_end/flambda/compilenv_deps/tag.cmo \
   middle_end/flambda/compilenv_deps/table_by_int_id.cmo \
   middle_end/flambda/compilenv_deps/patricia_tree.cmo \

dune

@@ -53,7 +53,7 @@
    config build_path_prefix_map misc identifiable numbers arg_helper clflags
    profile terminfo ccomp warnings consistbl strongly_connected_components
    one_bit_fewer targetint load_path
-   int_replace_polymorphic_compare printing_cache lmap
+   int_replace_polymorphic_compare printing_cache
    binutils local_store
    ; manual update: mli only files
    targetint_intf