From 6b0599fc9356deaefe3c49fb883ca5b62a9f0b12 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Tue, 8 Jul 2014 22:01:08 -0700 Subject: [PATCH] Whitelist another exception during dex2oat resolving. Bug: 15936401 Bug: 16162780 Change-Id: I7389edc8cdacd5e3c2cc7d86bbd56e8c503c34b0 --- compiler/driver/compiler_driver.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 770ae89ca..9bf51359c 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(); -- 2.11.0