From bff51607cfdda137d7bc55d802895d7f794d5768 Mon Sep 17 00:00:00 2001 From: Pierre-Marie Pédrot Date: Wed, 3 Dec 2014 20:34:09 +0100 Subject: Getting rid of Exninfo hacks. Instead of modifying exceptions to wear additional information, we instead use a dedicated type now. All exception-using functions were modified to support this new type, in particular Future's fix_exn-s and the tactic monad. To solve the problem of enriching exceptions at raise time and recover this data in the try-with handler, we use a global datastructure recording the given piece of data imperatively that we retrieve in the try-with handler. We ensure that such instrumented try-with destroy the data so that there may not be confusion with another exception. To further harden the correction of this structure, we also check for pointer equality with the last raised exception. The global data structure is not thread-safe for now, which is incorrect as the STM uses threads and enriched exceptions. Yet, we splitted the patch in two parts, so that we do not introduce dependencies to the Thread library immediatly. This will allow to revert only the second patch if ever we switch to OCaml-coded lightweight threads. --- kernel/csymtable.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/csymtable.ml') diff --git a/kernel/csymtable.ml b/kernel/csymtable.ml index 7dcaf9b13..c13dd3a92 100644 --- a/kernel/csymtable.ml +++ b/kernel/csymtable.ml @@ -213,7 +213,7 @@ and val_of_constr env c = let reraise = Errors.push reraise in let () = print_string "can not compile \n" in let () = Format.print_flush () in - raise reraise + iraise reraise in eval_to_patch env (to_memory ccfv) -- cgit v1.2.3