Changed definition of implem for debug information.

Instead of making each filed mutuable we use a reference to a record
of type implem. Now only the default implementation and the default
debug information need to be upated to add a new function.
Bug 17392.

1 files changed, 61 insertions, 62 deletions

diff --git a/debug/Debug.ml b/debug/Debug.ml
index 22f913c5..25517eee 100644
--- a/debug/Debug.ml
+++ b/debug/Debug.ml
@@ -22,39 +22,38 @@ open DwarfTypes
 (* Record used for stroring references to the actual implementation functions *)
 type implem = 
     {
-     mutable init: string -> unit;
-     mutable atom_global: ident -> atom -> unit;
-     mutable set_composite_size: ident -> struct_or_union -> int option -> unit;
-     mutable set_member_offset: ident -> string -> int -> unit;
-     mutable set_bitfield_offset: ident -> string -> int -> string -> int -> unit;
-     mutable insert_global_declaration: Env.t -> globdecl -> unit;
-     mutable add_fun_addr: atom -> (int * int) -> unit;
-     mutable generate_debug_info: (atom -> string) -> string -> debug_entries option;
-     mutable all_files_iter: (string -> unit) -> unit;
-     mutable insert_local_declaration:  storage -> ident -> typ -> location -> unit;
-     mutable atom_local_variable: ident -> atom -> unit;
-     mutable enter_scope: int -> int -> int -> unit;
-     mutable enter_function_scope: int -> int -> unit;
-     mutable add_lvar_scope: int -> ident -> int -> unit;
-     mutable open_scope: atom -> int -> positive -> unit;
-     mutable close_scope: atom -> int -> positive -> unit;
-     mutable start_live_range: (atom * atom) -> positive -> int * int builtin_arg -> unit;
-     mutable end_live_range: (atom * atom) -> positive -> unit;
-     mutable stack_variable: (atom * atom) -> int * int builtin_arg -> unit;
-     mutable function_end: atom -> positive -> unit;
-     mutable add_label: atom -> positive -> int -> unit;
-     mutable atom_parameter: ident -> ident -> atom -> unit;
-     mutable add_compilation_section_start: string -> int -> unit;
-     mutable add_compilation_section_end: string -> int -> unit;
-     mutable compute_diab_file_enum: (string -> int) -> (string-> int) -> (unit -> unit) -> unit;
-     mutable compute_gnu_file_enum: (string -> unit) -> unit;
-     mutable exists_section: string -> bool;
-     mutable remove_unused: ident -> unit;
-     mutable variable_printed: string -> unit;
-     mutable add_diab_info: string -> (int * int * string) -> unit;
+      init: string -> unit;
+      atom_global: ident -> atom -> unit;
+      set_composite_size: ident -> struct_or_union -> int option -> unit;
+      set_member_offset: ident -> string -> int -> unit;
+      set_bitfield_offset: ident -> string -> int -> string -> int -> unit;
+      insert_global_declaration: Env.t -> globdecl -> unit;
+      add_fun_addr: atom -> (int * int) -> unit;
+      generate_debug_info: (atom -> string) -> string -> debug_entries option;
+      all_files_iter: (string -> unit) -> unit;
+      insert_local_declaration:  storage -> ident -> typ -> location -> unit;
+      atom_local_variable: ident -> atom -> unit;
+      enter_scope: int -> int -> int -> unit;
+      enter_function_scope: int -> int -> unit;
+      add_lvar_scope: int -> ident -> int -> unit;
+      open_scope: atom -> int -> positive -> unit;
+      close_scope: atom -> int -> positive -> unit;
+      start_live_range: (atom * atom) -> positive -> int * int builtin_arg -> unit;
+      end_live_range: (atom * atom) -> positive -> unit;
+      stack_variable: (atom * atom) -> int * int builtin_arg -> unit;
+      add_label: atom -> positive -> int -> unit;
+      atom_parameter: ident -> ident -> atom -> unit;
+      add_compilation_section_start: string -> int -> unit;
+      add_compilation_section_end: string -> int -> unit;
+      compute_diab_file_enum: (string -> int) -> (string-> int) -> (unit -> unit) -> unit;
+      compute_gnu_file_enum: (string -> unit) -> unit;
+      exists_section: string -> bool;
+      remove_unused: ident -> unit;
+      variable_printed: string -> unit;
+      add_diab_info: string -> (int * int * string) -> unit;
    }
 
