Review changes

Author: mshinwell

file_formats/cmi_format.ml

@@ -127,6 +127,7 @@ let input_cmi_lazy ic =
     } = (input_value ic : header) in
   let crcs = (input_value ic : crcs) in
   let flags = (input_value ic : flags) in
+  (* CR ocaml 5 compressed-marshal mshinwell: upstream uses [Compression] *)
   {
       cmi_name = name;
       cmi_kind = kind;
@@ -183,19 +184,12 @@ let output_cmi filename oc cmi =
   let len = Int64.sub val_pos data_pos in
   output_int64 oc len;
   Out_channel.seek oc val_pos;
-  (* BACKPORT BEGIN *)
-  (* CR ocaml 5 compressed-marshal mshinwell:
-     upstream uses [Compression] here:
-     Compression.output_value oc ((cmi.cmi_name, cmi.cmi_sign) : header);
-
-  *)
   output_value oc
     {
       header_name = cmi.cmi_name;
       header_kind = cmi.cmi_kind;
       header_sign = sign;
     };
-  (* BACKPORT END *)
   flush oc;
   let crc = Digest.file filename in
   let my_info =

file_formats/cmt_format.ml

@@ -242,9 +242,10 @@ let iter_on_occurrences
       | Ttyp_class (path, lid, _typs) ->
           (* Deprecated syntax to extend a polymorphic variant *)
           f ~namespace:Type ctyp_env path lid
+      | Ttyp_open (path, lid, _ct) ->
+          f ~namespace:Module ctyp_env path lid
       | Ttyp_var _ | Ttyp_arrow _ | Ttyp_tuple _ | Ttyp_object _
-      | Ttyp_alias _ | Ttyp_variant _ | Ttyp_poly _
-      | Ttyp_call_pos | Ttyp_open _ -> ());
+      | Ttyp_alias _ | Ttyp_variant _ | Ttyp_poly _ | Ttyp_call_pos -> ());
       default_iterator.typ sub ct);
 
   pat =