diff options
| author | 2014-08-25 23:07:30 -0700 | |
|---|---|---|
| committer | 2014-08-25 23:24:13 -0700 | |
| commit | 898fcb573c2e49c9c2aa59f3743e8f357b3fbc5b (patch) | |
| tree | 92b8e5158758637301d624ac5bba237a616ea222 /compiler/driver/compiler_driver.cc | |
| parent | 5a1a39a67260704fbc76c9a6a58b330a2df6827a (diff) | |
CheckAndClearResolveException should allow LinkageError
Bug: 16565964
(cherry picked from commit 118785c6f82ac1ec7074b5efe367b3dafd904940)
Change-Id: I7bc170e7a9ee9bd19defdd20187ee36a2381bf5d
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 3b0c8af9ef..d1458bcf08 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1565,6 +1565,7 @@ static void CheckAndClearResolveException(Thread* self) "Ljava/lang/IllegalAccessError;", "Ljava/lang/IncompatibleClassChangeError;", "Ljava/lang/InstantiationError;", + "Ljava/lang/LinkageError;", "Ljava/lang/NoClassDefFoundError;", "Ljava/lang/NoSuchFieldError;", "Ljava/lang/NoSuchMethodError;" @@ -1576,7 +1577,7 @@ static void CheckAndClearResolveException(Thread* self) } } if (!found) { - LOG(FATAL) << "Unexpected exeption " << exception->Dump(); + LOG(FATAL) << "Unexpected exception " << exception->Dump(); } self->ClearException(); } |