diff options
| author | 2017-08-24 10:51:21 +0000 | |
|---|---|---|
| committer | 2017-08-24 10:51:21 +0000 | |
| commit | c1238d8be9a8cec4d62cc89c7604dc3272c4a461 (patch) | |
| tree | 79fe76ee1163547242ed89d04991a335bcc4f739 /compiler/driver/compiler_driver.cc | |
| parent | 3bdf3f24939f4f0ba36738b68d08b4bd4c8e32e3 (diff) | |
| parent | c5e0d3fb4bce1490dcdb65b1d858b1c955bf71c5 (diff) | |
Merge "compiler_driver: treat java/lang/invoke as others"
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 11 |
1 files changed, 4 insertions, 7 deletions
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()) { |