Merge ocaml-jst#97

Author: poechsel

ocaml/.github/workflows/build.yml

@@ -46,58 +46,58 @@ jobs:
       with:
         path: 'ocaml-jst'
 
-    - name: Cache OCaml 4.12 and dune
+    - name: Cache OCaml 4.14 and dune
       uses: actions/cache@v1
       id: cache
       with:
-        path: ${{ github.workspace }}/ocaml-412/_install
-        key: ${{ matrix.os }}-cache-ocaml-412-dune-341-bits-${{ matrix.boot_cachekey }}
+        path: ${{ github.workspace }}/ocaml-414/_install
+        key: ${{ matrix.os }}-cache-ocaml-414-dune-361-bits-${{ matrix.boot_cachekey }}
 
-    - name: Checkout OCaml 4.12
+    - name: Checkout OCaml 4.14
       uses: actions/checkout@master
       if: steps.cache.outputs.cache-hit != 'true'
       with:
         repository: 'ocaml/ocaml'
-        path: 'ocaml-412'
-        ref: '4.12'
+        path: 'ocaml-414'
+        ref: '4.14'
 
     - name: Setup 32-bit C compiler
       if: matrix.name == 'i386' && steps.cache.outputs.cache-hit != 'true'
       run: |
-        mkdir -p ocaml-412/_install/bin
-        { echo '#!/bin/sh'; echo 'exec gcc -m32 "$@"'; } > ocaml-412/_install/bin/cc32
-        chmod +x ocaml-412/_install/bin/cc32
+        mkdir -p ocaml-414/_install/bin
+        { echo '#!/bin/sh'; echo 'exec gcc -m32 "$@"'; } > ocaml-414/_install/bin/cc32
+        chmod +x ocaml-414/_install/bin/cc32
 
-    - name: Build OCaml 4.12
+    - name: Build OCaml 4.14
       if: steps.cache.outputs.cache-hit != 'true'
-      working-directory: ocaml-412
+      working-directory: ocaml-414
       run: |
-        export PATH=$GITHUB_WORKSPACE/ocaml-412/_install/bin:$PATH
-        ./configure --prefix=$GITHUB_WORKSPACE/ocaml-412/_install ${{ matrix.boot_config }}
+        export PATH=$GITHUB_WORKSPACE/ocaml-414/_install/bin:$PATH
+        ./configure --prefix=$GITHUB_WORKSPACE/ocaml-414/_install ${{ matrix.boot_config }}
         make -j $J world.opt
         make install
         # Remove unneeded parts to shrink cache file
-        rm -rf $GITHUB_WORKSPACE/ocaml-412/_install/{lib/ocaml/compiler-libs,lib/ocaml/expunge,bin/*.byte}
+        rm -rf $GITHUB_WORKSPACE/ocaml-414/_install/{lib/ocaml/compiler-libs,lib/ocaml/expunge,bin/*.byte}
 
     - name: Checkout dune github repo
       uses: actions/checkout@master
       if: steps.cache.outputs.cache-hit != 'true'
       with:
         repository: 'ocaml/dune'
-        ref: '3.4.1'
+        ref: '3.6.1'
         path: 'dune'
 
     - name: Build dune
       working-directory: dune
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
-        PATH=$GITHUB_WORKSPACE/ocaml-412/_install/bin:$PATH make release
-        cp dune.exe $GITHUB_WORKSPACE/ocaml-412/_install/bin/dune
+        PATH=$GITHUB_WORKSPACE/ocaml-414/_install/bin:$PATH make release
+        cp _boot/dune.exe $GITHUB_WORKSPACE/ocaml-414/_install/bin/dune
 
     - name: Configure OCaml
       working-directory: ocaml-jst
       run: |
-        export PATH=$GITHUB_WORKSPACE/ocaml-412/_install/bin:$PATH
+        export PATH=$GITHUB_WORKSPACE/ocaml-414/_install/bin:$PATH
         autoconf
         ./configure \
           --prefix=$GITHUB_WORKSPACE/_install \
@@ -106,7 +106,7 @@ jobs:
     - name: Build, install and test ocaml-jst
       working-directory: ocaml-jst
       run: |
-        export PATH=$GITHUB_WORKSPACE/ocaml-412/_install/bin:$PATH
+        export PATH=$GITHUB_WORKSPACE/ocaml-414/_install/bin:$PATH
         make -f Makefile.jst runtest-upstream
       env:
         BUILD_OCAMLPARAM: ${{ matrix.ocamlparam }}

ocaml/.github/workflows/menhir.yml

@@ -0,0 +1,15 @@
+name: menhir
+on: [push, pull_request]
+jobs:
+  menhir:
+    name: Check Menhir version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the ocaml-jst repo
+        uses: actions/checkout@master
+        with:
+          path: 'ocaml-jst'
+      - name: Check Menhir version
+        shell: bash
+        run: |
+          grep --count --max-count=1 --quiet 'MenhirLib.StaticVersion.require_20210419' ocaml-jst/boot/menhir/parser.ml

ocaml/boot/ocamlc

@@ -343,4 +343,4 @@ module M : sig type t [@@immediate] end
 type t2 = { x : int; } [@@unboxed]
 val f : local_ M.t -> M.t = <fun>
 val f : local_ t2 -> t2 = <fun>
-|}]  
+|}]

ocaml/testsuite/tests/typing-local/crossing.ml

@@ -0,0 +1,14 @@
+(* TEST
+ * arch64
+ ** expect *)
+
+(* Mode crossing works on immediate64 types *)
+module F (M : sig type t [@@immediate64] end) = struct
+  let f : local_ M.t -> _ = fun t -> t
+end
+
+[%%expect{|
+module F :
+  functor (M : sig type t [@@immediate64] end) ->
+    sig val f : local_ M.t -> M.t end
+|}]

ocaml/testsuite/tests/typing-local/crossing_64.ml

@@ -559,7 +559,7 @@ let mode_cross env (ty : type_expr) mode =
   if is_principal ty then begin
     match immediacy env ty with
     | Type_immediacy.Always -> Value_mode.newvar ()
-    | Type_immediacy.Always_on_64bits when !Clflags.native_code && Sys.word_size = 64 ->
+    | Type_immediacy.Always_on_64bits when Sys.word_size = 64 ->
         Value_mode.newvar ()  (* floating and relaxed *)
     | _ -> mode
   end