From a5b09a67034e57a6e10231dd4bd92f4cb50b824c Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 17 Nov 2016 15:21:22 -0800 Subject: ART: Add dex::TypeIndex Add abstraction for uint16_t type index. Test: m test-art-host Change-Id: I47708741c7c579cbbe59ab723c1e31c5fe71f83a --- runtime/art_method.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/art_method.cc') diff --git a/runtime/art_method.cc b/runtime/art_method.cc index c550a1b6bd..1c8376637c 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -199,9 +199,9 @@ uint32_t ArtMethod::FindCatchBlock(Handle exception_type, // Iterate over the catch handlers associated with dex_pc. PointerSize pointer_size = Runtime::Current()->GetClassLinker()->GetImagePointerSize(); for (CatchHandlerIterator it(*code_item, dex_pc); it.HasNext(); it.Next()) { - uint16_t iter_type_idx = it.GetHandlerTypeIndex(); + dex::TypeIndex iter_type_idx = it.GetHandlerTypeIndex(); // Catch all case - if (iter_type_idx == DexFile::kDexNoIndex16) { + if (!iter_type_idx.IsValid()) { found_dex_pc = it.GetHandlerAddress(); break; } -- cgit v1.2.3-59-g8ed1b