pass bool to meaning mandatory alignment

dfinity · Nov 29, 2021 · 52da308 · 52da308
1 parent 140e93d
commit 52da308
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/rts/motoko-rts/src/memory/ic.rs b/rts/motoko-rts/src/memory/ic.rs
@@ -34,8 +34,12 @@ pub(crate) unsafe fn get_aligned_heap_base() -> u32 {
 }
 
 #[no_mangle]
-unsafe extern "C" fn init() {
-    HP = get_aligned_heap_base();
+unsafe extern "C" fn init(align: bool) {
+    HP = if align {
+        get_aligned_heap_base()
+    } else {
+        get_heap_base()
+    };
     LAST_HP = HP;
 }
 

diff --git a/src/codegen/compile.ml b/src/codegen/compile.ml
@@ -864,7 +864,7 @@ module RTS = struct
     E.add_func_import env "rts" "alloc_words" [I32Type] [I32Type];
     E.add_func_import env "rts" "get_total_allocations" [] [I64Type];
     E.add_func_import env "rts" "get_heap_size" [] [I32Type];
-    E.add_func_import env "rts" "init" [] [];
+    E.add_func_import env "rts" "init" [I32Type] [];
     E.add_func_import env "rts" "alloc_blob" [I32Type] [I32Type];
     E.add_func_import env "rts" "alloc_array" [I32Type] [I32Type];
     ()
@@ -8846,6 +8846,7 @@ and conclude_module env start_fi_o =
 
   (* Wrap the start function with the RTS initialization *)
   let rts_start_fi = E.add_fun env "rts_start" (Func.of_body env [] [] (fun env1 ->
+    Bool.lit (!Flags.gc_strategy = Mo_config.Flags.MarkCompact) ^^
     E.call_import env "rts" "init" ^^
     match start_fi_o with
     | Some fi ->