Skip to content

Commit 589c9ee

Browse files
wksmmtkgc-bot
andauthored
Use to_address for SFT access (#272)
Upstream change: mmtk/mmtk-core#1122 --------- Co-authored-by: mmtkgc-bot <[email protected]>
1 parent c44a6f8 commit 589c9ee

File tree

3 files changed

+116
-91
lines changed

3 files changed

+116
-91
lines changed

mmtk/Cargo.lock

Lines changed: 110 additions & 89 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
@@ -32,7 +32,7 @@ memoffset = "0.9.0"
3232
# - change branch
3333
# - change repo name
3434
# But other changes including adding/removing whitespaces in commented lines may break the CI.
35-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "5ab62f96c006475285b00b6d20a8b1bf83b74a4d" }
35+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "e79e94e744660c486d5471f252ff05c4248bcea9" }
3636
# Uncomment the following to build locally
3737
# mmtk = { path = "../repos/mmtk-core" }
3838

mmtk/src/api.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,11 @@ pub extern "C" fn post_alloc(
198198

199199
#[no_mangle]
200200
pub extern "C" fn will_never_move(object: ObjectReference) -> bool {
201-
!object.is_movable()
201+
if crate::use_compressed_oops() {
202+
!object.is_movable::<OpenJDK<true>>()
203+
} else {
204+
!object.is_movable::<OpenJDK<false>>()
205+
}
202206
}
203207

204208
#[no_mangle]

0 commit comments

Comments
 (0)