Rename edge to slot (#274)

Parent PR: mmtk/mmtk-core#1134

---------

Co-authored-by: mmtkgc-bot <[email protected]>

Author: wks

mmtk/Cargo.lock

@@ -32,7 +32,7 @@ memoffset = "0.9.0"
 # - 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 = "dccce9063b57dde96d2e97670297aed4dc32e6e1" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "56b2521d2b99848ee0613a0a5288fe6d81b754ba" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/Cargo.toml

@@ -1,5 +1,5 @@
 use super::UPCALLS;
-use crate::OpenJDKEdge;
+use crate::OpenJDKSlot;
 use atomic::Atomic;
 use atomic::Ordering;
 use mmtk::util::constants::*;
@@ -278,10 +278,10 @@ impl InstanceRefKlass {
         }
         *DISCOVERED_OFFSET
     }
-    pub fn referent_address<const COMPRESSED: bool>(oop: Oop) -> OpenJDKEdge<COMPRESSED> {
+    pub fn referent_address<const COMPRESSED: bool>(oop: Oop) -> OpenJDKSlot<COMPRESSED> {
         oop.get_field_address(Self::referent_offset()).into()
     }
-    pub fn discovered_address<const COMPRESSED: bool>(oop: Oop) -> OpenJDKEdge<COMPRESSED> {
+    pub fn discovered_address<const COMPRESSED: bool>(oop: Oop) -> OpenJDKSlot<COMPRESSED> {
         oop.get_field_address(Self::discovered_offset()).into()
     }
 }
@@ -461,10 +461,10 @@ impl ArrayOopDesc {
     pub unsafe fn slice<const COMPRESSED: bool>(
         &self,
         ty: BasicType,
-    ) -> crate::OpenJDKEdgeRange<COMPRESSED> {
+    ) -> crate::OpenJDKSlotRange<COMPRESSED> {
         let base = self.base::<COMPRESSED>(ty);
         let start = base;
-        let lshift = OpenJDKEdge::<COMPRESSED>::LOG_BYTES_IN_EDGE;
+        let lshift = OpenJDKSlot::<COMPRESSED>::LOG_BYTES_IN_SLOT;
         let end = base + ((self.length::<COMPRESSED>() as usize) << lshift);
         (start..end).into()
     }