Rebase fixes

Author: mshinwell

backend/cmm_helpers.ml

@@ -4137,7 +4137,7 @@ let dls_get ~dbg = Cop (Cdls_get, [], dbg)
 
 let perform ~dbg eff =
   let cont =
-    make_alloc dbg Runtimetags.cont_tag
+    make_alloc dbg ~tag:Runtimetags.cont_tag
       [int_const dbg 0]
       ~mode:Lambda.alloc_heap
   in

middle_end/flambda2/simplify/simplify_static_const.ml

@@ -18,14 +18,13 @@ open! Flambda.Import
 open! Simplify_import
 
 let simplify_field_of_block dacc (field, kind) =
-  let ty =
+  let ty, simple =
     S.simplify_simple dacc
       (Simple.With_debuginfo.simple field)
       ~min_name_mode:Name_mode.normal
   in
   let field =
-    Simple.With_debuginfo.create (T.get_alias_exn ty)
-      (Simple.With_debuginfo.dbg field)
+    Simple.With_debuginfo.create simple (Simple.With_debuginfo.dbg field)
   in
   (* XXX double-check this can be a compile-time failure *)
   if not (K.equal (T.kind ty) kind)