Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to MMTk core PR #949 #81

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Update to MMTk core PR #949 #81

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c62d2d4
Update to MMTk core PR #949
qinsoon Oct 19, 2023
607327e
Update mmtk-core to 57af17fbfd94ff0df2cd3b1e504abe299ce4f0ab
mmtkgc-bot Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mmtk/Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "61d20e2dcd5b4743ef04a8118eb807bcd6f6e2e2" }
mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "d5f5ac9ee285b871c1985146b75e6aaa5619ded4" }
# Uncomment the following and fix the path to mmtk-core to build locally
# mmtk = { path = "../repos/mmtk-core" }

Expand Down
6 changes: 0 additions & 6 deletions mmtk/src/active_plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@ use super::UPCALLS;
use mmtk::util::opaque_pointer::*;
use mmtk::vm::ActivePlan;
use mmtk::Mutator;
use mmtk::Plan;
use std::sync::Mutex;
use SINGLETON;
use V8;

pub struct VMActivePlan {}

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

fn is_mutator(tls: VMThread) -> bool {
unsafe { ((*UPCALLS).is_mutator)(tls) }
}
Expand Down
5 changes: 0 additions & 5 deletions mmtk/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,6 @@ pub extern "C" fn is_mapped_address(address: Address) -> bool {
memory_manager::is_mapped_address(address)
}

#[no_mangle]
pub extern "C" fn modify_check(mmtk: &mut MMTK<V8>, object: ObjectReference) {
memory_manager::modify_check(mmtk, object);
}

#[no_mangle]
pub extern "C" fn handle_user_collection_request(mmtk: &mut MMTK<V8>, tls: VMMutatorThread) {
memory_manager::handle_user_collection_request::<V8>(mmtk, tls);
Expand Down
1 change: 0 additions & 1 deletion v8/third_party/heap/mmtk/mmtk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ extern void post_alloc(MMTk_Mutator mutator, void* refer,
extern bool is_live_object(void* ref);
extern bool is_in_mmtk_spaces(void* ref);
extern bool is_mapped_address(void* addr);
extern void modify_check(void *mmtk, void* ref);
extern bool is_in_read_only_space(void* addr);
extern bool is_in_code_space(void* addr);

Expand Down
Loading