Merge "ART: Resolve all classes even when verify-profile" into nyc-dev am: 6d1b247

am: 8d96e03

* commit '8d96e0389a11e60c4ab8fb09d80dc66e4fcccc05':
  ART: Resolve all classes even when verify-profile

Change-Id: I8693decc9b801d3c9f47153745ded1fa1f7d10ea

1 files changed, 1 insertions, 3 deletions

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index d29d528c27..5bfd5f3189 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -833,12 +833,10 @@ void CompilerDriver::PreCompile(jobject class_loader,
 
   const bool verification_enabled = compiler_options_->IsVerificationEnabled();
   const bool never_verify = compiler_options_->NeverVerify();
-  const bool verify_only_profile = compiler_options_->VerifyOnlyProfile();
 
   // We need to resolve for never_verify since it needs to run dex to dex to add the
   // RETURN_VOID_NO_BARRIER.
-  // Let the verifier resolve as needed for the verify_only_profile case.
-  if ((never_verify || verification_enabled) && !verify_only_profile) {
+  if (never_verify || verification_enabled) {
     Resolve(class_loader, dex_files, timings);
     VLOG(compiler) << "Resolve: " << GetMemoryUsageString(false);
   }