fixed up

ocaml-flambda · Jan 23, 2025 · d64f310 · d64f310
1 parent 2aa2843
commit d64f310
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/lambda/printlambda.ml b/lambda/printlambda.ml
@@ -1188,14 +1188,10 @@ let name_of_primitive = function
       "Preinterpret_tagged_int63_as_unboxed_int64"
   | Preinterpret_unboxed_int64_as_tagged_int63 ->
       "Preinterpret_unboxed_int64_as_tagged_int63"
-<<<<<<< HEAD
   | Ppeek _ -> "Ppeek"
   | Ppoke _ -> "Ppoke"
-||||||| parent of 3cf77a508 (added primitives, but didn't update backend yet)
-=======
   | Pnaked_int_cast _ -> "Pnaked_int_cast"
   | Pnaked_int_binop _ -> "Pnaked_int_binop"
->>>>>>> 3cf77a508 (added primitives, but didn't update backend yet)
 
 let zero_alloc_attribute ppf check =
   match check with

diff --git a/lambda/value_rec_compiler.ml b/lambda/value_rec_compiler.ml
@@ -357,7 +357,7 @@ let compute_static_size lam =
     | Popaque _
     | Pdls_get
     | Ppeek _
-    | Ppoke _ ->
+    | Ppoke _
     | Pnaked_int_cast _
     | Pnaked_int_binop _ ->
         dynamic_size lam