Skip to content

Commit a1fc697

Browse files
authored
Always enable BasePlan spaces (#35)
* Always use default space allocator * Update mmtk * update mmtk * update mmtk-core
1 parent f1c0f31 commit a1fc697

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ log = "*"
2222
# - change branch
2323
# - change repo name
2424
# But other changes including adding/removing whitespaces in commented lines may break the CI.
25-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "4bd6ca82ad037dac97920bf3a1408e4912a6bf04" }
25+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "4813a2bfc5322c526dc56e9f8acb418dbb7ce7e6" }
2626
# Uncomment the following and fix the path to mmtk-core to build locally
2727
# mmtk = { path = "../repos/mmtk-core" }
2828

v8/third_party/heap/mmtk/mmtk.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@ AllocationResult Heap::Allocate(size_t size_in_bytes, AllocationType type, Alloc
121121
bool large_object = size_in_bytes > kMaxRegularHeapObjectSize;
122122
size_t align_bytes = (type == AllocationType::kCode) ? kCodeAlignment : (align == kWordAligned) ? kSystemPointerSize : (align == kDoubleAligned) ? kDoubleSize : kSystemPointerSize;
123123
// Get MMTk space that the object should be allocated to.
124-
int space = (type == AllocationType::kCode) ? 3 : (type == AllocationType::kReadOnly) ? 4 : (large_object) ? 2 : 0;
125124
Address result =
126-
reinterpret_cast<Address>(alloc(tph_mutator_, size_in_bytes, align_bytes, 0, space));
125+
reinterpret_cast<Address>(alloc(tph_mutator_, size_in_bytes, align_bytes, 0, 0));
127126
// Remember the V8 internal `AllocationSpace` for this object.
128127
// This is required to pass various V8 internal space checks.
129128
// TODO(wenyuzhao): Use MMTk's vm-specific spaces for allocation instead of remembering the `AllocationSpace`s.

0 commit comments

Comments
 (0)