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

Jump to bottom

Rename ambiguous scan_thread_root{,s} functions #143

Merged
merged 4 commits into from
Jun 8, 2023
Merged

Rename ambiguous scan_thread_root{,s} functions #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
264bb2d
Rename ambiguous `scan_thread_root{,s}` functions
k-sareen Jun 7, 2023
1c10a59
cargo fmt
k-sareen Jun 7, 2023
f07a9af
cargo fmt
k-sareen Jun 7, 2023
522b8bd
Update Cargo.toml
wks Jun 7, 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
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 @@ -28,7 +28,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
# - change branch/rev
# - 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 = "2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0" }
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "f1a0bb7fbec97dd84e35a40e8be01cf5018f2f9e" }
# Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
# mmtk = { path = "../repos/mmtk-core" }

Expand Down
7 changes: 5 additions & 2 deletions mmtk/src/scanning.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,13 @@ extern "C" fn report_edges_and_renew_buffer<F: RootsWorkFactory<JikesRVMEdge>>(

impl Scanning<JikesRVM> for VMScanning {
const SINGLE_THREAD_MUTATOR_SCANNING: bool = false;
fn scan_thread_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory<JikesRVMEdge>) {
fn scan_roots_in_all_mutator_threads(
_tls: VMWorkerThread,
_factory: impl RootsWorkFactory<JikesRVMEdge>,
) {
unreachable!()
}
fn scan_thread_root(
fn scan_roots_in_mutator_thread(
tls: VMWorkerThread,
mutator: &'static mut Mutator<JikesRVM>,
mut factory: impl RootsWorkFactory<JikesRVMEdge>,
Expand Down