Skip to content

Commit 47ecd93

Browse files
authored
Merge pull request #109 from ruby/bump-mmtk-0fc014f
Bump mmtk-core
2 parents f6b8b0d + 3926721 commit 47ecd93

4 files changed

Lines changed: 17 additions & 7 deletions

File tree

‎gc/mmtk/Cargo.lock‎

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

‎gc/mmtk/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ features = ["vo_bit", "object_pinning", "sticky_immix_non_moving_nursery"]
2525

2626
# Uncomment the following lines to use mmtk-core from the official repository.
2727
git = "https://github.com/mmtk/mmtk-core.git"
28-
rev = "8f806d56469c1c706fd1f88b757c33620bae85ba"
28+
rev = "0fc014f8d05db7fcb6f49ebe20ddd43a3fe2abdf"
2929

3030
# Uncomment the following line to use mmtk-core from a local repository.
3131
# path = "../../../mmtk-core"

‎gc/mmtk/src/object_model.rs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ impl VMObjectModel {
1919
}
2020

2121
impl ObjectModel<Ruby> for VMObjectModel {
22+
const GLOBAL_FIELD_UNLOG_BIT_SPEC: VMGlobalFieldUnlogBitSpec =
23+
VMGlobalFieldUnlogBitSpec::side_first();
2224
const GLOBAL_LOG_BIT_SPEC: VMGlobalLogBitSpec = VMGlobalLogBitSpec::side_first();
2325

2426
// We overwrite the prepended word which were used to hold object sizes.
@@ -78,6 +80,14 @@ impl ObjectModel<Ruby> for VMObjectModel {
7880
to_obj
7981
}
8082

83+
fn try_copy(
84+
from: ObjectReference,
85+
semantics: CopySemantics,
86+
copy_context: &mut GCWorkerCopyContext<Ruby>,
87+
) -> Option<ObjectReference> {
88+
Some(Self::copy(from, semantics, copy_context))
89+
}
90+
8191
fn copy_to(_from: ObjectReference, _to: ObjectReference, _region: Address) -> Address {
8292
unimplemented!(
8393
"This function cannot be called because we do not support MarkCompact for Ruby."

‎gc/mmtk/src/scanning.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ impl Scanning<Ruby> for VMScanning {
2525
false
2626
}
2727

28-
fn scan_object<EV: SlotVisitor<RubySlot>>(
28+
fn scan_object(
2929
_tls: VMWorkerThread,
3030
_object: ObjectReference,
31-
_slot_visitor: &mut EV,
31+
_slot_visitor: &mut impl SlotVisitor<RubySlot>,
3232
) {
3333
unreachable!("We have not enabled slot enqueuing for any types, yet.");
3434
}

0 commit comments

Comments
 (0)