Fix class_def_idx increment for FastVerify
Fixes vdex golem benchmarks.
Also fixed logic that was overwriting the expected ClassStatus for
debug builds. This is why the tests were passing but the CHECK was
failing for non debug dex2oat.
Added regression test in dex2oat_test.
Bug: 80309967
Test: test-art-host
Change-Id: I91c48ffbe894ab471572418142fcb4ae85bf0864
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 1b809d2..decb330 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -1935,11 +1935,10 @@
// 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 @@
class_loader,
soa.Self());
}
+ ++class_def_idx;
}
- ++class_def_idx;
}
return true;
}
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index 2fe16f7..96d7dba 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -1912,29 +1912,35 @@
ASSERT_EQ(dm_file.GetFile()->Flush(), 0);
}
+ auto generate_and_check = [&](CompilerFilter::Filter filter) {
+ GenerateOdexForTest(dex_location,
+ odex_location,
+ filter,
+ { "--dump-timings",
+ "--dm-file=" + dm_file.GetFilename(),
+ // Pass -Xuse-stderr-logger have dex2oat output in output_ on target.
+ "--runtime-arg",
+ "-Xuse-stderr-logger" },
+ true, // expect_success
+ false, // use_fd
+ [](const OatFile& o) {
+ CHECK(o.ContainsDexCode());
+ });
+ // Check the output for "Fast verify", this is printed from --dump-timings.
+ std::istringstream iss(output_);
+ std::string line;
+ bool found_fast_verify = false;
+ const std::string kFastVerifyString = "Fast Verify";
+ while (std::getline(iss, line) && !found_fast_verify) {
+ found_fast_verify = found_fast_verify || line.find(kFastVerifyString) != std::string::npos;
+ }
+ EXPECT_TRUE(found_fast_verify) << "Expected to find " << kFastVerifyString << "\n" << output_;
+ };
+
// Generate a quickened dex by using the input dm file to verify.
- GenerateOdexForTest(dex_location,
- odex_location,
- CompilerFilter::Filter::kQuicken,
- { "--dump-timings",
- "--dm-file=" + dm_file.GetFilename(),
- // Pass -Xuse-stderr-logger have dex2oat output in output_ on target.
- "--runtime-arg",
- "-Xuse-stderr-logger" },
- true, // expect_success
- false, // use_fd
- [](const OatFile& o) {
- CHECK(o.ContainsDexCode());
- });
- // Check the output for "Fast verify", this is printed from --dump-timings.
- std::istringstream iss(output_);
- std::string line;
- bool found_fast_verify = false;
- const std::string kFastVerifyString = "Fast Verify";
- while (std::getline(iss, line) && !found_fast_verify) {
- found_fast_verify = found_fast_verify || line.find(kFastVerifyString) != std::string::npos;
- }
- EXPECT_TRUE(found_fast_verify) << "Expected to find " << kFastVerifyString << "\n" << output_;
+ generate_and_check(CompilerFilter::Filter::kQuicken);
+ // Use verify compiler filter to sanity check that FastVerify works for that filter too.
+ generate_and_check(CompilerFilter::Filter::kVerify);
}
// Test that dex files with quickened opcodes aren't dequickened.