compiler_driver: treat java/lang/invoke as others
Reverts commit e3eae5e41502c85ba0b4ef88340c10bb53795a47.
Removes exemption for java/lang/invoke/* from verification
DCHECK. No longer required with invoke-polymorphic support.
Bug: 32496585
Test: art/test.py --host -j32
Change-Id: Ie73274b723febfcffb687e879a80ffdb680f9491
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 7ea75eb..ee36a92 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -2102,14 +2102,11 @@
ClassReference ref(manager_->GetDexFile(), class_def_index);
manager_->GetCompiler()->RecordClassStatus(ref, klass->GetStatus());
- // It is *very* problematic if there are verification errors in the boot classpath. For example,
- // we rely on things working OK without verification when the decryption dialog is brought up.
- // So abort in a debug build if we find this violated.
+ // It is *very* problematic if there are verification errors in the boot classpath.
+ // For example, we rely on things working OK without verification when the decryption dialog
+ // is brought up. So abort in a debug build if we find this violated.
if (kIsDebugBuild) {
- // TODO(narayan): Remove this special case for signature polymorphic
- // invokes once verifier support is fully implemented.
- if (manager_->GetCompiler()->GetCompilerOptions().IsBootImage() &&
- !android::base::StartsWith(descriptor, "Ljava/lang/invoke/")) {
+ if (manager_->GetCompiler()->GetCompilerOptions().IsBootImage()) {
if (!klass->IsVerified()) {
// Re-run verification to get all failure messages if it soft-failed.
if (!klass->IsErroneous()) {