diff options
| author | 2015-09-11 03:10:58 +0000 | |
|---|---|---|
| committer | 2015-09-11 03:10:58 +0000 | |
| commit | 1d76bfe710629a4f18bb79a9188f6eb4d9b2e4f4 (patch) | |
| tree | a0c0e31c19177d462fb3e3f46c4e93b948e9b340 | |
| parent | 92eaada6274d2da18f65069861013a4047a593e9 (diff) | |
| parent | 1a9735701d0826adbc9d68cd3762b78f96499cfb (diff) | |
Merge "ART: Narrow parameter types."
| -rw-r--r-- | runtime/dex_file_verifier.cc | 4 | ||||
| -rw-r--r-- | runtime/dex_file_verifier.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/dex_file_verifier.cc b/runtime/dex_file_verifier.cc index 2dd96aac8c..09416cc5c4 100644 --- a/runtime/dex_file_verifier.cc +++ b/runtime/dex_file_verifier.cc @@ -449,7 +449,7 @@ bool DexFileVerifier::CheckAndGetHandlerOffsets(const DexFile::CodeItem* code_it bool DexFileVerifier::CheckClassDataItemField(uint32_t idx, uint32_t access_flags, uint32_t class_access_flags, - uint32_t class_type_index, + uint16_t class_type_index, bool expect_static) { // Check for overflow. if (!CheckIndex(idx, header_->field_ids_size_, "class_data_item field_idx")) { @@ -487,7 +487,7 @@ bool DexFileVerifier::CheckClassDataItemField(uint32_t idx, bool DexFileVerifier::CheckClassDataItemMethod(uint32_t idx, uint32_t access_flags, uint32_t class_access_flags, - uint32_t class_type_index, + uint16_t class_type_index, uint32_t code_offset, std::unordered_set<uint32_t>* direct_method_indexes, bool expect_direct) { diff --git a/runtime/dex_file_verifier.h b/runtime/dex_file_verifier.h index c964b79439..4f15357ea0 100644 --- a/runtime/dex_file_verifier.h +++ b/runtime/dex_file_verifier.h @@ -60,12 +60,12 @@ class DexFileVerifier { bool CheckClassDataItemField(uint32_t idx, uint32_t access_flags, uint32_t class_access_flags, - uint32_t class_type_index, + uint16_t class_type_index, bool expect_static); bool CheckClassDataItemMethod(uint32_t idx, uint32_t access_flags, uint32_t class_access_flags, - uint32_t class_type_index, + uint16_t class_type_index, uint32_t code_offset, std::unordered_set<uint32_t>* direct_method_indexes, bool expect_direct); |