diff options
| author | Andreas Gampe <agampe@google.com> | 2015-10-29 04:02:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-29 04:02:22 +0000 |
| commit | deb2a896cad5bcd22bbe21c3b09fd8efa6ad1d13 (patch) | |
| tree | d2c5cefb419cd0f9bdad2bba939235fbe2c5fbfd /compiler/driver/compiler_driver.cc | |
| parent | 59a984e8e2dc3a4d5c220518f762ba9b1c0de44c (diff) | |
| parent | 594c0612519e96bcc1bd42ff4dcbfa2c53b09c5a (diff) | |
Merge "Revert "Enable store elimination for singleton objects.""
am: 594c061251
* commit '594c0612519e96bcc1bd42ff4dcbfa2c53b09c5a':
Revert "Enable store elimination for singleton objects."
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index fa3598e2918..8750aa8e4ef 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1247,8 +1247,7 @@ bool CompilerDriver::CanAccessTypeWithoutChecks(uint32_t referrer_idx, const Dex bool CompilerDriver::CanAccessInstantiableTypeWithoutChecks(uint32_t referrer_idx, const DexFile& dex_file, - uint32_t type_idx, - bool* finalizable) { + uint32_t type_idx) { ScopedObjectAccess soa(Thread::Current()); mirror::DexCache* dex_cache = Runtime::Current()->GetClassLinker()->FindDexCache( soa.Self(), dex_file, false); @@ -1256,11 +1255,8 @@ bool CompilerDriver::CanAccessInstantiableTypeWithoutChecks(uint32_t referrer_id mirror::Class* resolved_class = dex_cache->GetResolvedType(type_idx); if (resolved_class == nullptr) { stats_->TypeNeedsAccessCheck(); - // Be conservative. - *finalizable = true; return false; // Unknown class needs access checks. } - *finalizable = resolved_class->IsFinalizable(); const DexFile::MethodId& method_id = dex_file.GetMethodId(referrer_idx); mirror::Class* referrer_class = dex_cache->GetResolvedType(method_id.class_idx_); if (referrer_class == nullptr) { |