diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-17 02:29:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-17 02:29:32 +0000 |
| commit | b3f18cf7466f85e15c6b7f005f544867a4d6847a (patch) | |
| tree | 62035f08dc38038b74c9796118ae0bab0e7608fb /oatdump | |
| parent | cb142101f29a4f1e097f03a220db3da6d4bd679f (diff) | |
| parent | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (diff) | |
| download | art-b3f18cf7466f85e15c6b7f005f544867a4d6847a.zip art-b3f18cf7466f85e15c6b7f005f544867a4d6847a.tar.gz art-b3f18cf7466f85e15c6b7f005f544867a4d6847a.tar.bz2 | |
Merge "Make ART compile with GCC -O0 again."
Diffstat (limited to 'oatdump')
| -rw-r--r-- | oatdump/oatdump.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index 2649ab7..14accac 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -396,8 +396,13 @@ class OatDumper { os << "INSTRUCTION SET:\n"; os << oat_header.GetInstructionSet() << "\n\n"; - os << "INSTRUCTION SET FEATURES:\n"; - os << oat_header.GetInstructionSetFeatures().GetFeatureString() << "\n\n"; + { + std::unique_ptr<const InstructionSetFeatures> features( + InstructionSetFeatures::FromBitmap(oat_header.GetInstructionSet(), + oat_header.GetInstructionSetFeaturesBitmap())); + os << "INSTRUCTION SET FEATURES:\n"; + os << features->GetFeatureString() << "\n\n"; + } os << "DEX FILE COUNT:\n"; os << oat_header.GetDexFileCount() << "\n\n"; @@ -1493,7 +1498,7 @@ class ImageDumper { const void* GetQuickOatCodeBegin(mirror::ArtMethod* m) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { const void* quick_code = m->GetEntryPointFromQuickCompiledCode(); - if (quick_code == Runtime::Current()->GetClassLinker()->GetQuickResolutionTrampoline()) { + if (Runtime::Current()->GetClassLinker()->IsQuickResolutionStub(quick_code)) { quick_code = oat_dumper_->GetQuickOatCode(m); } if (oat_dumper_->GetInstructionSet() == kThumb2) { |