From fc47a7d6accf696cf7b4a8042aeda621ab6a7119 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Mon, 26 May 2003 13:46:06 +0000
Subject: [PATCH] Ajout de check_global_initialized pour le toplevel et pour
 Dynlink

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5584 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 bytecomp/symtable.ml  | 24 ++++++++++++++++++++++++
 bytecomp/symtable.mli |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml
index a2a0a5fcc..62a79c75f 100644
--- a/bytecomp/symtable.ml
+++ b/bytecomp/symtable.ml
@@ -25,6 +25,7 @@ type error =
     Undefined_global of string
   | Unavailable_primitive of string
   | Wrong_vm of string
+  | Uninitialized_global of string
 
 exception Error of error
 
@@ -287,6 +288,27 @@ let get_global_value id =
 let assign_global_value id v =
   (Meta.global_data()).(slot_for_getglobal id) <- v
 
+(* Check that all globals referenced in the given patch list
+   have been initialized already *)
+
+let check_global_initialized patchlist =
+  (* First determine the globals we will define *)
+  let defined_globals =
+    List.fold_left
+      (fun accu rel ->
+        match rel with
+          (Reloc_setglobal id, pos) -> id :: accu
+        | _ -> accu)
+      [] patchlist in
+  (* Then check that all referenced, not defined globals have a value *)
+  let check_reference = function
+      (Reloc_getglobal id, pos) ->
+        if not (List.mem id defined_globals)
+        && Obj.is_int (get_global_value id)
+        then raise (Error(Uninitialized_global(Ident.name id)))
+    | _ -> () in
+  List.iter check_reference patchlist
+
 (* Save and restore the current state *)
 
 type global_map = Ident.t numtable
@@ -323,3 +345,5 @@ let report_error ppf = function
       fprintf ppf "The external function `%s' is not available" s
   | Wrong_vm s ->
       fprintf ppf "Cannot find or execute the runtime system %s" s
+  | Uninitialized_global s ->
+      fprintf ppf "The value of the global `%s' is not yet computed" s
diff --git a/bytecomp/symtable.mli b/bytecomp/symtable.mli
index 0806cdf00..b93cae096 100644
--- a/bytecomp/symtable.mli
+++ b/bytecomp/symtable.mli
@@ -33,6 +33,7 @@ val update_global_table: unit -> unit
 val get_global_value: Ident.t -> Obj.t
 val assign_global_value: Ident.t -> Obj.t -> unit
 val get_global_position: Ident.t -> int
+val check_global_initialized: (reloc_info * int) list -> unit
 
 type global_map
 
@@ -47,6 +48,7 @@ type error =
     Undefined_global of string
   | Unavailable_primitive of string
   | Wrong_vm of string
+  | Uninitialized_global of string
 
 exception Error of error