Revert (most of) "Overhaul Aliases_of_canonical_element; add Alias_set"

This reverts the parts of commit
9816841 that have been split off into
PRs #383 and #386, as well as the Bottom stuff (likely to be unnecessary
as we're considering making `Coercion.compose` a total function).

Author: lukemaurer

.depend

@@ -6002,7 +6002,6 @@ middle_end/flambda/simplify/common_subexpression_elimination.cmo : \
     middle_end/flambda/compilenv_deps/flambda_features.cmi \
     middle_end/flambda/basic/continuation_extra_params_and_args.cmi \
     middle_end/flambda/basic/apply_cont_rewrite_id.cmi \
-    middle_end/flambda/types/env/aliases.cmi \
     middle_end/flambda/simplify/common_subexpression_elimination.cmi
 middle_end/flambda/simplify/common_subexpression_elimination.cmx : \
     middle_end/flambda/compilenv_deps/variable.cmx \
@@ -6020,7 +6019,6 @@ middle_end/flambda/simplify/common_subexpression_elimination.cmx : \
     middle_end/flambda/compilenv_deps/flambda_features.cmx \
     middle_end/flambda/basic/continuation_extra_params_and_args.cmx \
     middle_end/flambda/basic/apply_cont_rewrite_id.cmx \
-    middle_end/flambda/types/env/aliases.cmx \
     middle_end/flambda/simplify/common_subexpression_elimination.cmi
 middle_end/flambda/simplify/common_subexpression_elimination.cmi : \
     middle_end/flambda/basic/simple.cmi \
@@ -8988,8 +8986,7 @@ middle_end/flambda/types/flambda_type.cmi : \
     middle_end/flambda/basic/code_id.cmi \
     middle_end/flambda/types/structures/code_age_relation.cmi \
     middle_end/flambda/basic/closure_id.cmi \
-    middle_end/flambda/basic/apply_cont_rewrite_id.cmi \
-    middle_end/flambda/types/env/aliases.cmi
+    middle_end/flambda/basic/apply_cont_rewrite_id.cmi
 middle_end/flambda/types/resolved_type.rec.cmo : \
     middle_end/flambda/basic/reg_width_const.cmi \
     middle_end/flambda/types/basic/or_unknown_or_bottom.cmi \
@@ -9017,7 +9014,6 @@ middle_end/flambda/types/type_descr.rec.cmo : \
     middle_end/flambda/cmx/ids_for_export.cmi \
     middle_end/flambda/compilenv_deps/flambda_colours.cmi \
     utils/clflags.cmi \
-    middle_end/flambda/types/env/aliases.cmi \
     middle_end/flambda/types/type_descr.rec.cmi
 middle_end/flambda/types/type_descr.rec.cmx : \
     middle_end/flambda/naming/with_delayed_permutation.cmx \
@@ -9035,7 +9031,6 @@ middle_end/flambda/types/type_descr.rec.cmx : \
     middle_end/flambda/cmx/ids_for_export.cmx \
     middle_end/flambda/compilenv_deps/flambda_colours.cmx \
     utils/clflags.cmx \
-    middle_end/flambda/types/env/aliases.cmx \
     middle_end/flambda/types/type_descr.rec.cmi
 middle_end/flambda/types/type_descr.rec.cmi : \
     middle_end/flambda/types/type_head_intf.cmo \
@@ -9302,8 +9297,6 @@ middle_end/flambda/types/basic/var_within_closure_set.cmi : \
 middle_end/flambda/types/env/aliases.cmo : \
     middle_end/flambda/compilenv_deps/variable.cmi \
     middle_end/flambda/basic/simple.cmi \
-    middle_end/flambda/compilenv_deps/reg_width_things.cmi \
-    middle_end/flambda/types/basic/or_bottom.cmi \
     middle_end/flambda/naming/name_mode.cmi \
     middle_end/flambda/basic/name.cmi \
     utils/misc.cmi \
@@ -9316,8 +9309,6 @@ middle_end/flambda/types/env/aliases.cmo : \
 middle_end/flambda/types/env/aliases.cmx : \
     middle_end/flambda/compilenv_deps/variable.cmx \
     middle_end/flambda/basic/simple.cmx \
-    middle_end/flambda/compilenv_deps/reg_width_things.cmx \
-    middle_end/flambda/types/basic/or_bottom.cmx \
     middle_end/flambda/naming/name_mode.cmx \
     middle_end/flambda/basic/name.cmx \
     utils/misc.cmx \
@@ -9329,11 +9320,9 @@ middle_end/flambda/types/env/aliases.cmx : \
     middle_end/flambda/types/env/aliases.cmi
 middle_end/flambda/types/env/aliases.cmi : \
     middle_end/flambda/basic/simple.cmi \
