Skip to content

Commit 6a90d22

Browse files
wksmmtkgc-bot
andauthored
Remove NULL ObjectReference (#84)
Parent PR: mmtk/mmtk-core#1064 --------- Co-authored-by: mmtkgc-bot <mmtkgc.bot@gmail.com>
1 parent 72aebdb commit 6a90d22

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

mmtk/Cargo.lock

Lines changed: 16 additions & 15 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
@@ -27,7 +27,7 @@ log = "*"
2727
# - change branch
2828
# - change repo name
2929
# But other changes including adding/removing whitespaces in commented lines may break the CI.
30-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "e79e94e744660c486d5471f252ff05c4248bcea9" }
30+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a02803b4104519ff2289234101a2dd8ceedd1bc7" }
3131
# Uncomment the following and fix the path to mmtk-core to build locally
3232
# mmtk = { path = "../repos/mmtk-core" }
3333

mmtk/src/object_model.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ impl ObjectModel<V8> for VMObjectModel {
6969
}
7070

7171
fn address_to_ref(address: Address) -> ObjectReference {
72-
ObjectReference::from_raw_address(address)
72+
debug_assert!(!address.is_zero());
73+
unsafe { ObjectReference::from_raw_address_unchecked(address) }
7374
}
7475

7576
fn dump_object(object: ObjectReference) {

mmtk/src/reference_glue.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ impl ReferenceGlue<V8> for VMReferenceGlue {
1111
fn set_referent(_reff: ObjectReference, _referent: ObjectReference) {
1212
unimplemented!()
1313
}
14-
fn get_referent(_object: ObjectReference) -> ObjectReference {
14+
fn get_referent(_object: ObjectReference) -> Option<ObjectReference> {
1515
unimplemented!()
1616
}
1717
fn enqueue_references(_references: &[ObjectReference], _tls: VMWorkerThread) {
1818
unimplemented!()
1919
}
20+
fn clear_referent(_new_reference: ObjectReference) {
21+
unimplemented!()
22+
}
2023
}

0 commit comments

Comments
 (0)