diff options
| author | 2016-10-03 08:46:48 +0000 | |
|---|---|---|
| committer | 2016-10-04 17:51:46 +0100 | |
| commit | aad75c6d5bfab2dc8e30fc99fafe8cd2dc8b74d8 (patch) | |
| tree | c1b9e1eabcf35c5cbb5b4f46313a4e062f2d5d51 /runtime/class_table-inl.h | |
| parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) | |
Revert "Revert "Store resolved Strings for AOT code in .bss.""
Fixed oat_test to keep dex files alive. Fixed mips build.
Rewritten the .bss GC root visiting and added write barrier
to the artResolveStringFromCode().
Test: build aosp_mips-eng
Test: m ART_DEFAULT_GC_TYPE=SS test-art-target-host-gtest-oat_test
Test: Run ART test suite on host and Nexus 9.
Bug: 20323084
Bug: 30627598
This reverts commit 5f926055cb88089d8ca27243f35a9dfd89d981f0.
Change-Id: I07fa2278d82b8eb64964c9a4b66cb93726ccda6b
Diffstat (limited to 'runtime/class_table-inl.h')
| -rw-r--r-- | runtime/class_table-inl.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/runtime/class_table-inl.h b/runtime/class_table-inl.h index d52365df6d..3e54a647dc 100644 --- a/runtime/class_table-inl.h +++ b/runtime/class_table-inl.h @@ -18,6 +18,7 @@ #define ART_RUNTIME_CLASS_TABLE_INL_H_ #include "class_table.h" +#include "oat_file.h" namespace art { @@ -32,6 +33,11 @@ void ClassTable::VisitRoots(Visitor& visitor) { for (GcRoot<mirror::Object>& root : strong_roots_) { visitor.VisitRoot(root.AddressWithoutBarrier()); } + for (const OatFile* oat_file : oat_files_) { + for (GcRoot<mirror::Object>& root : oat_file->GetBssGcRoots()) { + visitor.VisitRootIfNonNull(root.AddressWithoutBarrier()); + } + } } template<class Visitor> @@ -45,6 +51,11 @@ void ClassTable::VisitRoots(const Visitor& visitor) { for (GcRoot<mirror::Object>& root : strong_roots_) { visitor.VisitRoot(root.AddressWithoutBarrier()); } + for (const OatFile* oat_file : oat_files_) { + for (GcRoot<mirror::Object>& root : oat_file->GetBssGcRoots()) { + visitor.VisitRootIfNonNull(root.AddressWithoutBarrier()); + } + } } template <typename Visitor> |