From 709b070044354d9f47641f273edacaeeb0240ab7 Mon Sep 17 00:00:00 2001 From: David Sehr Date: Thu, 13 Oct 2016 09:12:37 -0700 Subject: Remove mirror:: and ArtMethod deps in utils.{h,cc} The latest chapter in the ongoing saga of attempting to dump a DEX file without having to start a whole runtime instance. This episode finds us removing references to ArtMethod/ArtField/mirror. One aspect of this change that I would like to call out specfically is that the utils versions of the "Pretty*" functions all were written to accept nullptr as an argument. I have split these functions up as follows: 1) an instance method, such as PrettyClass that obviously requires this != nullptr. 2) a static method, that behaves the same way as the util method, but calls the instance method if p != nullptr. This requires using a full class qualifier for the static methods, which isn't exactly beautiful. I have tried to remove as many cases as possible where it was clear p != nullptr. Bug: 22322814 Test: test-art-host Change-Id: I21adee3614aa697aa580cd1b86b72d9206e1cb24 --- compiler/compiler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/compiler.cc') diff --git a/compiler/compiler.cc b/compiler/compiler.cc index 16263177d8..c500921ab3 100644 --- a/compiler/compiler.cc +++ b/compiler/compiler.cc @@ -47,12 +47,12 @@ bool Compiler::IsPathologicalCase(const DexFile::CodeItem& code_item, if (code_item.insns_size_in_code_units_ >= UINT16_MAX / 4) { LOG(INFO) << "Method exceeds compiler instruction limit: " << code_item.insns_size_in_code_units_ - << " in " << PrettyMethod(method_idx, dex_file); + << " in " << dex_file.PrettyMethod(method_idx); return true; } if (code_item.registers_size_ >= UINT16_MAX / 4) { LOG(INFO) << "Method exceeds compiler virtual register limit: " - << code_item.registers_size_ << " in " << PrettyMethod(method_idx, dex_file); + << code_item.registers_size_ << " in " << dex_file.PrettyMethod(method_idx); return true; } return false; -- cgit v1.2.3-59-g8ed1b