diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-03-14 17:16:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-14 17:16:15 +0000 |
| commit | 0dea9872082bc3e576ed6cefed86b0d6c0c45ffd (patch) | |
| tree | b4809584363705a640b8a4d5c87f9fa2af59c41e /runtime/gc/collector/mark_sweep.cc | |
| parent | 282cbe489046face5475991aaa1ecb5f1deba107 (diff) | |
| parent | 8fa2dad7fe7909c8335101d6c8904ae997cdf29f (diff) | |
| download | android_art-0dea9872082bc3e576ed6cefed86b0d6c0c45ffd.tar.gz android_art-0dea9872082bc3e576ed6cefed86b0d6c0c45ffd.tar.bz2 android_art-0dea9872082bc3e576ed6cefed86b0d6c0c45ffd.zip | |
Merge "Refactor reference code into mirror namespace."
Diffstat (limited to 'runtime/gc/collector/mark_sweep.cc')
| -rw-r--r-- | runtime/gc/collector/mark_sweep.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc index 8b9f60efb2..4f3ad32546 100644 --- a/runtime/gc/collector/mark_sweep.cc +++ b/runtime/gc/collector/mark_sweep.cc @@ -44,6 +44,7 @@ #include "mirror/class-inl.h" #include "mirror/class_loader.h" #include "mirror/dex_cache.h" +#include "mirror/reference-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array.h" #include "mirror/object_array-inl.h" @@ -1189,9 +1190,7 @@ void MarkSweep::SweepLargeObjects(bool swap_bitmaps) { // the heap for later processing. void MarkSweep::DelayReferenceReferent(mirror::Class* klass, Object* obj) { DCHECK(klass != nullptr); - DCHECK(klass->IsReferenceClass()); - DCHECK(obj != NULL); - heap_->DelayReferenceReferent(klass, obj, IsMarkedCallback, this); + heap_->DelayReferenceReferent(klass, obj->AsReference(), IsMarkedCallback, this); } class MarkObjectVisitor { |