From 898fcb573c2e49c9c2aa59f3743e8f357b3fbc5b Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Mon, 25 Aug 2014 23:07:30 -0700
Subject: CheckAndClearResolveException should allow LinkageError

Bug: 16565964

(cherry picked from commit 118785c6f82ac1ec7074b5efe367b3dafd904940)

Change-Id: I7bc170e7a9ee9bd19defdd20187ee36a2381bf5d
---
 compiler/driver/compiler_driver.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'compiler/driver/compiler_driver.cc')

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();
 }
-- 
cgit v1.2.3-59-g8ed1b