summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-06-20 05:58:42 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-06-20 02:04:52 +0000
commit2d2d6bb1ff8692efdddf104dabfb4a2d39877ff6 (patch)
treec734d6325cea17e87c63d5f76e4bae4f06c55a91
parent6d90efa6a67a0de0dc6136874b3d9797c778e912 (diff)
parent4fdbba09cdb16840c675608730bcd056ef27cfd6 (diff)
downloadart-2d2d6bb1ff8692efdddf104dabfb4a2d39877ff6.zip
art-2d2d6bb1ff8692efdddf104dabfb4a2d39877ff6.tar.gz
art-2d2d6bb1ff8692efdddf104dabfb4a2d39877ff6.tar.bz2
Merge "ART: Do not try to pretty-print method in dex file"
-rw-r--r--runtime/dex_file.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc
index 3ff55ab..10f34d9 100644
--- a/runtime/dex_file.cc
+++ b/runtime/dex_file.cc
@@ -935,8 +935,7 @@ void ClassDataItemIterator::ReadClassDataField() {
field_.field_idx_delta_ = DecodeUnsignedLeb128(&ptr_pos_);
field_.access_flags_ = DecodeUnsignedLeb128(&ptr_pos_);
if (last_idx_ != 0 && field_.field_idx_delta_ == 0) {
- LOG(WARNING) << "Duplicate field " << PrettyField(GetMemberIndex(), dex_file_)
- << " in " << dex_file_.GetLocation();
+ LOG(WARNING) << "Duplicate field in " << dex_file_.GetLocation();
}
}
@@ -945,8 +944,7 @@ void ClassDataItemIterator::ReadClassDataMethod() {
method_.access_flags_ = DecodeUnsignedLeb128(&ptr_pos_);
method_.code_off_ = DecodeUnsignedLeb128(&ptr_pos_);
if (last_idx_ != 0 && method_.method_idx_delta_ == 0) {
- LOG(WARNING) << "Duplicate method " << PrettyMethod(GetMemberIndex(), dex_file_)
- << " in " << dex_file_.GetLocation();
+ LOG(WARNING) << "Duplicate method in " << dex_file_.GetLocation();
}
}