Cleanup

Author: udesou

mmtk/src/conservative.rs

@@ -80,7 +80,7 @@ pub unsafe fn mmtk_conservative_scan_task_stack(ta: *const jl_task_t) {
         log::debug!("Skip guard page: {}, {}", active_start, guard_page_start);
         conservative_scan_range(guard_page_start, active_start + size);
     } else {
-        // log::warn!("Skip stack for {:?}", ta);
+        log::warn!("Skip stack for {:?}", ta);
     }
 }
 pub unsafe fn mmtk_conservative_scan_task_registers(ta: *const jl_task_t) {
@@ -99,12 +99,12 @@ pub fn mmtk_conservative_scan_ptls_registers(ptls: &mut _jl_tls_states_t) {
 }
 // TODO: This scans the entire context type, which is slower.
 // We actually only need to scan registers.
-pub fn get_range<T>(ctx: &T) -> (Address, Address) {
+fn get_range<T>(ctx: &T) -> (Address, Address) {
     let start = Address::from_ptr(ctx);
     let ty_size = std::mem::size_of::<T>();
     (start, start + ty_size)
 }
-pub fn conservative_scan_range(lo: Address, hi: Address) {
+fn conservative_scan_range(lo: Address, hi: Address) {
     // The high address is exclusive
     let hi = if hi.is_aligned_to(BYTES_IN_ADDRESS) {
         hi - BYTES_IN_ADDRESS
@@ -122,7 +122,7 @@ pub fn conservative_scan_range(lo: Address, hi: Address) {
         cursor -= BYTES_IN_ADDRESS;
     }
 }
-pub fn is_potential_mmtk_object(addr: Address) -> Option<ObjectReference> {
+fn is_potential_mmtk_object(addr: Address) -> Option<ObjectReference> {
     if crate::object_model::is_addr_in_immixspace(addr) {
         // We only care about immix space. If the object is in other spaces, we won't move them, and we don't need to pin them.
         memory_manager::find_object_from_internal_pointer(addr, usize::MAX)

mmtk/src/julia_scanning.rs

@@ -519,8 +519,6 @@ pub unsafe fn mmtk_scan_gcpreserve_stack<EV: SlotVisitor<JuliaVMSlot>>(
     }
 }
 
-// Scan the shadow stack for root tasks possibly capturing
-// more tasks that will also need to be scanned
 pub unsafe fn mmtk_scan_gcstack<'a, EV: SlotVisitor<JuliaVMSlot>>(
     ta: *const jl_task_t,
     mut closure: &'a mut EV,
@@ -627,20 +625,6 @@ pub unsafe fn mmtk_scan_gcstack<'a, EV: SlotVisitor<JuliaVMSlot>>(
     }
 }
 
-pub unsafe fn capture_potential_task(addr: Address, extra_root_tasks: &mut Vec<ObjectReference>) {
-    use mmtk::vm::slot::Slot;
-    let simple_slot = SimpleSlot::from_address(addr);
-
-    if let Some(objref) = simple_slot.load() {
-        let obj = objref.to_raw_address();
-        let vtag_usize = mmtk_jl_typetagof(obj).as_usize();
-
-        if vtag_usize == ((jl_small_typeof_tags_jl_task_tag as usize) << 4) {
-            extra_root_tasks.push(objref);
-        }
-    }
-}
-
 #[inline(always)]
 pub unsafe fn get_julia_object_type(obj: Address) -> String {
     // get Julia object type