1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/dex/verification_results.cc b/compiler/dex/verification_results.cc
index c1d5cb7213..6f2b2341e0 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;