From c5e0d3fb4bce1490dcdb65b1d858b1c955bf71c5 Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Tue, 22 Aug 2017 19:00:04 +0100 Subject: 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 --- compiler/driver/compiler_driver.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 7ea75ebd4c..ee36a92c17 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2102,14 +2102,11 @@ class VerifyClassVisitor : public CompilationVisitor { 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()) { -- cgit v1.2.3-59-g8ed1b