diff options
| author | 2019-01-07 13:01:19 +0000 | |
|---|---|---|
| committer | 2019-01-07 13:01:19 +0000 | |
| commit | 206ffa5db26d36290c2c88d46ba9abb7823dbbca (patch) | |
| tree | 03331e0a59723b8df36bf4cd2973a99f917149a2 | |
| parent | 1cc5dc8f0c990afeda0993dd088fc4c8432aa46f (diff) | |
| parent | f7f7a7c6d92cca99e2f856ac16916d7448019048 (diff) | |
Merge "ART: make RegionSpace::GetNextObject a static function"
| -rw-r--r-- | runtime/gc/space/region_space.cc | 2 | ||||
| -rw-r--r-- | runtime/gc/space/region_space.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/space/region_space.cc b/runtime/gc/space/region_space.cc index 07783bacfe..57e07027bb 100644 --- a/runtime/gc/space/region_space.cc +++ b/runtime/gc/space/region_space.cc @@ -616,7 +616,7 @@ void RegionSpace::PoisonDeadObjectsInUnevacuatedRegion(Region* r) { // Functor poisoning the space between `obj` and the previously // visited (live) object (or the beginng of the region), if any. - auto maybe_poison = [this, &prev_obj_end](mirror::Object* obj) REQUIRES(Locks::mutator_lock_) { + auto maybe_poison = [&prev_obj_end](mirror::Object* obj) REQUIRES(Locks::mutator_lock_) { DCHECK_ALIGNED(obj, kAlignment); uint8_t* cur_obj_begin = reinterpret_cast<uint8_t*>(obj); if (cur_obj_begin != prev_obj_end) { diff --git a/runtime/gc/space/region_space.h b/runtime/gc/space/region_space.h index 75c99ec964..a49b2aec70 100644 --- a/runtime/gc/space/region_space.h +++ b/runtime/gc/space/region_space.h @@ -674,7 +674,7 @@ class RegionSpace final : public ContinuousMemMapAllocSpace { // - the region containing `obj` is fully used; and // - `obj` is not the last object of that region; // the returned location is not guaranteed to be a valid object. - mirror::Object* GetNextObject(mirror::Object* obj) + static mirror::Object* GetNextObject(mirror::Object* obj) REQUIRES_SHARED(Locks::mutator_lock_); void AdjustNonFreeRegionLimit(size_t new_non_free_region_index) REQUIRES(region_lock_) { |