commit 898fcb573c2e49c9c2aa59f3743e8f357b3fbc5b
author Brian Carlstrom <bdc@google.com> Mon Aug 25 23:07:30 2014 -0700
committer Brian Carlstrom <bdc@google.com> Mon Aug 25 23:24:13 2014 -0700
tree 92b8e5158758637301d624ac5bba237a616ea222
parent 5a1a39a67260704fbc76c9a6a58b330a2df6827a

CheckAndClearResolveException should allow LinkageError

Bug: 16565964

(cherry picked from commit 118785c6f82ac1ec7074b5efe367b3dafd904940)

Change-Id: I7bc170e7a9ee9bd19defdd20187ee36a2381bf5d

compiler/driver/compiler_driver.cc

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 3b0c8af..d1458bc 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -1565,6 +1565,7 @@
       "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 @@
     }
   }
   if (!found) {
-    LOG(FATAL) << "Unexpected exeption " << exception->Dump();
+    LOG(FATAL) << "Unexpected exception " << exception->Dump();
   }
   self->ClearException();
 }