Mercurial > hg > openjdk > jigsaw > hotspot

changeset 4496:360ce06580b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author bharadwaj
date Fri, 22 Mar 2013 13:35:31 -0400
parents a57fc14f798a (current diff) e370f63dc5b1 (diff)
children 3c786355ffb4
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/parse2.cpp	Thu Mar 21 22:00:14 2013 -0700
+++ b/src/share/vm/opto/parse2.cpp	Fri Mar 22 13:35:31 2013 -0400
@@ -104,7 +104,8 @@
     if (C->log() != NULL)   C->log()->elem("observe that='!need_range_check'");
   }
 
-  if (!arytype->klass()->is_loaded()) {
+  ciKlass * arytype_klass = arytype->klass();
+  if ((arytype_klass != NULL) && (!arytype_klass->is_loaded())) {
     // Only fails for some -Xcomp runs
     // The class is unloaded.  We have to run this bytecode in the interpreter.
     uncommon_trap(Deoptimization::Reason_unloaded,
@@ -1385,6 +1386,7 @@
   if (TraceOptoParse) {
     tty->print(" @");
     dump_bci(bci());
+    tty->cr();
   }
 #endif