Resolve conflicts in asmcomp/*cmm* and middle_end/ (#172)

ocaml-flambda · Oct 23, 2023 · b936c16 · b936c16
1 parent be2dc2d
commit b936c16
Show file tree

Hide file tree

Showing 26 changed files with 176 additions and 1,426 deletions.
diff --git a/asmcomp/cmm.ml b/asmcomp/cmm.ml
@@ -154,22 +154,12 @@ type memory_chunk =
 and operation =
     Capply of machtype * Lambda.region_close
   | Cextcall of string * machtype * exttype list * bool
-<<<<<<< HEAD
-  | Cload of memory_chunk * Asttypes.mutable_flag
-  | Calloc of Lambda.alloc_mode
-  | Cstore of memory_chunk * initialization_or_assignment
-||||||| merged common ancestors
-  | Cload of memory_chunk * Asttypes.mutable_flag
-  | Calloc
-  | Cstore of memory_chunk * Lambda.initialization_or_assignment
-=======
   | Cload of
       { memory_chunk: memory_chunk
       ; mutability: Asttypes.mutable_flag
       ; is_atomic: bool }
-  | Calloc
-  | Cstore of memory_chunk * Lambda.initialization_or_assignment
->>>>>>> ocaml/5.1
+  | Calloc of Lambda.alloc_mode
+  | Cstore of memory_chunk * initialization_or_assignment
   | Caddi | Csubi | Cmuli | Cmulhi | Cdivi | Cmodi
   | Cand | Cor | Cxor | Clsl | Clsr | Casr
   | Ccmpi of integer_comparison
@@ -184,17 +174,13 @@ and operation =
   | Cprobe of { name: string; handler_code_sym: string; }
   | Cprobe_is_enabled of { name: string }
   | Copaque
-<<<<<<< HEAD
   | Cbeginregion | Cendregion
+  | Cdls_get
 
 type kind_for_unboxing =
   | Any
   | Boxed_integer of Lambda.boxed_integer
   | Boxed_float
-||||||| merged common ancestors
-=======
-  | Cdls_get
->>>>>>> ocaml/5.1
 
 type expression =
     Cconst_int of int * Debuginfo.t