Merge "CheckAndClearResolveException should allow LinkageError"

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();
 }