Skip to content

Commit

Permalink
Update to MMTk core PR #949 (#36)
Browse files Browse the repository at this point in the history
Updates to mmtk/mmtk-core#949

---------

Co-authored-by: mmtkgc-bot <mmtkgc.bot@gmail.com>
  • Loading branch information
qinsoon and mmtkgc-bot authored Oct 24, 2023
1 parent 4fcb857 commit 6992549
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 12 deletions.
4 changes: 2 additions & 2 deletions mmtk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions mmtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ features = ["is_mmtk_object", "object_pinning"]
# Uncomment one of the following lines to choose where to find mmtk-core.
git = "https://github.com/mmtk/mmtk-core.git" # Use mmtk-core from the official repository.
#path = "../../mmtk-core" # Use mmtk-core from a local repository.
rev = "57af17fbfd94ff0df2cd3b1e504abe299ce4f0ab"

[features]
default = []
Expand Down
5 changes: 0 additions & 5 deletions mmtk/src/active_plan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@ use crate::Ruby;
use mmtk::util::opaque_pointer::*;
use mmtk::vm::ActivePlan;
use mmtk::Mutator;
use mmtk::Plan;

pub struct VMActivePlan {}

impl ActivePlan<Ruby> for VMActivePlan {
fn global() -> &'static dyn Plan<VM = Ruby> {
mmtk().get_plan()
}

fn number_of_mutators() -> usize {
(upcalls().number_of_mutators)()
}
Expand Down
5 changes: 0 additions & 5 deletions mmtk/src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,6 @@ pub extern "C" fn mmtk_is_mmtk_object(addr: Address) -> bool {
memory_manager::is_mmtk_object(addr)
}

#[no_mangle]
pub extern "C" fn mmtk_modify_check(object: ObjectReference) {
memory_manager::modify_check(mmtk(), object)
}

#[no_mangle]
pub extern "C" fn mmtk_handle_user_collection_request(tls: VMMutatorThread) {
memory_manager::handle_user_collection_request::<Ruby>(mmtk(), tls);
Expand Down

0 comments on commit 6992549

Please sign in to comment.