diff options
| author | Andreas Gampe <agampe@google.com> | 2015-06-26 03:16:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 03:16:11 +0000 |
| commit | 5597b422882a5ab9dc5eaaedd644e30bc2fd7c05 (patch) | |
| tree | 83a1c4a9d9cb17c466883222f026967b95b7ba76 /compiler | |
| parent | ad805685621cd6cd8a8144f7f83a69fd1fc171e5 (diff) | |
| parent | 88802ca3587f808fb56d759fe3a85adb0f943234 (diff) | |
| download | art-5597b422882a5ab9dc5eaaedd644e30bc2fd7c05.zip art-5597b422882a5ab9dc5eaaedd644e30bc2fd7c05.tar.gz art-5597b422882a5ab9dc5eaaedd644e30bc2fd7c05.tar.bz2 | |
Merge "ART: Fix kEverything compiler filter" into mnc-dev
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/verification_results.cc | 5 | ||||
| -rw-r--r-- | compiler/driver/compiler_options.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler/dex/verification_results.cc b/compiler/dex/verification_results.cc index c1d5cb7..6f2b234 100644 --- a/compiler/dex/verification_results.cc +++ b/compiler/dex/verification_results.cc @@ -110,8 +110,9 @@ bool VerificationResults::IsCandidateForCompilation(MethodReference&, if (!compiler_options_->IsCompilationEnabled()) { return false; } - // Don't compile class initializers, ever. - if (((access_flags & kAccConstructor) != 0) && ((access_flags & kAccStatic) != 0)) { + // Don't compile class initializers unless kEverything. + if ((compiler_options_->GetCompilerFilter() != CompilerOptions::kEverything) && + ((access_flags & kAccConstructor) != 0) && ((access_flags & kAccStatic) != 0)) { return false; } return true; diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index 356663b..fe681e2 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -37,7 +37,7 @@ class CompilerOptions FINAL { kSpace, // Maximize space savings. kBalanced, // Try to get the best performance return on compilation investment. kSpeed, // Maximize runtime performance. - kEverything, // Force compilation (Note: excludes compilation of class initializers). + kEverything, // Force compilation of everything capable of being compiled. kTime, // Compile methods, but minimize compilation time. }; |