diff options
| author | Ian Rogers <irogers@google.com> | 2013-10-30 17:17:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-30 17:17:11 +0000 |
| commit | 7195dd860e424057bd9a17d501269d9b50673f11 (patch) | |
| tree | 3e656d8b35f6f74b2e4fbc398c1834a96bb6b73d /compiler/image_writer.cc | |
| parent | 9728f91a63016136261231ff5213bde703bd27b6 (diff) | |
| parent | dfb325e0ddd746cd8f7c2e3723b3a573eb7cc111 (diff) | |
| download | art-7195dd860e424057bd9a17d501269d9b50673f11.zip art-7195dd860e424057bd9a17d501269d9b50673f11.tar.gz art-7195dd860e424057bd9a17d501269d9b50673f11.tar.bz2 | |
Merge "Don't use UTF16 length as length for MUTF8." into dalvik-dev
Diffstat (limited to 'compiler/image_writer.cc')
| -rw-r--r-- | compiler/image_writer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc index 684cb01..af60a38 100644 --- a/compiler/image_writer.cc +++ b/compiler/image_writer.cc @@ -249,7 +249,7 @@ void ImageWriter::ComputeEagerResolvedStrings() } bool ImageWriter::IsImageClass(const Class* klass) { - return compiler_driver_.IsImageClass(ClassHelper(klass).GetDescriptorAsStringPiece()); + return compiler_driver_.IsImageClass(ClassHelper(klass).GetDescriptor()); } struct NonImageClasses { @@ -304,7 +304,7 @@ void ImageWriter::PruneNonImageClasses() { bool ImageWriter::NonImageClassesVisitor(Class* klass, void* arg) { NonImageClasses* context = reinterpret_cast<NonImageClasses*>(arg); if (!context->image_writer->IsImageClass(klass)) { - context->non_image_classes->insert(ClassHelper(klass).GetDescriptorAsStringPiece().as_string()); + context->non_image_classes->insert(ClassHelper(klass).GetDescriptor()); } return true; } |