Skip to content

Commit 639cf1a

Browse files
qinsoonmmtkgc-bot
andauthored
Move to Rust 1.83 (#185)
This PR updates the pinned Rust version to 1.83, and updates mmtk-core to mmtk/mmtk-core#1253. --------- Co-authored-by: mmtkgc-bot <[email protected]>
1 parent 71d2a58 commit 639cf1a

File tree

7 files changed

+43
-48
lines changed

7 files changed

+43
-48
lines changed

mmtk/Cargo.lock

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
2929
# - change branch/rev
3030
# - change repo name
3131
# But other changes including adding/removing whitespaces in commented lines may break the CI.
32-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "c0f97884234b51b13c8ba5d1563a8e0f592d11c2" }
32+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ec745353a8de72b645613e0fef3ab7f5f1ad9bd1" }
3333
# Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
3434
# mmtk = { path = "../repos/mmtk-core" }
3535

@@ -40,3 +40,4 @@ nogc = []
4040
semispace = []
4141
marksweep = []
4242
malloc_marksweep = ["mmtk/malloc_mark_sweep"]
43+
binding_side_ref_proc = []

mmtk/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.77.0
1+
1.83.0

mmtk/src/api.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,6 @@ pub extern "C" fn total_bytes() -> usize {
154154
memory_manager::total_bytes(&SINGLETON)
155155
}
156156

157-
#[no_mangle]
158-
#[cfg(feature = "sanity")]
159-
pub extern "C" fn scan_region() {
160-
memory_manager::scan_region(&SINGLETON)
161-
}
162-
163157
#[no_mangle]
164158
pub extern "C" fn handle_user_collection_request(tls: VMMutatorThread) {
165159
memory_manager::handle_user_collection_request::<JikesRVM>(&SINGLETON, tls);

mmtk/src/jikesrvm_calls/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn prepare_mutator(tls: VMWorkerThread, mutator_tls: VMMutatorThread) {
3131
unsafe {
3232
// asm! is not smart enough to figure out VMMutatorThread has repr(transparent) and
3333
// therefore the same representation as a pointer.
34-
let mutator_tls_usize = std::mem::transmute::<_, usize>(mutator_tls);
34+
let mutator_tls_usize = std::mem::transmute::<VMMutatorThread, usize>(mutator_tls);
3535
jtoc_call!(PREPARE_MUTATOR_METHOD_OFFSET, tls, mutator_tls_usize);
3636
}
3737
}

mmtk/src/scan_boot_image.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ fn process_chunk(
9898
/* enqueue the specified slot or slots */
9999
debug_assert!(conversions::is_address_aligned(Address::from_usize(offset)));
100100
let mut slot: Address = image_start + offset;
101-
if cfg!(feature = "debug") {
101+
if cfg!(debug_assertions) {
102102
REFS.fetch_add(1, Ordering::Relaxed);
103103
}
104104

105105
if !FILTER || slot.load::<Address>() > map_end {
106-
if cfg!(feature = "debug") {
106+
if cfg!(debug_assertions) {
107107
ROOTS.fetch_add(1, Ordering::Relaxed);
108108
}
109109
report_slot(JikesRVMSlot::from_address(slot));
@@ -113,11 +113,11 @@ fn process_chunk(
113113
offset += BYTES_IN_ADDRESS;
114114
slot = image_start + offset;
115115
debug_assert!(conversions::is_address_aligned(slot));
116-
if cfg!(feature = "debug") {
116+
if cfg!(debug_assertions) {
117117
REFS.fetch_add(1, Ordering::Relaxed);
118118
}
119119
if !FILTER || slot.load::<Address>() > map_end {
120-
if cfg!(feature = "debug") {
120+
if cfg!(debug_assertions) {
121121
ROOTS.fetch_add(1, Ordering::Relaxed);
122122
}
123123
// TODO: check_reference(slot) ?

mmtk/src/tib_layout_constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ pub const TIB_FIRST_VIRTUAL_METHOD_INDEX: usize =
5353
* <li>fits into a PowerPC 16bit immediate operand</li>
5454
* </ul>
5555
*/
56-
pub const NEEDS_DYNAMIC_LINK: isize = i16::min_value() as isize + 1;
56+
pub const NEEDS_DYNAMIC_LINK: isize = i16::MIN as isize + 1;

0 commit comments

Comments
 (0)