-let implem =
+let default_implem =
   {
    init = (fun _ -> ());
    atom_global = (fun _ _ -> ());
@@ -75,7 +74,6 @@ let implem =
    start_live_range = (fun _ _ _ -> ());
    end_live_range = (fun _ _ -> ());
    stack_variable = (fun _ _ -> ());
-   function_end = (fun _ _ -> ());
    add_label = (fun _ _ _ -> ());
    atom_parameter = (fun _ _ _ -> ());
    add_compilation_section_start = (fun _ _ -> ());
@@ -88,33 +86,34 @@ let implem =
    add_diab_info = (fun _ _ -> ());
 }
 
-let init_compile_unit name = implem.init name
-let atom_global id atom = implem.atom_global id atom
-let set_composite_size id sou size = implem.set_composite_size id sou size
-let set_member_offset id field off = implem.set_member_offset id field off
-let set_bitfield_offset id field off underlying size = implem.set_bitfield_offset id field off underlying size
-let insert_global_declaration env dec = implem.insert_global_declaration env dec
-let add_fun_addr atom addr = implem.add_fun_addr atom addr
-let generate_debug_info fun_s var_s = implem.generate_debug_info fun_s var_s
-let all_files_iter f = implem.all_files_iter f
-let insert_local_declaration sto id ty loc = implem.insert_local_declaration sto id ty loc
-let atom_local_variable id atom = implem.atom_local_variable id atom
-let enter_scope p_id id = implem.enter_scope p_id id
-let enter_function_scope fun_id sc_id = implem.enter_function_scope fun_id sc_id
-let add_lvar_scope fun_id var_id s_id = implem.add_lvar_scope fun_id var_id s_id
-let open_scope atom id lbl = implem.open_scope atom id lbl
-let close_scope atom id lbl = implem.close_scope atom id lbl
-let start_live_range atom lbl loc = implem.start_live_range atom lbl loc
-let end_live_range atom lbl = implem.end_live_range atom lbl
-let stack_variable atom loc = implem.stack_variable atom loc
-let function_end atom loc = implem.function_end atom loc
-let add_label atom p lbl = implem.add_label atom p lbl
-let atom_parameter fid pid atom = implem.atom_parameter fid pid atom
-let add_compilation_section_start sec addr = implem.add_compilation_section_start sec addr
-let add_compilation_section_end sec addr = implem.add_compilation_section_end sec addr
-let exists_section sec = implem.exists_section sec
-let compute_diab_file_enum end_l entry_l line_e = implem.compute_diab_file_enum end_l entry_l line_e
-let compute_gnu_file_enum f = implem.compute_gnu_file_enum f
-let remove_unused ident = implem.remove_unused ident
-let variable_printed ident = implem.variable_printed ident
-let add_diab_info sec addr = implem.add_diab_info sec addr
+let implem = ref default_implem
+
+let init_compile_unit name = !implem.init name
+let atom_global id atom = !implem.atom_global id atom
+let set_composite_size id sou size = !implem.set_composite_size id sou size
+let set_member_offset id field off = !implem.set_member_offset id field off
+let set_bitfield_offset id field off underlying size = !implem.set_bitfield_offset id field off underlying size
+let insert_global_declaration env dec = !implem.insert_global_declaration env dec
+let add_fun_addr atom addr = !implem.add_fun_addr atom addr
+let generate_debug_info fun_s var_s = !implem.generate_debug_info fun_s var_s
+let all_files_iter f = !implem.all_files_iter f
+let insert_local_declaration sto id ty loc = !implem.insert_local_declaration sto id ty loc
+let atom_local_variable id atom = !implem.atom_local_variable id atom
+let enter_scope p_id id = !implem.enter_scope p_id id
+let enter_function_scope fun_id sc_id = !implem.enter_function_scope fun_id sc_id
+let add_lvar_scope fun_id var_id s_id = !implem.add_lvar_scope fun_id var_id s_id
+let open_scope atom id lbl = !implem.open_scope atom id lbl
+let close_scope atom id lbl = !implem.close_scope atom id lbl
+let start_live_range atom lbl loc = !implem.start_live_range atom lbl loc
+let end_live_range atom lbl = !implem.end_live_range atom lbl
+let stack_variable atom loc = !implem.stack_variable atom loc
+let add_label atom p lbl = !implem.add_label atom p lbl
+let atom_parameter fid pid atom = !implem.atom_parameter fid pid atom
+let add_compilation_section_start sec addr = !implem.add_compilation_section_start sec addr
+let add_compilation_section_end sec addr = !implem.add_compilation_section_end sec addr
+let exists_section sec = !implem.exists_section sec
+let compute_diab_file_enum end_l entry_l line_e = !implem.compute_diab_file_enum end_l entry_l line_e
+let compute_gnu_file_enum f = !implem.compute_gnu_file_enum f
+let remove_unused ident = !implem.remove_unused ident
+let variable_printed ident = !implem.variable_printed ident
+let add_diab_info sec addr = !implem.add_diab_info sec addr