diff options
| author | 2014-07-08 22:01:08 -0700 | |
|---|---|---|
| committer | 2014-07-08 22:07:08 -0700 | |
| commit | 6b0599fc9356deaefe3c49fb883ca5b62a9f0b12 (patch) | |
| tree | 35c66a411a9aedde83f2ec2e054a7c66f39ca6ab /compiler/driver/compiler_driver.cc | |
| parent | 6e524ddc060f10a493dc63fa5b6dde0deef22219 (diff) | |
Whitelist another exception during dex2oat resolving.
Bug: 15936401
Bug: 16162780
Change-Id: I7389edc8cdacd5e3c2cc7d86bbd56e8c503c34b0
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 770ae89ca2..9bf51359cf 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1466,8 +1466,12 @@ static void CheckAndClearResolveException(Thread* self) CHECK(self->IsExceptionPending()); mirror::Throwable* exception = self->GetException(nullptr); std::string descriptor = exception->GetClass()->GetDescriptor(); - if (descriptor != "Ljava/lang/IncompatibleClassChangeError;" && - descriptor != "Ljava/lang/NoClassDefFoundError;") { + if (descriptor != "Ljava/lang/IllegalAccessError;" && + descriptor != "Ljava/lang/IncompatibleClassChangeError;" && + descriptor != "Ljava/lang/InstantiationError;" && + descriptor != "Ljava/lang/NoClassDefFoundError;" && + descriptor != "Ljava/lang/NoSuchFieldError;" && + descriptor != "Ljava/lang/NoSuchMethodError;") { LOG(FATAL) << "Unexpected exeption " << exception->Dump(); } self->ClearException(); |