flambda-backend: permanent/reraise-by-default (cherry-pick 50e94902ca6bb84c33982db858b74322eefd9af8)

Author: stedolan

stdlib/stdlib.ml

@@ -23,7 +23,7 @@ let () =
   register_named_value "Pervasives.array_bound_error"
     (Invalid_argument "index out of bounds")
 
-external raise : exn -> 'a = "%raise"
+external raise : exn -> 'a = "%reraise"
 external raise_notrace : exn -> 'a = "%raise_notrace"
 
 let failwith s = raise(Failure s)

stdlib/stdlib.mli

@@ -27,7 +27,7 @@
 
 (** {1 Exceptions} *)
 
-external raise : exn -> 'a = "%raise"
+external raise : exn -> 'a = "%reraise"
 (** Raise the given exception value *)
 
 external raise_notrace : exn -> 'a = "%raise_notrace"

testsuite/tests/backtrace/backtrace2.reference

@@ -35,12 +35,32 @@ Uncaught exception Invalid_argument("index out of bounds")
 Raised by primitive operation at Backtrace2.run in file "backtrace2.ml", line 62, characters 14-22
 test_Not_found
 Uncaught exception Not_found
-Raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
+Raised at Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 18-33
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11
+Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
 Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42
 Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70
 Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
 Uncaught exception Not_found
-Raised at Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 18-33
+Raised at Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 18-33
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11
+Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
+Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42
+Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70
+Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
+Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
+Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41
+Re-raised at Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 18-33
 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
@@ -50,7 +70,29 @@ Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", lin
 Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 36, characters 4-11
 Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
 Uncaught exception Not_found
-Raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
+Raised at Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 18-33
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
+Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11
+Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
+Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42
+Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70
+Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
+Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
+Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41
+Re-raised at Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 18-33
+Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
+Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
+Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
+Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
+Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
+Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 31, characters 17-27
+Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 36, characters 4-11
+Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
+Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
 Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41
 Re-raised at CamlinternalLazy.force_lazy_block.(fun) in file "camlinternalLazy.ml", line 35, characters 56-63
 Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 31, characters 17-27

testsuite/tests/backtrace/backtrace3.reference

@@ -60,7 +60,14 @@ Called from Backtrace3.g in file "backtrace3.ml", line 15, characters 4-11
 Re-raised at Backtrace3.g in file "backtrace3.ml", line 42, characters 45-55
 Called from Backtrace3.run in file "backtrace3.ml", line 49, characters 11-23
 Uncaught exception Backtrace3.Error("h")
-Raised at Backtrace3.g in file "backtrace3.ml", line 45, characters 10-17
+Raised at Backtrace3.f in file "backtrace3.ml", line 11, characters 16-32
+Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
+Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
+Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
+Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
+Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
+Called from Backtrace3.g in file "backtrace3.ml", line 15, characters 4-11
+Re-raised at Backtrace3.g in file "backtrace3.ml", line 45, characters 10-17
 Called from Backtrace3.run in file "backtrace3.ml", line 49, characters 11-23
 Uncaught exception Invalid_argument("index out of bounds")
 Raised by primitive operation at Backtrace3.run in file "backtrace3.ml", line 49, characters 14-22

testsuite/tests/backtrace/backtrace_or_exception.reference

@@ -3,7 +3,9 @@ Raised at Backtrace_or_exception.without_reraise in file "backtrace_or_exception
 Called from Backtrace_or_exception.run in file "backtrace_or_exception.ml", line 39, characters 6-10
 ---------------------------
 exception Backtrace_or_exception.Exn
-Raised at Backtrace_or_exception.return_exn in file "backtrace_or_exception.ml", line 10, characters 4-13
+Raised at Backtrace_or_exception.without_reraise in file "backtrace_or_exception.ml", line 19, characters 4-13
+Called from Backtrace_or_exception.run in file "backtrace_or_exception.ml", line 39, characters 6-10
+Re-raised at Backtrace_or_exception.return_exn in file "backtrace_or_exception.ml", line 10, characters 4-13
 Called from Backtrace_or_exception.with_reraise in file "backtrace_or_exception.ml", line 23, characters 8-44
 Re-raised at Backtrace_or_exception.with_reraise in file "backtrace_or_exception.ml", line 26, characters 4-13
 Called from Backtrace_or_exception.run in file "backtrace_or_exception.ml", line 39, characters 6-10

testsuite/tests/backtrace/lazy.reference

@@ -5,7 +5,12 @@ Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", li
 Called from Lazy.test1 in file "lazy.ml", line 10, characters 11-24
 Called from Lazy.run in file "lazy.ml", line 19, characters 4-11
 Uncaught exception Not_found
-Raised at Lazy.l2 in file "lazy.ml", line 12, characters 28-45
+Raised at Lazy.l1 in file "lazy.ml", line 7, characters 28-45
+Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 31, characters 17-27
+Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 36, characters 4-11
+Called from Lazy.test1 in file "lazy.ml", line 10, characters 11-24
+Called from Lazy.run in file "lazy.ml", line 19, characters 4-11
+Re-raised at Lazy.l2 in file "lazy.ml", line 12, characters 28-45
 Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 31, characters 17-27
 Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 36, characters 4-11
 Called from Lazy.test2 in file "lazy.ml", line 15, characters 6-15