diff options
| author | Andreas Gampe <agampe@google.com> | 2014-05-27 14:43:03 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-05-27 14:43:03 -0700 |
| commit | e0099d4d4839cabfb26270a746580e9d4ec3a6c6 (patch) | |
| tree | 2bf62c25620ddb27c2b5288b2ce1b673da561747 /compiler/driver/compiler_driver.cc | |
| parent | e3b5cb502371aff7e7b7291facfc27b092e7803e (diff) | |
| download | art-e0099d4d4839cabfb26270a746580e9d4ec3a6c6.zip art-e0099d4d4839cabfb26270a746580e9d4ec3a6c6.tar.gz art-e0099d4d4839cabfb26270a746580e9d4ec3a6c6.tar.bz2 | |
ART: Fix sharpening across dex files
Bug: 15196336
Change-Id: If4301bcddce0ddbc60bb33403e4a76eed35bcb2f
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 3304561..8d4e283 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1135,7 +1135,7 @@ void CompilerDriver::GetCodeAndMethodForDirectCall(InvokeType* type, InvokeType if (dex_method_idx != DexFile::kDexNoIndex) { target_method->dex_method_index = dex_method_idx; } else { - if (compiling_boot) { + if (compiling_boot && !use_dex_cache) { target_method->dex_method_index = method->GetDexMethodIndex(); target_method->dex_file = method->GetDeclaringClass()->GetDexCache()->GetDexFile(); } |