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

Update to mmtk-core PR #1205 (backport #177) #178

Open
wants to merge 1 commit into
base: v1.9.2+RAI
Choose a base branch
from
Open

Update to mmtk-core PR #1205 (backport #177) #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 0 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.

4 changes: 4 additions & 0 deletions mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ lazy_static = "1.1"
# - change branch
# - change repo name
# But other changes including adding/removing whitespaces in commented lines may break the CI
<<<<<<< HEAD
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "73be50d1fce1c2f6559ffbc5b7a04623ba62e6c4" }
=======
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "de10fa4c3bc0a2a5010b9ce04a540c63b14dc214" }
>>>>>>> 5d07e8f (Update to mmtk-core PR #1205 (#177))
# Uncomment the following to build locally
# mmtk = { path = "../../mmtk-core" }
log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }
Expand Down
2 changes: 1 addition & 1 deletion mmtk/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ pub extern "C" fn mmtk_handle_user_collection_request(tls: VMMutatorThread, coll
// incremental
2 => SINGLETON.handle_user_collection_request(tls, false, false),
_ => unreachable!(),
}
};
}

#[no_mangle]
Expand Down
Loading