diff options
| author | 2025-01-21 17:28:59 -0800 | |
|---|---|---|
| committer | 2025-01-21 17:28:59 -0800 | |
| commit | 766f7f779490aaea3619fad1ab1a60e4307a311d (patch) | |
| tree | c5918ebfaa7584ba5699d4f08335375508631309 /runtime/gc/heap.cc | |
| parent | ed5c1bbd7ee7c009f3730485e224cfcdf790f90c (diff) | |
| parent | 8bf7aa4a0cf7a4d9747db29b7875b87820a38e4a (diff) | |
Make CMC GC generational am: c682b8b029 am: 8bf7aa4a0c
Original change: https://android-review.googlesource.com/c/platform/art/+/3273551
Change-Id: I426dd6869ff2a6e392ed415a0fe2c2e0940d9c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'runtime/gc/heap.cc')
| -rw-r--r-- | runtime/gc/heap.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index 5ceeeb75af..5738a2f6aa 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -2568,6 +2568,9 @@ void Heap::PreZygoteFork() { region_space_->GetMarkBitmap()->Clear(); } else { bump_pointer_space_->GetMemMap()->Protect(PROT_READ | PROT_WRITE); + if (gUseUserfaultfd && use_generational_cc_) { + MarkCompactCollector()->ResetGenerationalState(); + } } } if (temp_space_ != nullptr) { |