Skip to content

Commit

Permalink
Update Julia to use MMTk for perm alloc (#51)
Browse files Browse the repository at this point in the history
Merge with mmtk/julia#9.
  • Loading branch information
qinsoon authored May 3, 2023
1 parent 47087ed commit e36546f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions mmtk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions mmtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion mmtk/api/mmtk.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit e36546f

Please sign in to comment.