diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-02-25 12:52:34 -0800 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2015-02-25 17:39:52 -0800 |
| commit | 3e781622a67e6d83e76e1bf765e9d84b3c718dc9 (patch) | |
| tree | 5778d415d415ca90c0f3a7504b351bdbac4d5890 /runtime/verifier | |
| parent | 4f9bbe2a654165aedab62041101ae41d54c04e39 (diff) | |
| download | art-3e781622a67e6d83e76e1bf765e9d84b3c718dc9.zip art-3e781622a67e6d83e76e1bf765e9d84b3c718dc9.tar.gz art-3e781622a67e6d83e76e1bf765e9d84b3c718dc9.tar.bz2 | |
Fix method_verifier_test with the SS collector.
Rename art_default_gc_type to ART_DEFAULT_GC_TYPE.
Bug: 19514492
Change-Id: I3c7920e7a84327c5908462e51e21199b89fb187d
Diffstat (limited to 'runtime/verifier')
| -rw-r--r-- | runtime/verifier/reg_type_cache.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/verifier/reg_type_cache.cc b/runtime/verifier/reg_type_cache.cc index 1dfbe51..c248565 100644 --- a/runtime/verifier/reg_type_cache.cc +++ b/runtime/verifier/reg_type_cache.cc @@ -580,8 +580,9 @@ void RegTypeCache::VisitStaticRoots(RootCallback* callback, void* arg) { } void RegTypeCache::VisitRoots(RootCallback* callback, void* arg) { - for (const RegType* entry : entries_) { - entry->VisitRoots(callback, arg); + // Exclude the static roots that are visited by VisitStaticRoots(). + for (size_t i = primitive_count_; i < entries_.size(); ++i) { + entries_[i]->VisitRoots(callback, arg); } } |