Better reporting when OCaml compiler versions don't match

bcpierce00 · May 23, 2016 · 3c581cc · 3c581cc
1 parent f216428
commit 3c581cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/RECENTNEWS b/src/RECENTNEWS
@@ -3,8 +3,7 @@ CHANGES FROM VERSION 2.48.4
 * Fix build for OCaml 4.03
 (and add Makefile improvements for exporting under git)
 
-
-
+* Better reporting for OCaml compiler version mismatch
 
 -------------------------------
 CHANGES FROM VERSION 2.48.1

diff --git a/src/remote.ml b/src/remote.ml
@@ -450,7 +450,12 @@ let defaultMarshalingFunctions =
      let s = Bytearray.marshal data [Marshal.No_sharing] in
      let l = Bytearray.length s in
      ((s, 0, l) :: rem, l)),
-  (fun buf pos -> Bytearray.unmarshal buf pos)
+  (fun buf pos ->
+      try Bytearray.unmarshal buf pos
+      with Failure s -> raise (Util.Fatal (Printf.sprintf 
+"Fatal error during unmarshaling (%s),
+possibly because client and server have been compiled with different\
+versions of the OCaml compiler." s)))
 
 let makeMarshalingFunctions payloadMarshalingFunctions string =
   let (marshalPayload, unmarshalPayload) = payloadMarshalingFunctions in