Skip to content

Commit

Permalink
flambda-backend: Remaining Lambda changes for 5.2 (#2951)
Browse files Browse the repository at this point in the history
* Last lambda/ conflicts

(cherry picked from commit ebc66b4)

* Minor fix in ocaml/lambda/translattribute.ml

(cherry picked from commit e4a17e6)
  • Loading branch information
mshinwell authored Aug 21, 2024
1 parent 7afb205 commit c8206e8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 20 deletions.
7 changes: 1 addition & 6 deletions lambda/lambda.ml
Original file line number Diff line number Diff line change
Expand Up @@ -436,14 +436,9 @@ and boxed_vector =

and bigarray_kind =
Pbigarray_unknown
<<<<<<< HEAD
| Pbigarray_float16 | Pbigarray_float32 | Pbigarray_float64
||||||| 2572783060
| Pbigarray_float32 | Pbigarray_float64
=======
| Pbigarray_float16
| Pbigarray_float32 | Pbigarray_float32_t
| Pbigarray_float64
>>>>>>> ocaml-jst/flambda-patches
| Pbigarray_sint8 | Pbigarray_uint8
| Pbigarray_sint16 | Pbigarray_uint16
| Pbigarray_int32 | Pbigarray_int64
Expand Down
2 changes: 1 addition & 1 deletion lambda/translattribute.ml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ let parse_inline_attribute attr : inline_attribute =
let parse_inlined_attribute attr : inlined_attribute =
match attr with
| None -> Default_inlined
| Some {Parsetree.attr_name = {txt;loc}; attr_payload = payload} ->
| Some ({Parsetree.attr_name = {txt;loc}; attr_payload = payload} as attr) ->
if attr_equals_builtin attr "unrolled" then begin
(* the 'unrolled' attributes must be used as [@unrolled n]. *)
let warning txt = Warnings.Attribute_payload
Expand Down
14 changes: 1 addition & 13 deletions lambda/translprim.ml
Original file line number Diff line number Diff line change
Expand Up @@ -797,26 +797,14 @@ let lookup_primitive loc ~poly_mode ~poly_sort pos p =
| "%atomic_exchange" -> Primitive (Patomic_exchange, 2)
| "%atomic_cas" -> Primitive (Patomic_cas, 3)
| "%atomic_fetch_add" -> Primitive (Patomic_fetch_add, 2)
<<<<<<< HEAD
| "%runstack" -> Primitive (Prunstack, 3)
| "%reperform" -> Primitive (Preperform, 3)
| "%perform" -> Primitive (Pperform, 1)
| "%resume" -> Primitive (Presume, 4)
||||||| 2572783060
| "%runstack" -> Primitive (Prunstack, 3)
| "%reperform" -> Primitive (Preperform, 3)
| "%perform" -> Primitive (Pperform, 1)
| "%resume" -> Primitive (Presume, 3)
=======
| "%runstack" ->
if runtime5 then Primitive (Prunstack, 3) else Unsupported Prunstack
| "%reperform" ->
if runtime5 then Primitive (Preperform, 3) else Unsupported Preperform
| "%perform" ->
if runtime5 then Primitive (Pperform, 1) else Unsupported Pperform
| "%resume" ->
if runtime5 then Primitive (Presume, 3) else Unsupported Presume
>>>>>>> ocaml-jst/flambda-patches
if runtime5 then Primitive (Presume, 4) else Unsupported Presume
| "%dls_get" -> Primitive (Pdls_get, 1)
| "%poll" -> Primitive (Ppoll, 1)
| "%unbox_nativeint" -> Primitive(Punbox_int Pnativeint, 1)
Expand Down

0 comments on commit c8206e8

Please sign in to comment.