Skip to content

Commit 574f79c

Browse files
qinsoonmmtkgc-bot
andauthored
Update to MMTK core PR #1159 (#283)
Co-authored-by: mmtkgc-bot <mmtkgc.bot@gmail.com>
1 parent 3df6a8e commit 574f79c

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

mmtk/Cargo.lock

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

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ cfg-if = "1.0"
3434
# - change branch
3535
# - change repo name
3636
# But other changes including adding/removing whitespaces in commented lines may break the CI.
37-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "6cae51c40104d84bb74598ab3eba4f9ef8173e8e" }
37+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a3a72f8e5795678eff06fdc1524f0b429a62ccc0" }
3838
# Uncomment the following to build locally
3939
# mmtk = { path = "../repos/mmtk-core" }
4040

mmtk/src/object_model.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,11 @@ impl<const COMPRESSED: bool> ObjectModel<OpenJDK<COMPRESSED>> for VMObjectModel<
8787
object.to_raw_address()
8888
}
8989

90-
fn ref_to_address(object: ObjectReference) -> Address {
91-
object.to_raw_address()
92-
}
93-
9490
fn ref_to_header(object: ObjectReference) -> Address {
9591
object.to_raw_address()
9692
}
9793

98-
fn address_to_ref(address: Address) -> ObjectReference {
99-
debug_assert!(!address.is_zero());
100-
unsafe { ObjectReference::from_raw_address_unchecked(address) }
101-
}
94+
const IN_OBJECT_ADDRESS_OFFSET: isize = 0;
10295

10396
fn dump_object(object: ObjectReference) {
10497
unsafe {

0 commit comments

Comments
 (0)