Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 4 deletions gc/mmtk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gc/mmtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ features = ["vo_bit", "object_pinning", "sticky_immix_non_moving_nursery"]

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

# Uncomment the following line to use mmtk-core from a local repository.
# path = "../../../mmtk-core"
Expand Down
10 changes: 10 additions & 0 deletions gc/mmtk/src/object_model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ impl VMObjectModel {
}

impl ObjectModel<Ruby> for VMObjectModel {
const GLOBAL_FIELD_UNLOG_BIT_SPEC: VMGlobalFieldUnlogBitSpec =
VMGlobalFieldUnlogBitSpec::side_first();
const GLOBAL_LOG_BIT_SPEC: VMGlobalLogBitSpec = VMGlobalLogBitSpec::side_first();

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

fn try_copy(
from: ObjectReference,
semantics: CopySemantics,
copy_context: &mut GCWorkerCopyContext<Ruby>,
) -> Option<ObjectReference> {
Some(Self::copy(from, semantics, copy_context))
}

fn copy_to(_from: ObjectReference, _to: ObjectReference, _region: Address) -> Address {
unimplemented!(
"This function cannot be called because we do not support MarkCompact for Ruby."
Expand Down
4 changes: 2 additions & 2 deletions gc/mmtk/src/scanning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ impl Scanning<Ruby> for VMScanning {
false
}

fn scan_object<EV: SlotVisitor<RubySlot>>(
fn scan_object(
_tls: VMWorkerThread,
_object: ObjectReference,
_slot_visitor: &mut EV,
_slot_visitor: &mut impl SlotVisitor<RubySlot>,
) {
unreachable!("We have not enabled slot enqueuing for any types, yet.");
}
Expand Down
Loading