Skip to content

Commit ab681b8

Browse files
mshinwellmshinwell
committed
flambda-backend: Promotions
1 parent 574ed0e commit ab681b8

6 files changed

Lines changed: 31 additions & 18 deletions

File tree

‎testsuite/tests/backtrace/backtrace_dynlink.reference‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
Raised by primitive operation at Backtrace_dynlink_plugin in file "backtrace_dynlink_plugin.ml", line 6, characters 13-38
2-
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 292, characters 8-25
2+
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 112, characters 8-25
33
Called from Stdlib__List.iter in file "list.ml", line 116, characters 12-15
44
Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 367, characters 13-72
55
Called from Stdlib__List.iter in file "list.ml", line 116, characters 12-15
66
Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 363, characters 8-408
7-
Called from Backtrace_dynlink in file "backtrace_dynlink.ml", line 39, characters 4-52
7+
Called from Backtrace_dynlink in file "backtrace_dynlink.ml", line 39, characters 4-71
88
execution of module initializers in the shared library failed: Failure("SUCCESS")
99
Raised at Stdlib.failwith in file "stdlib.ml", line 34, characters 17-33
1010
Called from Backtrace_dynlink_plugin in file "backtrace_dynlink_plugin.ml", line 3, characters 4-22
1111
Re-raised at Backtrace_dynlink_plugin in file "backtrace_dynlink_plugin.ml", line 8, characters 5-12
12-
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 292, characters 8-25
13-
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 292, characters 8-25
14-
Re-raised at Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 304, characters 6-137
12+
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 112, characters 8-25
13+
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 112, characters 8-25
14+
Re-raised at Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 124, characters 6-137
1515
Called from Stdlib__List.iter in file "list.ml", line 116, characters 12-15
1616
Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 367, characters 13-72
1717
Called from Stdlib__List.iter in file "list.ml", line 116, characters 12-15
1818
Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 363, characters 8-408
1919
Re-raised at Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 376, characters 8-17
20-
Called from Backtrace_dynlink in file "backtrace_dynlink.ml", line 39, characters 4-52
20+
Called from Backtrace_dynlink in file "backtrace_dynlink.ml", line 39, characters 4-71

‎testsuite/tests/lib-dynlink-initializers/test10_main.native.reference‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ Raised at Stdlib.failwith in file "stdlib.ml", line 34, characters 17-33
33
Called from Test10_plugin.g in file "test10_plugin.ml" (inlined), line 2, characters 15-38
44
Called from Test10_plugin.f in file "test10_plugin.ml", line 6, characters 2-6
55
Called from Test10_plugin in file "test10_plugin.ml", line 10, characters 2-6
6-
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 292, characters 8-25
7-
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 292, characters 8-25
8-
Re-raised at Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 304, characters 6-137
6+
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 112, characters 8-25
7+
Called from Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 112, characters 8-25
8+
Re-raised at Dynlink.Native.ndl_run in file "otherlibs/dynlink/dynlink.ml", line 124, characters 6-137
99
Called from Stdlib__List.iter in file "list.ml", line 116, characters 12-15
1010
Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 367, characters 13-72
1111
Called from Stdlib__List.iter in file "list.ml", line 116, characters 12-15
1212
Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 363, characters 8-408
1313
Re-raised at Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 376, characters 8-17
14+
Called from Dynlink_common.Make.loadfile in file "otherlibs/dynlink/dynlink_common.ml" (inlined), line 378, characters 26-45
1415
Called from Test10_main in file "test10_main.ml", line 49, characters 30-87

‎testsuite/tests/parsetree/locations_test.compilers.reference‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ Ptop_def
243243
Ppat_constraint
244244
pattern (//toplevel//[2,1+4]..[2,1+5])
245245
Ppat_var "x" (//toplevel//[2,1+4]..[2,1+5])
246-
core_type (//toplevel//[2,1+16]..[2,1+22]) ghost
246+
core_type (//toplevel//[2,1+4]..[2,1+35]) ghost
247247
Ptyp_poly 'a
248248
core_type (//toplevel//[2,1+16]..[2,1+22])
249249
Ptyp_arrow

‎testsuite/tests/typing-gadts/test.ml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,9 +689,9 @@ let f : type a b. (a,b) eq -> (<m : a; ..> as 'c) -> (<m : b; ..> as 'c) =
689689
;; (* fail *)
690690
[%%expect{|
691691
type (_, _) eq = Eq : ('a, 'a) eq
692-
Line 3, characters 18-72:
693-
3 | let f : type a b. (a,b) eq -> (<m : a; ..> as 'c) -> (<m : b; ..> as 'c) =
694-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
692+
Lines 3-4, characters 4-15:
693+
3 | ....f : type a b. (a,b) eq -> (<m : a; ..> as 'c) -> (<m : b; ..> as 'c) =
694+
4 | fun Eq o -> o
695695
Error: The universal type variable 'b cannot be generalized:
696696
it is already bound to another variable.
697697
|}];;

‎testsuite/tests/typing-layouts/annots_beta.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@ val f : ('a : float64). 'a -> 'a = <fun>
356356
let f : type (a : any). a -> a = fun x -> x
357357
;;
358358
[%%expect {|
359-
Line 1, characters 24-30:
359+
Line 1, characters 4-43:
360360
1 | let f : type (a : any). a -> a = fun x -> x
361-
^^^^^^
361+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
362362
Error: The universal type variable 'a was declared to have
363363
layout any, but was inferred to have a representable layout.
364364
|}]

‎testsuite/tests/typing-local/local.ml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@ let foo () =
171171
((fun y z -> z) : int -> local_ (int -> int)) in
172172
()
173173
[%%expect{|
174-
val foo : unit -> unit = <fun>
174+
Line 3, characters 4-49:
175+
3 | ((fun y z -> z) : int -> local_ (int -> int)) in
176+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
177+
Error: This expression has type int -> local_ (int -> int)
178+
but an expression was expected of type int -> int -> int
175179
|}]
176180

177181
let foo () =
@@ -191,7 +195,11 @@ let foo () =
191195
((fun y z -> z) : _ -> local_ (_ -> _)) in
192196
()
193197
[%%expect{|
194-
val foo : unit -> unit = <fun>
198+
Line 3, characters 4-43:
199+
3 | ((fun y z -> z) : _ -> local_ (_ -> _)) in
200+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
201+
Error: This expression has type 'b -> local_ ('c -> 'c)
202+
but an expression was expected of type 'a -> 'a -> 'a
195203
|}]
196204

197205
let foo () =
@@ -2787,7 +2795,11 @@ let foo () =
27872795
let local_ _bar2 z : int -> int -> int = local_ (fun x y -> x + y + z) in
27882796
()
27892797
[%%expect{|
2790-
val foo : unit -> unit = <fun>
2798+
Line 2, characters 6-66:
2799+
2 | let local_ _bar1 : int -> int -> int = local_ (fun x y -> x + y) in
2800+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2801+
Error: This expression has type int -> local_ (int -> int)
2802+
but an expression was expected of type int -> (int -> int)
27912803
|}];;
27922804
27932805
let foo () =

0 commit comments

Comments
 (0)