From 72f7b880d5d0057b9fac3a51ef3a0f22909bc633 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 15 Sep 2015 17:00:52 +0100 Subject: ART: Fix 004-ReferenceMap run test This patch adds a new option to ArtMethod::ToNativeQuickPc to select the order of iteration over stack maps. The method is only used by the runtime to find native_pc of catch blocks, but also by the 004-ReferenceMap test which uses it to find native_pc of a safepoint. Change-Id: Idb2b34aabf1ac7249c30a00806af7d63d7e682dd --- runtime/exception_test.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'runtime/exception_test.cc') diff --git a/runtime/exception_test.cc b/runtime/exception_test.cc index 33d756ea12..9f84bd2a39 100644 --- a/runtime/exception_test.cc +++ b/runtime/exception_test.cc @@ -186,13 +186,15 @@ TEST_F(ExceptionTest, StackTraceElement) { fake_stack.push_back(0); } - fake_stack.push_back(method_g_->ToNativeQuickPc(dex_pc)); // return pc + fake_stack.push_back( + method_g_->ToNativeQuickPc(dex_pc, /* is_catch_handler */ false)); // return pc // Create/push fake 16byte stack frame for method g fake_stack.push_back(reinterpret_cast(method_g_)); fake_stack.push_back(0); fake_stack.push_back(0); - fake_stack.push_back(method_f_->ToNativeQuickPc(dex_pc)); // return pc + fake_stack.push_back( + method_g_->ToNativeQuickPc(dex_pc, /* is_catch_handler */ false)); // return pc // Create/push fake 16byte stack frame for method f fake_stack.push_back(reinterpret_cast(method_f_)); -- cgit v1.2.3-59-g8ed1b