Skip to content

Commit

Permalink
Update to MMTK core PR #1159 (#160)
Browse files Browse the repository at this point in the history
Co-authored-by: mmtkgc-bot <mmtkgc.bot@gmail.com>
(cherry picked from commit f4809eb)
  • Loading branch information
qinsoon authored and mergify[bot] committed Jul 12, 2024
1 parent cdc68ee commit a739f8b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 17 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.

2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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 = "56b2521d2b99848ee0613a0a5288fe6d81b754ba" }
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a3a72f8e5795678eff06fdc1524f0b429a62ccc0" }
# Uncomment the following to build locally
# mmtk = { path = "../../mmtk-core" }
log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }
Expand Down
14 changes: 2 additions & 12 deletions mmtk/src/object_model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,23 +156,13 @@ impl ObjectModel<JuliaVM> for VMObjectModel {
res
}

#[inline(always)]
fn ref_to_address(object: ObjectReference) -> Address {
object.to_raw_address()
}

#[inline(always)]
fn address_to_ref(address: Address) -> ObjectReference {
// `address` is a result of `ref_to_address(object)`, where `object` cannot be NULL.
debug_assert!(!address.is_zero());
unsafe { ObjectReference::from_raw_address_unchecked(address) }
}

#[inline(always)]
fn ref_to_header(object: ObjectReference) -> Address {
object.to_raw_address()
}

const IN_OBJECT_ADDRESS_OFFSET: isize = 0;

fn dump_object(_object: ObjectReference) {
unimplemented!()
}
Expand Down

0 comments on commit a739f8b

Please sign in to comment.