summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2018-08-21 16:48:20 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-08-21 16:48:20 +0000
commit5c4b3cc8b167ff492e5ec6d414416b67c7dd501f (patch)
tree0cf8f2b2fa59bd34e404ae2040aec83c82750eab
parentc69199570ed834c99e36cf56fdc10e960b13236d (diff)
parenta29afd5e06bbc8bc444fe36e8607b132b5a50b49 (diff)
Merge "Remove special case for young-gen collection in ConcurrentCopying::IsMarked."
-rw-r--r--runtime/gc/collector/concurrent_copying.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc
index 2955b805c1..bff68819d3 100644
--- a/runtime/gc/collector/concurrent_copying.cc
+++ b/runtime/gc/collector/concurrent_copying.cc
@@ -2697,10 +2697,6 @@ mirror::Object* ConcurrentCopying::IsMarked(mirror::Object* from_ref) {
// At this point, `from_ref` should not be in the region space
// (i.e. within an "unused" region).
DCHECK(!region_space_->HasAddress(from_ref)) << from_ref;
- if (kEnableGenerationalConcurrentCopyingCollection && young_gen_) {
- // Only sweeps the from space.
- return from_ref;
- }
// from_ref is in a non-moving space.
if (immune_spaces_.ContainsObject(from_ref)) {
// An immune object is alive.