Mercurial > hg > truffle
changeset 104:541929da62d2
6624474: Server compiler generates unexpected LinkageError
Summary: Fix load_signature_classes to tolerate LinkageErrors
Reviewed-by: kvn, never
author | rasbold |
---|---|
date | Thu, 03 Apr 2008 13:33:13 -0700 |
parents | 38a50dd839cf |
children | a7d0f95410bd |
files | src/share/vm/oops/methodOop.cpp |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/methodOop.cpp Thu Apr 03 10:20:44 2008 -0700 +++ b/src/share/vm/oops/methodOop.cpp Thu Apr 03 13:33:13 2008 -0700 @@ -888,10 +888,11 @@ symbolHandle name (THREAD, sym); klassOop klass = SystemDictionary::resolve_or_null(name, class_loader, protection_domain, THREAD); - // We are loading classes eagerly. If a ClassNotFoundException was generated, - // be sure to ignore it. + // We are loading classes eagerly. If a ClassNotFoundException or + // a LinkageError was generated, be sure to ignore it. if (HAS_PENDING_EXCEPTION) { - if (PENDING_EXCEPTION->is_a(SystemDictionary::classNotFoundException_klass())) { + if (PENDING_EXCEPTION->is_a(SystemDictionary::classNotFoundException_klass()) || + PENDING_EXCEPTION->is_a(SystemDictionary::linkageError_klass())) { CLEAR_PENDING_EXCEPTION; } else { return false;