Configurable mock vm - #1598
Draft
qinsoon wants to merge 11 commits into
Draft
Configurable mock vm#1598qinsoon wants to merge 11 commits into
qinsoon wants to merge 11 commits into
Conversation
Conflict resolution and fixes needed after the merge: - Adopt master's disable_collection()/enable_collection() API in place of the removed MockVM::is_collection_enabled. - Add GLOBAL_FIELD_UNLOG_BIT_SPEC to both mock metadata layouts, and keep the mark bit on the side in the header layout (required by LXR). - Make header metadata the default when mock_test_side_metadata is not set, so `--features mock_test` alone builds (used by ci-build.sh), and reject enabling both layouts. - Drop the mock-only side metadata base address; master computes it dynamically. - Run LXR mock tests with header metadata in ci-test.sh, as LXR requires in-header forwarding bits. - Port new master mock tests to this branch's MockVM: use fixture.mutator(), pass `force` to handle_user_collection_request, wrap mock_test_shutdown in with_mockvm, and stop the OOM-unwind test from spawning GC workers. - Use inspect_err now that MSRV is 1.84. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Merged
Master includes the squashed mock-vm-gc (mmtk#1408), which shares no history with this branch. Resolve the conflicts using fa4441d (where this branch forked from mock-vm-gc) as the base, so the result is master plus this branch's MockVMConfig change: - Take master's updated linear scan, thread_park, and the removal of mock_test_allocate_offset. - Keep this branch's CI scripts without the mock_test_*_metadata features. - vm.rs: keep the generic with_mockvm, and use ThreadPark::contains (renamed on master) with as_generic_mock_mutator. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR allows tests to create a custom
MockVMtype with different constant values through a macrodefine_mock_vm.Built on top of #1408. I will make this PR ready when #1408 is merged.