commit | 8118781ebc9659f806716c451bdb3fe9b77ae32b | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Wed Jul 15 14:24:07 2015 -0700 |
committer | Mathieu Chartier <mathieuc@google.com> | Wed Jul 15 14:57:37 2015 -0700 |
tree | 47d9e968946dabe4099c5e1af506e1bcd6eaee58 | |
parent | e5abf0702555f9f4284a96e923f5c331561974e4 [diff] [blame] |
Address some GC comments Follow-up from: https://android-review.googlesource.com/#/c/159650/ Change-Id: Id14f29b4ce5b70b63fcb3e74f8503ae60a3ae444
diff --git a/runtime/gc/collector/mark_compact.cc b/runtime/gc/collector/mark_compact.cc index 65e6b40..0623fd4 100644 --- a/runtime/gc/collector/mark_compact.cc +++ b/runtime/gc/collector/mark_compact.cc
@@ -142,7 +142,7 @@ inline mirror::Object* MarkCompact::MarkObject(mirror::Object* obj) { if (obj == nullptr) { - return obj; + return nullptr; } if (kUseBakerOrBrooksReadBarrier) { // Verify all the objects have the correct forward pointer installed.