Merge flambda-backend changes

Author: stedolan

.depend

@@ -127,8 +127,6 @@ _build
 /otherlibs/*/.dep
 /otherlibs/dynlink/extract_crc
 /otherlibs/dynlink/dynlink_platform_intf.mli
-/otherlibs/dynlink/byte/dynlink.mli
-/otherlibs/dynlink/native/dynlink.mli
 /otherlibs/dynlink/dynlink_compilerlibs/Makefile
 /otherlibs/dynlink/dynlink_compilerlibs/*.ml
 /otherlibs/dynlink/dynlink_compilerlibs/*.mli
@@ -266,3 +264,8 @@ _build
 /yacc/ocamlyacc
 /yacc/version.h
 /yacc/.gdb_history
+
+/otherlibs/dynlink/natdynlinkops
+/otherlibs/dynlink/natdynlinkops1
+/otherlibs/dynlink/natdynlinkops2
+

.gitignore

@@ -636,7 +636,7 @@ natruntop:
 
 # Native dynlink
 
-otherlibs/dynlink/dynlink.cmxa: otherlibs/dynlink/native/dynlink.ml
+otherlibs/dynlink/dynlink.cmxa: otherlibs/dynlink/dynlink.ml
 	$(MAKE) -C otherlibs/dynlink allopt
 
 # The lexer

.gitmodules

@@ -231,16 +231,20 @@ WITH_FPIC=@fpic@
 TARGET=@target@
 HOST=@host@
 FLAMBDA=@flambda@
+FLAMBDA2=@flambda2@
 WITH_FLAMBDA_INVARIANTS=@flambda_invariants@
+WITH_CMM_INVARIANTS=@cmm_invariants@
 FORCE_SAFE_STRING=@force_safe_string@
 DEFAULT_SAFE_STRING=@default_safe_string@
 WINDOWS_UNICODE=@windows_unicode@
 AFL_INSTRUMENT=@afl@
 FLAT_FLOAT_ARRAY=@flat_float_array@
 FUNCTION_SECTIONS=@function_sections@
+PROBES=@probes@
 AWK=@AWK@
 STDLIB_MANPAGES=@stdlib_manpages@
 NAKED_POINTERS=@naked_pointers@
+INTEL_JCC_BUG_CFLAGS=@intel_jcc_bug_cflags@
 
 ### Native command to build ocamlrun.exe
 

Makefile

@@ -1,4 +1,4 @@
-4.12.1+dev0-2021-02-24
+4.12.0
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli

Makefile.config.in

@@ -30,6 +30,7 @@ m4_include([build-aux/lt~obsolete.m4])
 # Macros from the autoconf macro archive
 m4_include([build-aux/ax_func_which_gethostbyname_r.m4])
 m4_include([build-aux/ax_pthread.m4])
+m4_include([build-aux/ax_check_compile_flag.m4])
 
 # The following macro figures out which C compiler is used.
 # It does so by checking for compiler-specific predefined macros.

VERSION

@@ -223,7 +223,7 @@ method class_of_operation op =
   | Imove | Ispill | Ireload -> assert false   (* treated specially *)
   | Iconst_int _ | Iconst_float _ | Iconst_symbol _ -> Op_pure
   | Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _
-  | Iextcall _ -> assert false                 (* treated specially *)
+  | Iextcall _ | Iprobe _ -> assert false                 (* treated specially *)
   | Istackoffset _ -> Op_other
   | Iload(_,_) -> Op_load
   | Istore(_,_,asg) -> Op_store asg
@@ -236,6 +236,7 @@ method class_of_operation op =
   | Ifloatofint | Iintoffloat -> Op_pure
   | Ispecific _ -> Op_other
   | Iname_for_debugger _ -> Op_pure
+  | Iprobe_is_enabled _ -> Op_other
 
 (* Operations that are so cheap that it isn't worth factoring them. *)
 
@@ -263,7 +264,7 @@ method private cse n i =
          as to the argument reg. *)
       let n1 = set_move n i.arg.(0) i.res.(0) in
       {i with next = self#cse n1 i.next}
-  | Iop (Icall_ind | Icall_imm _ | Iextcall _) ->
+  | Iop (Icall_ind | Icall_imm _ | Iextcall _ | Iprobe _) ->
       (* For function calls, we should at least forget:
          - equations involving memory loads, since the callee can
            perform arbitrary memory stores;