commit 93bd3619de4616040d672a4ed3825976bed4bfce
author David Srbecky <dsrbecky@google.com> Mon Jul 02 19:30:18 2018 +0100
committer David Srbecky <dsrbecky@google.com> Wed Jul 04 14:23:12 2018 +0100
tree 2ab3424374ed3d316053ed8e9ec2d4b95ea2ef4d
parent f07d5617770c37d87447c8bddf105eb0469ab093

Use iterators to access stack map data.

Try to simplify the code using the recently added iterators.

Test: test-art-host-gtest-stack_map_test
Change-Id: I0b9f54df01749ee6ec3a67cfb07ba636a2489c89

runtime/quick_exception_handler.cc

diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc
index 8b99b9f..28fcd87 100644
--- a/runtime/quick_exception_handler.cc
+++ b/runtime/quick_exception_handler.cc
@@ -404,7 +404,7 @@
     uint32_t register_mask = code_info.GetRegisterMaskOf(stack_map);
     BitMemoryRegion stack_mask = code_info.GetStackMaskOf(stack_map);
     DexRegisterMap vreg_map = IsInInlinedFrame()
-        ? code_info.GetDexRegisterMapAtDepth(GetCurrentInliningDepth() - 1, stack_map)
+        ? code_info.GetInlineDexRegisterMapOf(stack_map, GetCurrentInlinedFrame())
         : code_info.GetDexRegisterMapOf(stack_map);
     if (vreg_map.empty()) {
       return;