# HG changeset patch
# User bharadwaj
# Date 1363973731 14400
# Node ID 360ce06580b89681507ed86d7a67778b8fde1af0
# Parent  a57fc14f798a89fbc4a63cc669200b46c7b41124# Parent  e370f63dc5b13df820e36da50129149e5ff10b8e
Merge

diff -r a57fc14f798a -r 360ce06580b8 src/share/vm/opto/parse2.cpp
--- 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