Merge "Fix class_def_idx increment for FastVerify"

1 files changed, 3 insertions, 4 deletions

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 1b809d232a..decb330f3b 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -1935,11 +1935,10 @@ bool CompilerDriver::FastVerify(jobject jclass_loader,
           // Just update the compiled_classes_ map. The compiler doesn't need to resolve
           // the type.
           ClassReference ref(dex_file, class_def_idx);
-          ClassStatus existing = ClassStatus::kNotReady;
-          DCHECK(compiled_classes_.Get(ref, &existing)) << ref.dex_file->GetLocation();
+          const ClassStatus existing = ClassStatus::kNotReady;
           ClassStateTable::InsertResult result =
              compiled_classes_.Insert(ref, existing, ClassStatus::kVerified);
-          CHECK_EQ(result, ClassStateTable::kInsertResultSuccess);
+          CHECK_EQ(result, ClassStateTable::kInsertResultSuccess) << ref.dex_file->GetLocation();
         } else {
           // Update the class status, so later compilation stages know they don't need to verify
           // the class.
@@ -1962,8 +1961,8 @@ bool CompilerDriver::FastVerify(jobject jclass_loader,
                             class_loader,
                             soa.Self());
       }
+      ++class_def_idx;
     }
-    ++class_def_idx;
   }
   return true;
 }