From f1fbd5220551aeae1025a1058fd501ad41167425 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 15 Sep 2015 17:57:31 +0100 Subject: [PATCH] Rename parameter in ArtMethod::ToNativeQuickPc Addressing a nit for CL Idb2b34aabf1ac7249c30a00806af7d63d7e682dd. Change-Id: I1112312b90aa6123e7e9ca8f67132dd7cc57a62f --- runtime/art_method.cc | 10 +++++----- runtime/art_method.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/art_method.cc b/runtime/art_method.cc index 26839ece1..6044a2a33 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -224,7 +224,7 @@ uint32_t ArtMethod::ToDexPc(const uintptr_t pc, bool abort_on_failure) { } uintptr_t ArtMethod::ToNativeQuickPc(const uint32_t dex_pc, - bool is_catch_handler, + bool is_for_catch_handler, bool abort_on_failure) { const void* entry_point = GetQuickOatEntryPoint(sizeof(void*)); if (IsOptimized(sizeof(void*))) { @@ -234,11 +234,11 @@ uintptr_t ArtMethod::ToNativeQuickPc(const uint32_t dex_pc, StackMapEncoding encoding = code_info.ExtractEncoding(); // All stack maps are stored in the same CodeItem section, safepoint stack - // maps first, then catch stack maps. We use `is_catch_dex_pc` to select the - // order of iteration. + // maps first, then catch stack maps. We use `is_for_catch_handler` to select + // the order of iteration. StackMap stack_map = - LIKELY(is_catch_handler) ? code_info.GetCatchStackMapForDexPc(dex_pc, encoding) - : code_info.GetStackMapForDexPc(dex_pc, encoding); + LIKELY(is_for_catch_handler) ? code_info.GetCatchStackMapForDexPc(dex_pc, encoding) + : code_info.GetStackMapForDexPc(dex_pc, encoding); if (stack_map.IsValid()) { return reinterpret_cast(entry_point) + stack_map.GetNativePcOffset(encoding); } diff --git a/runtime/art_method.h b/runtime/art_method.h index 6c3b13f0e..9ee8ee69f 100644 --- a/runtime/art_method.h +++ b/runtime/art_method.h @@ -443,7 +443,7 @@ class ArtMethod FINAL { // Converts a dex PC to a native PC. uintptr_t ToNativeQuickPc(const uint32_t dex_pc, - bool is_catch_handler, + bool is_for_catch_handler, bool abort_on_failure = true) SHARED_REQUIRES(Locks::mutator_lock_); -- 2.11.0