Revert "Temporary hack for bug in Row_like join (ocaml-flambda#137)"

This reverts commit c9591dc.
chambart · Aug 4, 2021 · 69484b9 · 69484b9
1 parent c9591dc
commit 69484b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/middle_end/flambda2/types/structures/product.rec.ml b/middle_end/flambda2/types/structures/product.rec.ml
@@ -247,11 +247,9 @@ module Int_indexed = struct
 
   let join env t1 t2 =
     if not (Flambda_kind.equal t1.kind t2.kind) then begin
-      failwith "mismatching kinds" (* XXX temporary *)
-        (*
       Misc.fatal_errorf "Product.Int_indexed.join between mismatching \
                          kinds %a and %a@."
-        Flambda_kind.print t1.kind Flambda_kind.print t2.kind *)
+        Flambda_kind.print t1.kind Flambda_kind.print t2.kind
     end;
     let fields1 = t1.fields in
     let fields2 = t2.fields in

diff --git a/middle_end/flambda2/types/type_of_kind/type_of_kind_value0.rec.ml b/middle_end/flambda2/types/type_of_kind/type_of_kind_value0.rec.ml
@@ -340,9 +340,7 @@ let join_variant env
     Known (Blocks.join env b1 b2)
   in
   let blocks =
-    try (* XXX temporary *)
-      join_unknown blocks_join env blocks1 blocks2
-    with (Failure _) -> Or_unknown.Unknown
+    join_unknown blocks_join env blocks1 blocks2
   in
   let imms =
     join_unknown (T.join ?bound_name:None) env imms1 imms2