New upstream version 4.05.0

diff --git a/.gitattributes b/.gitattributes
index a816cdfe1192dbe9b1d3b2b954531c5ac56c443e..b3eabd77a813420da74b65494124dcbe843349fd 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -158,10 +158,12 @@ testsuite/tests/typing-typeparam/newtype.ml text eol=lf
 testsuite/tests/typing-unboxed/test.ml text eol=lf
 testsuite/tests/typing-unboxed-types/test.ml text eol=lf
 testsuite/tests/typing-warnings/ambiguous_guarded_disjunction.ml text eol=lf
+testsuite/tests/typing-warnings/application.ml text eol=lf
 testsuite/tests/typing-warnings/coercions.ml text eol=lf
 testsuite/tests/typing-warnings/exhaustiveness.ml text eol=lf
 testsuite/tests/typing-warnings/pr6872.ml text eol=lf
 testsuite/tests/typing-warnings/pr7085.ml text eol=lf
 testsuite/tests/typing-warnings/pr7115.ml text eol=lf
+testsuite/tests/typing-warnings/pr7297.ml text eol=lf
 testsuite/tests/typing-warnings/records.ml text eol=lf
 testsuite/tests/typing-warnings/unused_types.ml text eol=lf

diff --git a/Changes b/Changes
index d04f381017d981190309e6ea4d0f3c46cf6511c1..cc59f635ebb9a35f9958f3330e9ac9abc0d9bcaa 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,5 @@
-OCaml 4.05.0 (TBD):
-----------------------------
+OCaml 4.05.0 (13 Jul 2017):
+---------------------------
 
 (Changes that can break existing programs are marked with a "*")
 
@@ -10,12 +10,16 @@ OCaml 4.05.0 (TBD):
 - MPR#7201, GPR#954: Correct wrong optimisation of "0 / <expr>"
   and "0 mod <expr>" in the case when <expr> was a non-constant
   evaluating to zero
-  (Mark Shinwell)
+  (Mark Shinwell, review by Gabriel Scherer, Leo White and Xavier Leroy)
 
 - MPR#7357, GPR#832: Improve compilation time for toplevel
   include(struct ... end : sig ... end)
   (Alain Frisch, report by Hongbo Zhang, review by Jacques Garrigue)
 
+- MPR#7533, GPR#1173: Correctly perform side effects for certain
+  cases of "/" and "mod"
+  (Mark Shinwell, report by Jan Mitgaard)
+
 - GPR#504: Instrumentation support for fuzzing with afl-fuzz.
   (Stephen Dolan, review by Alain Frisch, Pierre Chambart, Mark
   Shinwell, Gabriel Scherer and Damien Doligez)
@@ -28,16 +32,12 @@ OCaml 4.05.0 (TBD):
 - GPR#1150: Fix typo in arm64 assembler directives
   (KC Sivaramakrishnan)
 
-- PR#7533, GPR#1173: Correctly perform side effects for certain
-  cases of "/" and "mod"
-  (Mark Shinwell, report by Jan Mitgaard)
-
 ### Runtime system:
 
 - MPR#385, GPR#953: Add caml_startup_exn
   (Mark Shinwell)
 
-- PR#7423, GPR#946: expose new exception-raising functions
+- MPR#7423, GPR#946: expose new exception-raising functions
   `void caml_{failwith,invalid_argument}_value(value msg)`
   in addition to
   `void caml_{failwith,invalid_argument}(char const *msg)`.
@@ -46,7 +46,7 @@ OCaml 4.05.0 (TBD):
   passed to the new functions are handled by the garbage collector.
   (Gabriel Scherer, review by Mark Shinwell, request by Immanuel Litzroth)
 
-- PR#7557, GPR#1213: More security for getenv
+- MPR#7557, GPR#1213: More security for getenv
   (Damien Doligez, reports by Seth Arnold and Eric Milliken, review by
   Xavier Leroy, David Allsopp, Stephen Dolan, Hannes Mehnert)
 
@@ -58,17 +58,17 @@ OCaml 4.05.0 (TBD):
 
 ### Type system:
 
-- PR#6608, GPR#901: unify record types when overriding all fields
+- MPR#6608, GPR#901: unify record types when overriding all fields
   (Tadeu Zagallo and Gabriel Scherer, report by Jeremy Yallop,
   review by David Allsopp, Jacques Garrigue)
 