-    middle_end/flambda/types/basic/or_bottom.cmi \
     middle_end/flambda/naming/name_mode.cmi \
     middle_end/flambda/basic/name.cmi \
     middle_end/flambda/cmx/contains_ids.cmo \
-    middle_end/flambda/compilenv_deps/coercion.cmi \
     middle_end/flambda/types/env/binding_time.cmi
 middle_end/flambda/types/env/binding_time.cmo : \
     utils/numbers.cmi \
@@ -9427,8 +9416,7 @@ middle_end/flambda/types/env/typing_env.rec.cmi : \
     middle_end/flambda/compilenv_deps/compilation_unit.cmi \
     middle_end/flambda/basic/code_id.cmi \
     middle_end/flambda/types/structures/code_age_relation.cmi \
-    middle_end/flambda/basic/apply_cont_rewrite_id.cmi \
-    middle_end/flambda/types/env/aliases.cmi
+    middle_end/flambda/basic/apply_cont_rewrite_id.cmi
 middle_end/flambda/types/env/typing_env_extension.rec.cmo : \
     middle_end/flambda/compilenv_deps/variable.cmi \
     middle_end/flambda/types/basic/or_bottom.cmi \

compilerlibs/Makefile.compilerlibs

@@ -224,7 +224,6 @@ MIDDLE_END_FLAMBDA_BASIC=\
   middle_end/flambda/basic/coeffects.cmo \
   middle_end/flambda/basic/effects.cmo \
   middle_end/flambda/basic/export_id.cmo \
-  middle_end/flambda/types/basic/or_bottom.cmo \
   middle_end/flambda/types/basic/or_unknown.cmo \
   middle_end/flambda/terms/flambda_primitive.cmo \
   middle_end/flambda/basic/recursive.cmo \
@@ -261,6 +260,7 @@ MIDDLE_END_FLAMBDA_TYPES=\
   middle_end/flambda/types/env/binding_time.cmo \
   middle_end/flambda/types/env/aliases.cmo \
   middle_end/flambda/types/basic/meet_or_join_op.cmo \
+  middle_end/flambda/types/basic/or_bottom.cmo \
   middle_end/flambda/types/basic/string_info.cmo \
   middle_end/flambda/types/basic/or_unknown_or_bottom.cmo \
   middle_end/flambda/types/structures/code_age_relation.cmo \

middle_end/flambda/basic/kinded_parameter.ml

@@ -115,6 +115,8 @@ module List = struct
 
   let name_set t = Name.Set.of_list (List.map Name.var (vars t))
 
+  let simple_set t = Simple.Set.of_list (simples t)
+
   let rename t = List.map (fun t -> rename t) t
 
   let arity t = List.map (fun t -> Flambda_kind.With_subkind.kind (kind t)) t

middle_end/flambda/basic/kinded_parameter.mli

@@ -68,6 +68,8 @@ module List : sig
   (** As for [var_set] but returns a set of [Name]s. *)
   val name_set : t -> Name.Set.t
 
+  val simple_set : t -> Simple.Set.t
+
   val equal_vars : t -> Variable.t list -> bool
 
   val rename : t -> t

middle_end/flambda/simplify/common_subexpression_elimination.ml

@@ -117,12 +117,7 @@ end
 
 let cse_with_eligible_lhs ~typing_env_at_fork ~cse_at_each_use ~params prev_cse
       (extra_bindings: EPA.t) extra_equations =
-  let params = KP.List.name_set params in
-  let is_param simple =
-    Simple.pattern_match simple
-      ~name:(fun name -> Name.Set.mem name params)
-      ~const:(fun _ -> false)
-  in
+  let params = KP.List.simple_set params in
   List.fold_left cse_at_each_use ~init:EP.Map.empty
     ~f:(fun eligible (env_at_use, id, cse) ->
       let find_new_name =
@@ -187,17 +182,15 @@ let cse_with_eligible_lhs ~typing_env_at_fork ~cse_at_each_use ~params prev_cse
                  since they are defined in [env_at_fork].  However these
                  aren't bound at the use sites, so we must choose another
                  alias that is. *)
-              if not (is_param bound_to) then Some bound_to
+              if not (Simple.Set.mem bound_to params) then Some bound_to
               else
                 let aliases =
                   TE.aliases_of_simple env_at_use
                     ~min_name_mode:NM.normal bound_to
-                  |> Aliases.Alias_set.filter ~f:(fun simple ->
-                    not (is_param simple))
+                  |> Simple.Set.filter (fun simple ->
+                    not (Simple.Set.mem simple params))
                 in
-                (* CR lmaurer: This could be using
-                   [Aliases.Alias_set.find_best], I think? *)
-                Aliases.Alias_set.get_singleton aliases
+                Simple.Set.get_singleton aliases
             in
             match bound_to with
             | None -> eligible