From e36546f13413b3b165f31800211672b0cdfbc7cf Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Thu, 4 May 2023 00:12:24 +1200
Subject: [PATCH] Update Julia to use MMTk for perm alloc (#51)

Merge with https://github.com/mmtk/julia/pull/9.
---
 mmtk/Cargo.lock | 8 ++++----
 mmtk/Cargo.toml | 4 ++--
 mmtk/api/mmtk.h | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index 38f88d13..6f0573af 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -533,8 +533,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk"
-version = "0.17.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=b2968e3903a5730f2ce33654d75dd2e53b26d8b2#b2968e3903a5730f2ce33654d75dd2e53b26d8b2"
+version = "0.18.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=638d3287023c77fb4b6906a8bab35a77a5fb6a1f#638d3287023c77fb4b6906a8bab35a77a5fb6a1f"
 dependencies = [
  "atomic 0.5.1",
  "atomic-traits",
@@ -577,8 +577,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk-macros"
-version = "0.17.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=b2968e3903a5730f2ce33654d75dd2e53b26d8b2#b2968e3903a5730f2ce33654d75dd2e53b26d8b2"
+version = "0.18.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=638d3287023c77fb4b6906a8bab35a77a5fb6a1f#638d3287023c77fb4b6906a8bab35a77a5fb6a1f"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index fb35c7e1..8a4aa638 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 [package.metadata.julia]
 # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works.
 julia_repo = "https://github.com/mmtk/julia.git"
-julia_version = "72a275233012a80dfd5c5ac1c83afdf9aff0a87a"
+julia_version = "9dbc8fc65e1e273cefbbe87b20e35e4c43a7ebaf"
 
 [lib]
 crate-type = ["staticlib", "rlib", "dylib"]
@@ -29,7 +29,7 @@ lazy_static = "1.1"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "b2968e3903a5730f2ce33654d75dd2e53b26d8b2" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "638d3287023c77fb4b6906a8bab35a77a5fb6a1f" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }
diff --git a/mmtk/api/mmtk.h b/mmtk/api/mmtk.h
index 12aa8f5d..caf1c402 100644
--- a/mmtk/api/mmtk.h
+++ b/mmtk/api/mmtk.h
@@ -34,7 +34,7 @@ extern void* alloc_large(MMTk_Mutator mutator, size_t size,
     size_t align, size_t offset, int allocator);    
 
 extern void post_alloc(MMTk_Mutator mutator, void* refer,
-    int bytes, int allocator);
+    size_t bytes, int allocator);
 
 extern void add_object_to_mmtk_roots(void *obj);
 extern void process_root_edges(closure_pointer c, void* slot);