Skip to content

Commit 21a3c45

Browse files
authored
Update to mmtk-core PR #838 (#221)
This PR updates mmtk-core to mmtk/mmtk-core#838.
1 parent 52680f9 commit 21a3c45

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

mmtk/Cargo.lock

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

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ once_cell = "1.10.0"
3030
# - change branch
3131
# - change repo name
3232
# But other changes including adding/removing whitespaces in commented lines may break the CI.
33-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "de8bbfe623eee5e915f32870de8f81128df8ad41" }
33+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0" }
3434
# Uncomment the following to build locally
3535
# mmtk = { path = "../repos/mmtk-core" }
3636

mmtk/src/api.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub extern "C" fn alloc(
129129
mutator: *mut Mutator<OpenJDK>,
130130
size: usize,
131131
align: usize,
132-
offset: isize,
132+
offset: usize,
133133
allocator: AllocationSemantics,
134134
) -> Address {
135135
memory_manager::alloc::<OpenJDK>(unsafe { &mut *mutator }, size, align, offset, allocator)

mmtk/src/object_model.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
7272
::std::mem::size_of::<usize>()
7373
}
7474

75-
fn get_align_offset_when_copied(_object: ObjectReference) -> isize {
75+
fn get_align_offset_when_copied(_object: ObjectReference) -> usize {
7676
0
7777
}
7878

openjdk/mmtk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern void* alloc_slow_largeobject(MMTk_Mutator mutator, size_t size,
4444
size_t align, size_t offset);
4545

4646
extern void post_alloc(MMTk_Mutator mutator, void* refer,
47-
int bytes, int allocator);
47+
size_t bytes, int allocator);
4848

4949
/// Full pre-barrier
5050
extern void mmtk_object_reference_write_pre(MMTk_Mutator mutator, void* src, void* slot, void* target);

0 commit comments

Comments
 (0)