Skip to content

Commit e36546f

Browse files
authored
Update Julia to use MMTk for perm alloc (mmtk#51)
Merge with mmtk/julia#9.
1 parent 47087ed commit e36546f

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

mmtk/Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2018"
1010
[package.metadata.julia]
1111
# 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.
1212
julia_repo = "https://github.com/mmtk/julia.git"
13-
julia_version = "72a275233012a80dfd5c5ac1c83afdf9aff0a87a"
13+
julia_version = "9dbc8fc65e1e273cefbbe87b20e35e4c43a7ebaf"
1414

1515
[lib]
1616
crate-type = ["staticlib", "rlib", "dylib"]
@@ -29,7 +29,7 @@ lazy_static = "1.1"
2929
# - change branch
3030
# - change repo name
3131
# But other changes including adding/removing whitespaces in commented lines may break the CI.
32-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "b2968e3903a5730f2ce33654d75dd2e53b26d8b2" }
32+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "638d3287023c77fb4b6906a8bab35a77a5fb6a1f" }
3333
# Uncomment the following to build locally
3434
# mmtk = { path = "../repos/mmtk-core" }
3535
log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

mmtk/api/mmtk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern void* alloc_large(MMTk_Mutator mutator, size_t size,
3434
size_t align, size_t offset, int allocator);
3535

3636
extern void post_alloc(MMTk_Mutator mutator, void* refer,
37-
int bytes, int allocator);
37+
size_t bytes, int allocator);
3838

3939
extern void add_object_to_mmtk_roots(void *obj);
4040
extern void process_root_edges(closure_pointer c, void* slot);

0 commit comments

Comments
 (0)