Merge branch 'feature/ocaml-4.13' into 'stable/chromium'

Support for OCaml 4.13

See merge request frama-c/frama-clang!164

Makefile

@@ -77,10 +77,10 @@ tests:: dontrun
 dontrun:
 	(cd tests; echo `grep -r 'DONTRUN' $(PLUGIN_TESTS_DIRS) | wc -l` test files marked DONTRUN )
 
-$(Frama_Clang_DIR)/gen_ast: $(Frama_Clang_DIR)/gen_ast.ml
+$(Frama_Clang_DIR)/gen_ast: $(Frama_Clang_DIR)/gen_ast.ml $(Frama_Clang_DIR)/gen_ast.cmi
 	$(PRINT_OCAMLC) $@
 	$(OCAMLC) $(Frama_Clang_BFLAGS) -o $@ -pp $(CAMLP5O) \
-        zarith.cma dynlink.cma $^
+        zarith.cma dynlink.cma $<
 
 $(Frama_Clang_DIR)/test_ast: \
   $(Frama_Clang_DIR)/intermediate_format.cmo \

gen_ast.mli

+(* Nothing is exported *)

reorder_defs.ml

@@ -2,7 +2,7 @@
 (*                                                                        *)
 (*  This file is part of Frama-Clang                                      *)
 (*                                                                        *)
-(*  Copyright (C) 2012-2021                                               *)
+(*  Copyright (C) 2012-2022                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
 (*         alternatives)                                                  *)
 (*                                                                        *)
@@ -41,7 +41,7 @@ type dep_node =
     name: string;
     is_def: bool;
     mutable glob: definition option;
-    mutable ghost: bool; (* TODO: take ghost into account. *)
+    (* mutable ghost: bool; (* TODO: take ghost into account. *) *)
     mutable id: int
   }
 
@@ -179,7 +179,7 @@ end = struct
   let nodes = H.create 37
 
   let default_node kind name is_def =
-    { kind; name; is_def; glob = None; id = -1; ghost = false }
+    { kind; name; is_def; glob = None; id = -1; (* ghost = false *) }
 
   let replace_deps orig rep =
     if G.mem_vertex deps orig then begin