diff options
| author | 2017-09-15 11:59:26 -0700 | |
|---|---|---|
| committer | 2017-09-18 11:36:24 -0700 | |
| commit | e2abbc604ce003c776c00ecf1293796bb4c4ac5a (patch) | |
| tree | f7d124d1861cad2162c30dfe932bb4e1beaf41ef /runtime/class_linker.cc | |
| parent | 7090dfe84f78b1928fcbdfd664d0dd9ea52633ff (diff) | |
ART: Move kDexNoIndex to dex_file_types.h
Define the constant with the types to allow lowering the dependency
on DexFile.
Test: m
Change-Id: I3c61421db45be96d2057e01b1a7825883d8bd178
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 02183ef733..772f0420fd 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -2771,11 +2771,11 @@ uint32_t ClassLinker::SizeOfClassWithoutEmbeddedTables(const DexFile& dex_file, if (class_data != nullptr) { // We allow duplicate definitions of the same field in a class_data_item // but ignore the repeated indexes here, b/21868015. - uint32_t last_field_idx = DexFile::kDexNoIndex; + uint32_t last_field_idx = dex::kDexNoIndex; for (ClassDataItemIterator it(dex_file, class_data); it.HasNextStaticField(); it.Next()) { uint32_t field_idx = it.GetMemberIndex(); // Ordering enforced by DexFileVerifier. - DCHECK(last_field_idx == DexFile::kDexNoIndex || last_field_idx <= field_idx); + DCHECK(last_field_idx == dex::kDexNoIndex || last_field_idx <= field_idx); if (UNLIKELY(field_idx == last_field_idx)) { continue; } @@ -3164,7 +3164,7 @@ void ClassLinker::LoadClassMembers(Thread* self, it.NumDirectMethods(), it.NumVirtualMethods()); size_t class_def_method_index = 0; - uint32_t last_dex_method_index = DexFile::kDexNoIndex; + uint32_t last_dex_method_index = dex::kDexNoIndex; size_t last_class_def_method_index = 0; // TODO These should really use the iterators. for (size_t i = 0; it.HasNextDirectMethod(); i++, it.Next()) { |