bootstrap; fix errors

ocaml-flambda · May 31, 2023 · 57eb68e · 57eb68e
1 parent 4ed1de4
commit 57eb68e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/ocaml/boot/ocamlc b/ocaml/boot/ocamlc
diff --git a/ocaml/boot/ocamllex b/ocaml/boot/ocamllex
diff --git a/ocaml/testsuite/tests/typing-missing-cmi/test.compilers.reference b/ocaml/testsuite/tests/typing-missing-cmi/test.compilers.reference
@@ -3,6 +3,6 @@ File "main.ml", line 1, characters 8-11:
             ^^^
 Error: This expression has type M.a but an expression was expected of type
          ('a : value)
-       M.a has an unknown layout, which might not be representable.         
+       M.a has an unknown layout, which might not be a sublayout of value.
        No .cmi file found containing M.a.
        Hint: Adding "m" to your dependencies might help.
diff --git a/ocaml/typing/ctype.ml b/ocaml/typing/ctype.ml
@@ -3767,7 +3767,8 @@ let filter_arrow env t l ~force_tpoly =
             newty2 ~level
               (* CR layouts v5: Change the Layout.value when option can
                  hold non-values. *)
-              (Tconstr(Predef.path_option,[newvar2 level Layout.value],
+              (Tconstr(Predef.path_option,
+                       [newvar2 level (Layout.value ~why:Type_argument)],
                        ref Mnil))
           else
             newvar2 level l1