Remove NULL ObjectReference

Parent PR: mmtk/mmtk-core#1064
wks · Apr 24, 2024 · b74e44f · b74e44f
1 parent 72aebdb
commit b74e44f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -27,7 +27,7 @@ log = "*"
 # - 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 = "e79e94e744660c486d5471f252ff05c4248bcea9" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "6aa75cd72247d12b9568dc321c46feca6572a512" }
 # Uncomment the following and fix the path to mmtk-core to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

diff --git a/mmtk/src/object_model.rs b/mmtk/src/object_model.rs
@@ -69,7 +69,8 @@ impl ObjectModel<V8> for VMObjectModel {
     }
 
     fn address_to_ref(address: Address) -> ObjectReference {
-        ObjectReference::from_raw_address(address)
+        debug_assert!(!address.is_zero());
+        unsafe { ObjectReference::from_raw_address_unchecked(address) }
     }
 
     fn dump_object(object: ObjectReference) {

diff --git a/mmtk/src/reference_glue.rs b/mmtk/src/reference_glue.rs
@@ -11,10 +11,13 @@ impl ReferenceGlue<V8> for VMReferenceGlue {
     fn set_referent(_reff: ObjectReference, _referent: ObjectReference) {
         unimplemented!()
     }
-    fn get_referent(_object: ObjectReference) -> ObjectReference {
+    fn get_referent(_object: ObjectReference) -> Option<ObjectReference> {
         unimplemented!()
     }
     fn enqueue_references(_references: &[ObjectReference], _tls: VMWorkerThread) {
         unimplemented!()
     }
+    fn clear_referent(_new_reference: ObjectReference) {
+        unimplemented!()
+    }
 }