summaryrefslogtreecommitdiff
path: root/compiler/compiler.cc
diff options
context:
space:
mode:
author David Sehr <sehr@google.com> 2016-10-13 09:12:37 -0700
committer David Sehr <sehr@google.com> 2016-10-18 14:10:04 -0700
commit709b070044354d9f47641f273edacaeeb0240ab7 (patch)
tree3a8ac051d7c35076303984d0d892cdd396b60427 /compiler/compiler.cc
parent1a4de6a2453a3ad0310aca1a44e7e2d3b6f53bc1 (diff)
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
Diffstat (limited to 'compiler/compiler.cc')
-rw-r--r--compiler/compiler.cc4
1 files changed, 2 insertions, 2 deletions
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;