Skip to content

Commit 12c7ede

Browse files
committed
Bump mmtk-core
Fixes a bug where there is an infinite loop when MMTK_HEAP_MIN is small.
1 parent a725b95 commit 12c7ede

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

gc/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.

gc/mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ features = ["is_mmtk_object", "object_pinning", "sticky_immix_non_moving_nursery
2626

2727
# Uncomment the following lines to use mmtk-core from the official repository.
2828
git = "https://github.com/mmtk/mmtk-core.git"
29-
rev = "c61e6c84f97ddb91e47d76914af2f7e462f1c7f8"
29+
rev = "051bc7470feef915c445305301e6113f86d3957b"
3030

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

test/mmtk/test_configuration.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ def test_MMTK_HEAP_MIN
3434
assert_equal(1 * 1024 * 1024, GC.config[:mmtk_heap_min])
3535
RUBY
3636

37-
# TODO: uncomment this test when the infinite loop is fixed
38-
# assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "1" }], <<~RUBY)
39-
# assert_equal(1, GC.config[:mmtk_heap_min])
40-
# RUBY
37+
assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "1" }], <<~RUBY)
38+
assert_equal(1, GC.config[:mmtk_heap_min])
39+
RUBY
4140

4241
assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "10MiB", "MMTK_HEAP_MAX" => "1GiB" }], <<~RUBY)
4342
assert_equal(10 * 1024 * 1024, GC.config[:mmtk_heap_min])

0 commit comments

Comments
 (0)