-* PR#7414, GPR#929: Soundness bug with non-generalized type variables and
+* MPR#7414, GPR#929: Soundness bug with non-generalized type variables and
   functors.
   (Jacques Garrigue, report by Leo White)
 
 ### Compiler user-interface and warnings:
 
-- PR#7050, GPR#748 GPR#843 GPR#864: new `-args/-args0 <file>` parameters to
+- MPR#7050, GPR#748 GPR#843 GPR#864: new `-args/-args0 <file>` parameters to
   provide extra command-line arguments in a file -- see documentation.
   User programs may implement similar options using the new `Expand`
   constructor of the `Arg` module.
@@ -76,21 +76,22 @@ OCaml 4.05.0 (TBD):
    and Damien Doligez, discussion with Alain Frisch and Xavier Leroy,
    feature request from the Coq team)
 
-- PR#7137, GPR#960: "-open" command line flag now accepts a module path
-  (not a module name) (Arseniy Alekseyev and Leo White)
+- MPR#7137, GPR#960: "-open" command line flag now accepts
+  a module path (not a module name)
+  (Arseniy Alekseyev and Leo White)
 
-- PR#7172, GPR#970: add extra (ocamlc -config) options
+- MPR#7172, GPR#970: add extra (ocamlc -config) options
   int_size, word_size, ext_exe
   (Gabriel Scherer, request by Daniel Bünzli)
 
-- PR#7315, GPR#736: refine some error locations
+- MPR#7315, GPR#736: refine some error locations
   (Gabriel Scherer and Alain Frisch, report by Matej Košík)
 
-- PR#7473, GPR#1025: perform proper globbing for command-line arguments on
+- MPR#7473, GPR#1025: perform proper globbing for command-line arguments on
   Windows
   (Jonathan Protzenko)
 
-- PR#7479: make sure "ocamlc -pack" is only given .cmo and .cmi files,
+- MPR#7479: make sure "ocamlc -pack" is only given .cmo and .cmi files,
   and that "ocamlopt -pack" is only given .cmx and .cmi files.
   (Xavier Leroy)
 
@@ -102,7 +103,7 @@ OCaml 4.05.0 (TBD):
 
 - GPR#911: ocamlc/ocamlopt do not pass warnings-related options to C
   compiler when called to compile third-party C source files
-  (Sébastien Hinderer)
+  (Sébastien Hinderer, review by Adrien Nader and David Allsopp)
 
 - GPR#915: fix -dsource (pprintast.ml) bugs
   (Runhang Li, review by Alain Frisch)
@@ -136,26 +137,26 @@ OCaml 4.05.0 (TBD):
 
 ### Standard library:
 
-- PR#6975, GPR#902: Truncate function added to stdlib Buffer module
+- MPR#6975, GPR#902: Truncate function added to stdlib Buffer module
   (Dhruv Makwana, review by Alain Frisch and Gabriel Scherer)
 
-- PR#7279 GPR#710: `Weak.get_copy` `Ephemeron.*_copy` doesn't copy
+- MPR#7279, GPR#710: `Weak.get_copy` `Ephemeron.*_copy` doesn't copy
   custom blocks anymore
   (François Bobot, Alain Frisch, bug reported by Martin R. Neuhäußer,
   review by Thomas Braibant and Damien Doligez)
 
-* PR#7500, GPR#1081: Remove Uchar.dump
+* MPR#7500, GPR#1081: Remove Uchar.dump
   (Daniel Bünzli)
 
 - GPR#760: Add a functions List.compare_lengths and
   List.compare_length_with to avoid full list length computations
-  (Fabrice Le Fessant)
+  (Fabrice Le Fessant, review by Leo White, Josh Berdine and Gabriel Scherer)
 
 - GPR#778: Arg: added option Expand that allows to expand a string
   argument to a string array of new arguments
-  (Bernhard Schommer)
+  (Bernhard Schommer, review by Gabriel Scherer and Jérémie Dimino)
 
-- GPR#849: Exposed Spacetime.enabled value
+- GPR#849: Expose a Spacetime.enabled value
   (Leo White)
 
 - GPR#885: Option-returning variants of stdlib functions
@@ -169,10 +170,13 @@ OCaml 4.05.0 (TBD):
 
 - GPR#875: Add missing functions to ArrayLabels, BytesLabels,
   ListLabels, MoreLabels, StringLabels so they are compatible with
