Mercurial > hg > truffle

diff src/share/vm/c1x/c1x_VMEntries.cpp @ 1481:fe69dec9a1ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added support for CompileTheWorld.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Mon, 29 Nov 2010 12:01:45 +0100
parents 71cd4b9610eb
children 48bbaead8b6c
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_VMEntries.cpp	Sat Nov 27 16:43:53 2010 +0100
+++ b/src/share/vm/c1x/c1x_VMEntries.cpp	Mon Nov 29 12:01:45 2010 +0100
@@ -148,6 +148,10 @@
         protectionDomain = VmIds::get<klassOop>(accessingClassVmId)->klass_part()->protection_domain();
       }
       resolved_type = SystemDictionary::resolve_or_null(nameSymbol, classloader, protectionDomain, THREAD);
+      if (HAS_PENDING_EXCEPTION) {
+        CLEAR_PENDING_EXCEPTION;
+        resolved_type = NULL;
+      }
     }
     if (resolved_type != NULL) {
       result = C1XCompiler::createHotSpotTypeResolved(resolved_type, name, CHECK_NULL);