diff options
| author | Ian Rogers <irogers@google.com> | 2013-05-31 11:46:00 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-05-31 21:31:37 -0700 |
| commit | 637c65b1e431fd90195b71c141b3590bd81cc91a (patch) | |
| tree | 30097d990e442290bbb4ce94620390075b2dd624 /src/compiler/driver/compiler_driver.cc | |
| parent | 207bb6548f96636b40ee62124b37d2d82c3ddc6b (diff) | |
| download | android_art-637c65b1e431fd90195b71c141b3590bd81cc91a.tar.gz android_art-637c65b1e431fd90195b71c141b3590bd81cc91a.tar.bz2 android_art-637c65b1e431fd90195b71c141b3590bd81cc91a.zip | |
Verifier improvements.
Make type hierarchy for unresolved and unitialized types explicit.
Tidy and comment code.
Add DexFile::FindStringId that takes UTF-16 to avoid unnecessary UTF-8
conversions during image writing.
Explicitly disable RTTI that causes problems in debug builds.
Change-Id: I701f1c3be8be5854fcabf5ec39e9f9c5d388aab0
Diffstat (limited to 'src/compiler/driver/compiler_driver.cc')
| -rw-r--r-- | src/compiler/driver/compiler_driver.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/driver/compiler_driver.cc b/src/compiler/driver/compiler_driver.cc index 6feda1714d..aad77adb72 100644 --- a/src/compiler/driver/compiler_driver.cc +++ b/src/compiler/driver/compiler_driver.cc @@ -752,9 +752,8 @@ bool CompilerDriver::ComputeStaticFieldInfo(uint32_t field_idx, const DexCompila } // Search dex file for localized ssb index, may fail if field's class is a parent // of the class mentioned in the dex file and there is no dex cache entry. - std::string descriptor(FieldHelper(resolved_field).GetDeclaringClassDescriptor()); const DexFile::StringId* string_id = - mUnit->GetDexFile()->FindStringId(descriptor); + mUnit->GetDexFile()->FindStringId(FieldHelper(resolved_field).GetDeclaringClassDescriptor()); if (string_id != NULL) { const DexFile::TypeId* type_id = mUnit->GetDexFile()->FindTypeId(mUnit->GetDexFile()->GetIndexForStringId(*string_id)); |