Skip to content

Commit 2561dd9

Browse files
stedolanpoechsel
stedolan
authored and
poechsel
committed
flambda-backend: permanent/reraise-by-default (cherry-pick 50e94902ca6bb84c33982db858b74322eefd9af8)
1 parent c0aa4f4 commit 2561dd9

6 files changed

Lines changed: 64 additions & 8 deletions

File tree

‎stdlib/stdlib.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ let () =
2323
register_named_value "Pervasives.array_bound_error"
2424
(Invalid_argument "index out of bounds")
2525

26-
external raise : exn -> 'a = "%raise"
26+
external raise : exn -> 'a = "%reraise"
2727
external raise_notrace : exn -> 'a = "%raise_notrace"
2828

2929
let failwith s = raise(Failure s)

‎stdlib/stdlib.mli‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
(** {1 Exceptions} *)
2929

30-
external raise : exn -> 'a = "%raise"
30+
external raise : exn -> 'a = "%reraise"
3131
(** Raise the given exception value *)
3232

3333
external raise_notrace : exn -> 'a = "%raise_notrace"

‎testsuite/tests/backtrace/backtrace2.reference‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,32 @@ Uncaught exception Invalid_argument("index out of bounds")
3535
Raised by primitive operation at Backtrace2.run in file "backtrace2.ml", line 62, characters 14-22
3636
test_Not_found
3737
Uncaught exception Not_found
38-
Raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
38+
Raised at Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 18-33
39+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
40+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
41+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
42+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
43+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
44+
Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11
45+
Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
3946
Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42
4047
Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70
4148
Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
4249
Uncaught exception Not_found
43-
Raised at Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 18-33
50+
Raised at Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 18-33
51+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
52+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
53+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
54+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
55+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
56+
Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11
57+
Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
58+
Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42
59+
Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70
60+
Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
61+
Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
62+
Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41
63+
Re-raised at Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 18-33
4464
Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
4565
Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
4666
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
5070
Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 36, characters 4-11
5171
Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
5272
Uncaught exception Not_found
53-
Raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
73+
Raised at Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 18-33
74+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
75+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
76+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
77+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
78+
Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52
79+
Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11
80+
Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
81+
Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42
82+
Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70
83+
Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
84+
Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
85+
Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41
86+
Re-raised at Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 18-33
87+
Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
88+
Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
89+
Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
90+
Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
91+
Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52
92+
Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 31, characters 17-27
93+
Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 36, characters 4-11
94+
Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23
95+
Re-raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 539, characters 13-28
5496
Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41
5597
Re-raised at CamlinternalLazy.force_lazy_block.(fun) in file "camlinternalLazy.ml", line 35, characters 56-63
5698
Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 31, characters 17-27

‎testsuite/tests/backtrace/backtrace3.reference‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ Called from Backtrace3.g in file "backtrace3.ml", line 15, characters 4-11
6060
Re-raised at Backtrace3.g in file "backtrace3.ml", line 42, characters 45-55
6161
Called from Backtrace3.run in file "backtrace3.ml", line 49, characters 11-23
6262
Uncaught exception Backtrace3.Error("h")
63-
Raised at Backtrace3.g in file "backtrace3.ml", line 45, characters 10-17
63+
Raised at Backtrace3.f in file "backtrace3.ml", line 11, characters 16-32
64+
Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
65+
Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
66+
Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
67+
Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
68+
Called from Backtrace3.f in file "backtrace3.ml", line 11, characters 42-53
69+
Called from Backtrace3.g in file "backtrace3.ml", line 15, characters 4-11
70+
Re-raised at Backtrace3.g in file "backtrace3.ml", line 45, characters 10-17
6471
Called from Backtrace3.run in file "backtrace3.ml", line 49, characters 11-23
6572
Uncaught exception Invalid_argument("index out of bounds")
6673
Raised by primitive operation at Backtrace3.run in file "backtrace3.ml", line 49, characters 14-22

‎testsuite/tests/backtrace/backtrace_or_exception.reference‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Raised at Backtrace_or_exception.without_reraise in file "backtrace_or_exception
33
Called from Backtrace_or_exception.run in file "backtrace_or_exception.ml", line 39, characters 6-10
44
---------------------------
55
exception Backtrace_or_exception.Exn
6-
Raised at Backtrace_or_exception.return_exn in file "backtrace_or_exception.ml", line 10, characters 4-13
6+
Raised at Backtrace_or_exception.without_reraise in file "backtrace_or_exception.ml", line 19, characters 4-13
7+
Called from Backtrace_or_exception.run in file "backtrace_or_exception.ml", line 39, characters 6-10
8+
Re-raised at Backtrace_or_exception.return_exn in file "backtrace_or_exception.ml", line 10, characters 4-13
79
Called from Backtrace_or_exception.with_reraise in file "backtrace_or_exception.ml", line 23, characters 8-44
810
Re-raised at Backtrace_or_exception.with_reraise in file "backtrace_or_exception.ml", line 26, characters 4-13
911
Called from Backtrace_or_exception.run in file "backtrace_or_exception.ml", line 39, characters 6-10

‎testsuite/tests/backtrace/lazy.reference‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", li
55
Called from Lazy.test1 in file "lazy.ml", line 10, characters 11-24
66
Called from Lazy.run in file "lazy.ml", line 19, characters 4-11
77
Uncaught exception Not_found
8-
Raised at Lazy.l2 in file "lazy.ml", line 12, characters 28-45
8+
Raised at Lazy.l1 in file "lazy.ml", line 7, characters 28-45
9+
Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 31, characters 17-27
10+
Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 36, characters 4-11
11+
Called from Lazy.test1 in file "lazy.ml", line 10, characters 11-24
12+
Called from Lazy.run in file "lazy.ml", line 19, characters 4-11
13+
Re-raised at Lazy.l2 in file "lazy.ml", line 12, characters 28-45
914
Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 31, characters 17-27
1015
Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 36, characters 4-11
1116
Called from Lazy.test2 in file "lazy.ml", line 15, characters 6-15

0 commit comments

Comments
 (0)