Updating julia_version to use mmtk/julia (#138)

mmtk · Feb 29, 2024 · 33ddc1d · 33ddc1d
1 parent c2ce218
commit 33ddc1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2018"
 # Metadata for the Julia repository
 [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/udesou/julia.git"
-julia_version = "eaf4ece55f3b0a5b6bf02da75be949b512e0de53"
+julia_repo = "https://github.com/mmtk/julia.git"
+julia_version = "09e025b25c65e5842b6eeeb3c81ba4cab97f5192"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/mmtk/src/gc_trigger.rs b/mmtk/src/gc_trigger.rs
@@ -263,7 +263,7 @@ impl GCTriggerPolicy<JuliaVM> for JuliaGCTrigger {
     // Basically there is no limit for the heap size.
 
     /// Is current heap full?
-    fn is_heap_full(&self, plan: &dyn Plan<VM = JuliaVM>) -> bool {
+    fn is_heap_full(&self, _plan: &dyn Plan<VM = JuliaVM>) -> bool {
         false
     }
 

diff --git a/mmtk/src/object_model.rs b/mmtk/src/object_model.rs
@@ -290,7 +290,8 @@ pub unsafe fn get_so_object_size(object: ObjectReference) -> usize {
             dtsz + JULIA_HEADER_SIZE
         );
 
-        llt_align(dtsz + JULIA_HEADER_SIZE, 16)
+        // NB: Strings are aligned to 8 and not to 16
+        llt_align(dtsz + JULIA_HEADER_SIZE, 8)
     } else if obj_type == jl_method_type {
         let dtsz = std::mem::size_of::<mmtk_jl_method_t>();
         debug_assert!(