-  non-labeled counterparts.
-  (Roma Sokolov)
+  non-labeled counterparts. Also add missing @@ocaml.deprecated attributes
+  in StringLabels and BytesLabels.
+  (Roma Sokolov, review by Gabriel Scherer, Jacques Garrigue,
+   Gabriel Radanne, Alain Frisch)
 
-- GPR#999: Arg, do not repeat thrice usage_msg when reporting an error
+- GPR#999: Arg, do not repeat the usage message thrice when reporting an error
+  (this was a regression in 4.03)
   (Florian Angeletti, review by Gabriel Scherer)
 
 - GPR#1042: Fix escaping of command-line arguments in
@@ -182,7 +186,7 @@ OCaml 4.05.0 (TBD):
 
 ### Debugging and profiling:
 
-- PR#7258: ocamldebug's "install_printer" command had problems with
+- MPR#7258: ocamldebug's "install_printer" command had problems with
   module aliases
   (Xavier Leroy)
 
@@ -193,19 +197,25 @@ OCaml 4.05.0 (TBD):
 
 ### Manual and documentation:
 
-- PR#6597, GPR#1030: add forward references to language extensions
+- MPR#6597, GPR#1030: add forward references to language extensions
   that extend non-terminal symbols in the language reference section.
   (Florian Angeletti, review by Gabriel Scherer)
 
-- PR#7497, GPR#1095: manual, enable numbering for table of contents
+- MPR#7497, GPR#1095: manual, enable numbering for table of contents
   (Florian Angeletti, request by Daniel Bünzli)
 
-- PR#7539, GPR#1181: manual, update dead links in ocamldoc chapter
+- MPR#7539, GPR#1181: manual, update dead links in ocamldoc chapter
   (Florian Angeletti)
 
 - GPR#633: manpage and manual documentation for the `-opaque` option
   (Konstantin Romanov, Gabriel Scherer, review by Mark Shinwell)
 
