[VM] Remove projection names from structured constants.

It was actually a hack since those names are never used to represent
values, only to be passed as arguments to bytecode instructions. So
instead of reusing the structured_constant type, we follow the same
pattern as switch annotations.

1 files changed, 16 insertions, 0 deletions

diff --git a/kernel/csymtable.ml b/kernel/csymtable.ml
index 9bacdb65f..bbe093782 100644
--- a/kernel/csymtable.ml
+++ b/kernel/csymtable.ml
@@ -77,11 +77,19 @@ module AnnotTable = Hashtbl.Make (struct
   let hash = hash_annot_switch
 end)
 
+module ProjNameTable = Hashtbl.Make (struct
+  type t = Constant.t
+  let equal = Constant.equal
+  let hash = Constant.hash
+end)
+
 let str_cst_tbl : int SConstTable.t = SConstTable.create 31
 
 let annot_tbl : int AnnotTable.t = AnnotTable.create 31
     (* (annot_switch * int) Hashtbl.t  *)
 
+let proj_name_tbl : int ProjNameTable.t = ProjNameTable.create 31
+
 (*************************************************************)
 (*** Mise a jour des valeurs des variables et des constantes *)
 (*************************************************************)
@@ -115,6 +123,13 @@ let slot_for_annot key =
     AnnotTable.add annot_tbl key n;
     n
 
+let slot_for_proj_name key =
+  try ProjNameTable.find proj_name_tbl key
+  with Not_found ->
+    let n =  set_global (val_of_proj_name key) in
+    ProjNameTable.add proj_name_tbl key n;
+    n
+
 let rec slot_for_getglobal env kn =
   let (cb,(_,rk)) = lookup_constant_key kn env in
   try key rk
@@ -170,6 +185,7 @@ and eval_to_patch env (buff,pl,fv) =
     | Reloc_annot a -> slot_for_annot a
     | Reloc_const sc -> slot_for_str_cst sc
     | Reloc_getglobal kn -> slot_for_getglobal env kn
+    | Reloc_proj_name p -> slot_for_proj_name p
   in
   let tc = patch buff pl slots in
   let vm_env = Array.map (slot_for_fv env) fv in