OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a1a39a
)
CheckAndClearResolveException should allow LinkageError
author
Brian Carlstrom
<bdc@google.com>
Tue, 26 Aug 2014 06:07:30 +0000
(23:07 -0700)
committer
Brian Carlstrom
<bdc@google.com>
Tue, 26 Aug 2014 06:24:13 +0000
(23:24 -0700)
Bug:
16565964
(cherry picked from commit
118785c6f82ac1ec7074b5efe367b3dafd904940
)
Change-Id: I7bc170e7a9ee9bd19defdd20187ee36a2381bf5d
compiler/driver/compiler_driver.cc
patch
|
blob
|
history
diff --git
a/compiler/driver/compiler_driver.cc
b/compiler/driver/compiler_driver.cc
index
3b0c8af
..
d1458bc
100644
(file)
--- 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 ex
c
eption " << exception->Dump();
}
self->ClearException();
}