diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-09-17 14:18:21 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-09-17 14:18:21 -0700 |
| commit | b307052d619ec757478951fc026e6230c92e3b36 (patch) | |
| tree | 7fee60cf62ec02fab20f70f111b5925be8a772fa /runtime/runtime.cc | |
| parent | cb135ad769a5368f6ceb8caf25105a95580cbd6a (diff) | |
| parent | 613eae4a6f75282c0737a84850418afcab54d4e8 (diff) | |
| download | art-b307052d619ec757478951fc026e6230c92e3b36.zip art-b307052d619ec757478951fc026e6230c92e3b36.tar.gz art-b307052d619ec757478951fc026e6230c92e3b36.tar.bz2 | |
resolved conflicts for merge of 613eae4a to dalvik-dev
Change-Id: I61734cbf585decf9a50ba23f008b341d025339ff
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 477fcaf..02ed59f 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1132,12 +1132,8 @@ void Runtime::DetachCurrentThread() { void Runtime::VisitConcurrentRoots(RootVisitor* visitor, void* arg, bool only_dirty, bool clean_dirty) { - if (!only_dirty || intern_table_->IsDirty()) { - intern_table_->VisitRoots(visitor, arg, clean_dirty); - } - if (!only_dirty || class_linker_->IsDirty()) { - class_linker_->VisitRoots(visitor, arg, clean_dirty); - } + intern_table_->VisitRoots(visitor, arg, only_dirty, clean_dirty); + class_linker_->VisitRoots(visitor, arg, only_dirty, clean_dirty); } void Runtime::VisitNonThreadRoots(RootVisitor* visitor, void* arg) { |