Skip to content

Commit

Permalink
Fixup: more merge artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
OlivierNicole committed Oct 2, 2024
1 parent 4de12c1 commit 33d448c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
5 changes: 0 additions & 5 deletions compiler/lib/code.ml
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,6 @@ module Native_string = struct
| Utf _, Byte _ | Byte _, Utf _ -> false
end

type int_kind =
| Regular
| Int32
| Native

type constant =
| String of string
| NativeString of Native_string.t
Expand Down
5 changes: 0 additions & 5 deletions compiler/lib/code.mli
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,6 @@ module Native_string : sig
val equal : t -> t -> bool
end

type int_kind =
| Regular
| Int32
| Native

type constant =
| String of string
| NativeString of Native_string.t
Expand Down
2 changes: 1 addition & 1 deletion compiler/lib/ocaml_compiler.ml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ let rec constant_of_const c : Code.constant =
| `JavaScript -> Int32.of_int_warning_on_overflow i
| `Wasm -> Int31.(of_int_warning_on_overflow i |> to_int32))
| Const_block (tag, l) ->
let l = Array.of_list (List.map l ~f:(fun c -> constant_of_const c)) in
let l = Array.of_list (List.map l ~f:constant_of_const) in
Tuple (tag, l, Unknown)

let rec find_loc_in_summary ident' = function
Expand Down

0 comments on commit 33d448c

Please sign in to comment.