diff options
| author | 2018-03-08 21:34:46 +0000 | |
|---|---|---|
| committer | 2018-03-08 21:34:46 +0000 | |
| commit | cedad4bd452f800ada0be930e801cd921319cd11 (patch) | |
| tree | 3c505133b2ed491f19c9623a53edd4ddd3af3ac4 /runtime/oat_file_assistant.cc | |
| parent | df29be4d63c4187a7eb35b8f473ad9fad1fc439a (diff) | |
| parent | 470eaec8a9c807234f198a22a6b41e6ba80c4c08 (diff) | |
Merge "ART: Add to comments" into pi-dev
Diffstat (limited to 'runtime/oat_file_assistant.cc')
| -rw-r--r-- | runtime/oat_file_assistant.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index c5569ff909..c96d8258f2 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -1263,10 +1263,14 @@ std::unique_ptr<OatFile> OatFileAssistant::OatFileInfo::ReleaseFileForUse() { switch (Status()) { case kOatBootImageOutOfDate: + // OutOfDate may be either a mismatched image, or a missing image. if (oat_file_assistant_->HasOriginalDexFiles()) { - // If there are original dex files, it is better to use them. + // If there are original dex files, it is better to use them (to avoid a potential + // quickening mismatch because the boot image changed). break; } + // If we do not accept the oat file, we may not have access to dex bytecode at all. Grudgingly + // go forward. FALLTHROUGH_INTENDED; case kOatRelocationOutOfDate: |