+- GPR#751, GPR#925: add a HACKING.adoc file to contain various
+  tips and tricks for people hacking on the repository. See also
+  CONTRIBUTING.md for advice on sending contributions upstream.
+  (Gabriel Scherer and Gabriel Radanne, review by David Allsopp,
+  inspired by John Whitington)
+
 - GPR#916: new tool lintapidiff, use it to update the manual with
   @since annotations for API changes introduced between 4.00-4.05.
   (Edwin Török, review by Gabriel Scherer, discussion with Alain Frisch,
@@ -222,20 +232,14 @@ OCaml 4.05.0 (TBD):
   (Gabriel Scherer, request by Matthew Wahab in GPR#1066,
    review by Florian Angeletti)
 
-- add a HACKING.adoc file to contain various tips and tricks for
-  people hacking on the repository. See also CONTRIBUTING.md for
-  advice on sending contributions upstream.
-  (Gabriel Scherer and Gabriel Radanne, review by David Allsopp,
-  inspired by John Whitington)
-
 ### Other libraries:
 
-- PR#7158: Event.sync, Mutex.create, Condition.create cause too many GCs.
+- MPR#7158: Event.sync, Mutex.create, Condition.create cause too many GCs.
   The fix is to no longer consider mutexes and condition variables
   as rare kernel resources.
   (Xavier Leroy)
 
-- PR#7264: document the different behaviors of Unix.lockf under POSIX
+- MPR#7264: document the different behaviors of Unix.lockf under POSIX
   and under Win32.
   (Xavier Leroy, report by David Allsopp)
 
@@ -244,9 +248,9 @@ OCaml 4.05.0 (TBD):
   (Laurent Mazare,
    review by Gabriel Scherer, Alain Frisch and Hezekiah M. Carty)
 
-* PR#7342, GPR#797: fix Unix.read on pipes with no data left on Windows
+* MPR#7342, GPR#797: fix Unix.read on pipes with no data left on Windows
   it previously raised an EPIPE error, it now returns 0 like other OSes
-  (Jonathan Protzenko)
+  (Jonathan Protzenko, review by Andreas Hauptmann and Damien Doligez)
 
 - GPR#650: in the Unix library, add `?cloexec:bool` optional arguments to
   functions that create file descriptors (`dup`, `dup2`, `pipe`, `socket`,
@@ -256,22 +260,23 @@ OCaml 4.05.0 (TBD):
   reducing the risk of race conditions with `exec` or `create_process`
   calls running in other threads, and improving security.  Also: add a
   `O_KEEPEXEC` flag for `openfile` by symmetry with `O_CLOEXEC`.
-  (Xavier Leroy)
+  (Xavier Leroy, review by Mark Shinwell, David Allsopp and Alain Frisch,
+   request by Romain Beauxis)
 
 - GPR#996: correctly update caml_top_of_stack in systhreads
   (Fabrice Le Fessant)
 
 ### Toplevel:
 
-- PR#7060, GPR#1035: Print exceptions in installed custom printers
+- MPR#7060, GPR#1035: Print exceptions in installed custom printers
   (Tadeu Zagallo, review by David Allsopp)
 
 ### Tools:
 
-- PR#5163: ocamlobjinfo, dump globals defined by bytecode executables
+- MPR#5163: ocamlobjinfo, dump globals defined by bytecode executables
   (Stéphane Glondu)
 
-- PR#7333: ocamldoc, use the first sentence of text file as
+- MPR#7333: ocamldoc, use the first sentence of text file as
   a short description in overviews.
   (Florian Angeletti)
 
@@ -292,9 +297,13 @@ OCaml 4.05.0 (TBD):
 
 ### Compiler distribution build system:
 
-- PR#7377: remove -std=gnu99 for newer gcc versions
+- MPR#7377: remove -std=gnu99 for newer gcc versions
   (Damien Doligez, report by ygrek)
 
+- MPR#7452, GPR#1228: tweak GCC options to try to avoid the
+  Skylake/Kaby lake bug
+  (Damien Doligez, review by David Allsopp, Xavier Leroy and Mark Shinwell)
+
 - GPR#693: fail on unexpected errors or warnings within caml_example
   environment.
   (Florian Angeletti)
@@ -328,7 +337,7 @@ OCaml 4.05.0 (TBD):
 
 - GPR#932: install ocaml{c,lex}->ocaml{c,lex}.byte symlink correctly
   when the opt target is built but opt.opt target is not.
-  (whitequark)
+  (whitequark, review by Gabriel Scherer)
 
 - GPR#935: allow build in Android's termux
   (ygrek, review by Gabriel Scherer)
@@ -435,109 +444,106 @@ The complete list of changes is listed below.
 
 - GPR#881: change `Outcometree.out_variant` to be more general.
   `Ovar_name of out_ident * out_type list` becomes `Ovar_type of out_type`.
-  (Valentin Gatien-Baron)
+  (Valentin Gatien-Baron, review by Leo White)
 
 - GPR#908: refactor PIC-handling in the s390x backend
-  (Gabriel Scherer)
+  (Gabriel Scherer, review by Xavier Leroy and Mark Shinwell)
 
 ### Bug fixes
 
-- PR#5115: protect all byterun/fail.c functions against
+- MPR#5115: protect all byterun/fail.c functions against
   uninitialized caml_global_data (only changes the bytecode behavior)
   (Gabriel Scherer, review by Xavier Leroy)
 
-- PR#6136, GPR#967: Fix Closure so that overapplication evaluation order
+- MPR#6136, GPR#967: Fix Closure so that overapplication evaluation order
   matches the bytecode compiler and Flambda.
   (Mark Shinwell, report by Jeremy Yallop, review by Frédéric Bour)
 
-- PR#6550, GPR#1094: Allow creation of empty .cmxa files on macOS
+- MPR#6550, GPR#1094: Allow creation of empty .cmxa files on macOS
   (Mark Shinwell)
 
-- PR#6594, GPR#955: Remove "Istore_symbol" specific operation on x86-64.
+- MPR#6594, GPR#955: Remove "Istore_symbol" specific operation on x86-64.
   This is more robust and in particular avoids assembly failures on Win64.
   (Mark Shinwell, review by Xavier Leroy, testing by David Allsopp and
    Olivier Andrieu)
 
-- PR#6903: Unix.execvpe doesn't change environment on Cygwin
-  (Xavier Leroy)
+- MPR#6903: Unix.execvpe doesn't change environment on Cygwin
+  (Xavier Leroy, report by Adrien Nader)
 
-- PR#6987: Strange error message probably caused by universal variable escape
-  (with polymorphic variants)
-  (report by Leo White)
+- MPR#6987: Strange error message probably caused by
+  universal variable escape (with polymorphic variants)
+  (Jacques Garrigue, report by Mikhail Mandrykin and Leo White)
 
-- PR#7216, GPR#949: don't require double parens in Functor((val x))
+- MPR#7216, GPR#949: don't require double parens in Functor((val x))
   (Jacques Garrigue, review by Valentin Gatien-Baron)
 
-- PR#7331: ocamldoc, avoid infinite loop in presence of self alias,
+- MPR#7331: ocamldoc, avoid infinite loop in presence of self alias,
   i.e. module rec M:sig end = M
   (Florian Angeletti, review Gabriel Scherer)
 
-- PR#7346, GPR#966: Fix evaluation order problem whereby expressions could
+- MPR#7346, GPR#966: Fix evaluation order problem whereby expressions could
   be incorrectly re-ordered when compiling with Flambda.  This also fixes one
   example of evaluation order in the native code compiler not matching the
   bytecode compiler (even when not using Flambda)
   (Mark Shinwell, Leo White, code review by Pierre Chambart)
 
-- PR#7348: Private row variables can escape their scope
+- MPR#7348: Private row variables can escape their scope
   (Jacques Garrigue, report by Leo White)
 
-- PR#7407: Two not-quite-standard C idioms rejected by SUNWSPro compilers
+- MPR#7407: Two not-quite-standard C idioms rejected by SUNWSPro compilers
   (Xavier Leroy)
 
-- PR#7421: Soundness bug with GADTs and lazy
+- MPR#7421: Soundness bug with GADTs and lazy
   (Jacques Garrigue, report by Leo White)
 
-- PR#7424: Typechecker diverges on unboxed type declaration
+- MPR#7424: Typechecker diverges on unboxed type declaration
   (Jacques Garrigue, report by Stephen Dolan)
 
-- PR#7426, GPR#965: Fix fatal error during object compilation (also
+- MPR#7426, GPR#965: Fix fatal error during object compilation (also
   introduces new [Pfield_computed] and [Psetfield_computed] primitives)
-  (Mark Shinwell)
+  (Mark Shinwell, report by Ulrich Singer)
 
-- PR#7427, GPR#959: Don't delete let bodies in Cmmgen
-  (Mark Shinwell)
+- MPR#7427, GPR#959: Don't delete let bodies in Cmmgen
+  (Mark Shinwell, report by Valentin Gatien-Baron)
 
-- PR#7432: Linking modules compiled with -labels and -nolabels is not safe
+- MPR#7432: Linking modules compiled with -labels and -nolabels is not safe
   (Jacques Garrigue, report by Jeremy Yallop)
 
-- PR#7437: typing assert failure with nonrec priv
+- MPR#7437: typing assert failure with nonrec priv
   (Jacques Garrigue, report by Anil Madhavapeddy)
 
-- PR#7438: warning +34 exposes #row with private types
+- MPR#7438: warning +34 exposes #row with private types
   (Alain Frisch, report by Anil Madhavapeddy)
 
-- PR#7443, GPR#990: spurious unused open warning with local open in patterns
+- MPR#7443, GPR#990: spurious unused open warning with local open in patterns
   (Florian Angeletti, report by Gabriel Scherer)
 
-- PR#7504: fix warning 8 with unconstrained records
+- MPR#7504: fix warning 8 with unconstrained records
   (Florian Angeletti, report by John Whitington)
 
-- PR#7456, GPR#1092: fix slow compilation on source files containing a lot
+- MPR#7456, GPR#1092: fix slow compilation on source files containing a lot
   of similar debugging information location entries
   (Mark Shinwell)
 
+- GPR#795: remove 256-character limitation on Sys.executable_name
+  (Xavier Leroy)
+
 - GPR#805, GPR#815, GPR#833: check for integer overflow in String.concat
   (Jeremy Yallop,
    review by Damien Doligez, Alain Frisch, Daniel Bünzli, Fabrice Le Fessant)
 
-- GPR#810: check for integer overflow in Array.concat
-  (Jeremy Yallop)
-
-- GPR#814: fix the Buffer.add_substring bounds check to handle overflow
-  (Jeremy Yallop)
-
 - GPR#881: short-paths did not apply to some polymorphic variants
   (Valentin Gatien-Baron, review by Leo White)
 
 - GPR#886: Fix Ctype.moregeneral's handling of row_name
-  (Leo White)
+  (Leo White, review by Jacques Garrigue)
 
 - GPR#934: check for integer overflow in Bytes.extend
   (Jeremy Yallop, review by Gabriel Scherer)
 
 - GPR#956: Keep possibly-effectful expressions when optimizing multiplication
   by zero.
-  (Jeremy Yallop)
+  (Jeremy Yallop, review by Nicolás Ojeda Bär, Xavier Leroy and Mark Shinwell)
 
 - GPR#977: Catch Out_of_range in ocamldebug's "list" command
   (Yunxing Dai)
@@ -551,17 +557,17 @@ The complete list of changes is listed below.
   (Anton Bachin)
 
 - GPR#998: Do not delete unused closures in un_anf.ml.
-  (Leo White)
+  (Leo White, review by Mark Shinwell and Pierre Chambart)
 
 - GPR#1019: Fix fatal error in Flambda mode "[functions] does not map set of
   closures ID"
   (Pierre Chambart, code review by Mark Shinwell and Leo White)
 
 - GPR#1075: Ensure that zero-sized float arrays have zero tags.
-  (Mark Shinwell, Leo White)
+  (Mark Shinwell, Leo White, review by Xavier Leroy)
 
 * GPR#1088: Gc.minor_words now returns accurate numbers.
-  (Stephen Dolan)
+  (Stephen Dolan, review by Pierre Chambart and Xavier Leroy)
 
 OCaml 4.04.2 (23 Jun 2017):
 ---------------------------

diff --git a/VERSION b/VERSION
index fc8c4bfa809b842d864069515d89845df6cb209a..6ca3825364036d680d8ebaf9c04ed774516437e0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-4.05.0+rc1
+4.05.0
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli

diff --git a/boot/ocamlc b/boot/ocamlc
index d8c427d3d43b5330f81414c3e991d2b0698c4d02..6096b0c99c3c605688c806fd2a6ee18afb0d1e98 100755 (executable)
Binary files a/boot/ocamlc and b/boot/ocamlc differ

diff --git a/boot/ocamldep b/boot/ocamldep
index bd7e0bb9c3c1ca7c2ac91aa26736ff03d128deb5..fd39892fec88b0213d43d4019b2a2ff1ecb2c881 100755 (executable)
Binary files a/boot/ocamldep and b/boot/ocamldep differ

diff --git a/boot/ocamllex b/boot/ocamllex
index 3374dda5e2541b1a8cca1bbdb0b7128fc6273e05..b42a2f18ef4c4a945974f1fe7a9fea79238475eb 100755 (executable)
Binary files a/boot/ocamllex and b/boot/ocamllex differ

diff --git a/config/Makefile.mingw b/config/Makefile.mingw
index da1346d36dde832d5d978489f5fb605aea028cab..2819d5b99d58d438304caee3cddaea589c46e5fa 100644 (file)
--- a/config/Makefile.mingw
+++ b/config/Makefile.mingw
@@ -108,7 +108,9 @@ BYTECC=$(TOOLPREF)gcc -O -mms-bitfields
 BYTECODE_C_COMPILER=$(BYTECC)
 
 ### Additional compile-time options for $(BYTECC).  (For static linking.)
-BYTECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused
+# -fno-tree-vrp is here to try to work around the Skylake/Kaby lake bug,
+# and only works on GCC 4.2 and later.
+BYTECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused -fno-tree-vrp
 
 ### Additional compile-time options for $(BYTECC).  (For debug version.)
 BYTECCDBGCOMPOPTS=-g
@@ -183,7 +185,9 @@ NATIVECC=$(BYTECC)
 NATIVE_C_COMPILER=$(NATIVECC)
 
 ### Additional compile-time options for $(NATIVECC).
-NATIVECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused
+# -fno-tree-vrp is here to try to work around the Skylake/Kaby lake bug,
+# and only works on GCC 4.2 and later.
+NATIVECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused -fno-tree-vrp
 
 ### Additional link-time options for $(NATIVECC)
 NATIVECCLINKOPTS=

diff --git a/config/Makefile.mingw64 b/config/Makefile.mingw64
index 286147b177eff8b3a6c83efaa4089071df17d0ae..d0b8b5ea93b65bd94167fa278a61ecaf63c02368 100644 (file)
--- a/config/Makefile.mingw64
+++ b/config/Makefile.mingw64
@@ -108,7 +108,9 @@ BYTECC=$(TOOLPREF)gcc -O -mms-bitfields
 BYTECODE_C_COMPILER=$(BYTECC)
 
 ### Additional compile-time options for $(BYTECC).  (For static linking.)
-BYTECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused
+# -fno-tree-vrp is here to try to work around the Skylake/Kaby lake bug,
+# and only works on GCC 4.2 and later.
+BYTECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused -fno-tree-vrp
 
 ### Additional compile-time options for $(BYTECC).  (For debug version.)
 BYTECCDBGCOMPOPTS=-g
@@ -183,7 +185,9 @@ NATIVECC=$(BYTECC)
 NATIVE_C_COMPILER=$(NATIVECC)
 
 ### Additional compile-time options for $(NATIVECC).
-NATIVECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused
+# -fno-tree-vrp is here to try to work around the Skylake/Kaby lake bug,
+# and only works on GCC 4.2 and later.
+NATIVECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused -fno-tree-vrp
 
 ### Additional link-time options for $(NATIVECC)
 NATIVECCLINKOPTS=

diff --git a/configure b/configure
index ec5e73c5eb9a8ea0b9f3fe66a59f01876796c55d..e79659954cead82d9c8ce831229d0f4043aee017 100755 (executable)
--- a/configure
+++ b/configure
@@ -864,6 +864,16 @@ else
 fi
 
 
+# Try to work around the Skylake/Kaby Lake processor bug.
+case "$bytecc,$target" in
+    *gcc*,x86_64-*|*gcc*,i686-*)
+        if sh ./hasgot -Werror -fno-tree-vrp; then
+            byteccprivatecompopts="$byteccprivatecompopts -fno-tree-vrp"
+            inf "Adding -fno-tree-vrp option to work around PR#7452"
+        fi;;
+esac
+
+
 # Configure the native-code compiler
 
 # The NATIVECC make variable defines which compiler and options to use

