diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-09-17 13:48:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 13:48:44 -0700 |
| commit | 613eae4a6f75282c0737a84850418afcab54d4e8 (patch) | |
| tree | 89e12ae679125df6cf83c9add1eb54e5a0ff8eb4 /runtime/runtime.cc | |
| parent | 2cedd474625e464b37b7e86e08ad06231e5fb148 (diff) | |
| parent | 7def68e29cd4dc3e5e3d76b2ba5ee175871aff7e (diff) | |
| download | art-613eae4a6f75282c0737a84850418afcab54d4e8.zip art-613eae4a6f75282c0737a84850418afcab54d4e8.tar.gz art-613eae4a6f75282c0737a84850418afcab54d4e8.tar.bz2 | |
am 7def68e2: am c4621985: Fix race in root marking.
* commit '7def68e29cd4dc3e5e3d76b2ba5ee175871aff7e':
Fix race in root marking.
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 09cbd0b..70a4df5 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) { |