diff --git a/otherlibs/raw_spacetime_lib/.depend b/otherlibs/raw_spacetime_lib/.depend
index 098efdb27e6af016f5686531f2e6bb8bfdfa9494..99c90a4aae9c72bf0e3b424058405e63806567c5 100644 (file)
--- a/otherlibs/raw_spacetime_lib/.depend
+++ b/otherlibs/raw_spacetime_lib/.depend
@@ -49,3 +49,6 @@ raw_spacetime_lib.cmi :
 raw_spacetime_lib.cmo : raw_spacetime_lib.cmi
 raw_spacetime_lib.cmx : raw_spacetime_lib.cmi
 raw_spacetime_lib.cmi :
+raw_spacetime_lib.cmo : raw_spacetime_lib.cmi
+raw_spacetime_lib.cmx : raw_spacetime_lib.cmi
+raw_spacetime_lib.cmi :

diff --git a/stdlib/bytes.ml b/stdlib/bytes.ml
index f048a9517734ba42a7e3ec9da78e39e5427a2bdc..0783babcb8d82804af9ff5f7df0f860ed0066a00 100644 (file)
--- a/stdlib/bytes.ml
+++ b/stdlib/bytes.ml
@@ -113,7 +113,7 @@ let iter f a =
 let iteri f a =
   for i = 0 to length a - 1 do f i (unsafe_get a i) done
 
-let ensure_ge x y = if x >= y then x else invalid_arg "Bytes.concat"
+let ensure_ge (x:int) y = if x >= y then x else invalid_arg "Bytes.concat"
 
 let rec sum_lengths acc seplen = function
   | [] -> acc

diff --git a/stdlib/string.ml b/stdlib/string.ml
index 1d38227431e7a09736eb31e320582bf1ff45caa7..9a4b533fcf74dd76e10cad803bad5de03372d848 100644 (file)
--- a/stdlib/string.ml
+++ b/stdlib/string.ml
@@ -50,7 +50,7 @@ let fill =
 let blit =
   B.blit_string
 
-let ensure_ge x y = if x >= y then x else invalid_arg "String.concat"
+let ensure_ge (x:int) y = if x >= y then x else invalid_arg "String.concat"
 
 let rec sum_lengths acc seplen = function
   | [] -> acc