--- a/hotspot/src/share/vm/opto/callnode.cpp Thu Nov 21 19:00:57 2013 -0800
+++ b/hotspot/src/share/vm/opto/callnode.cpp Fri Nov 22 12:14:09 2013 -0800
@@ -342,7 +342,7 @@
st->print(" %s%d]=#"INT32_FORMAT,msg,i,t->is_int()->get_con());
break;
case Type::AnyPtr:
- assert( t == TypePtr::NULL_PTR, "" );
+ assert( t == TypePtr::NULL_PTR || n->in_dump(), "" );
st->print(" %s%d]=#NULL",msg,i);
break;
case Type::AryPtr:
@@ -887,7 +887,7 @@
if (!(call->req() > TypeFunc::Parms &&
call->in(TypeFunc::Parms) != NULL &&
call->in(TypeFunc::Parms)->is_Con())) {
- assert(_in_dump_cnt != 0, "OK if dumping");
+ assert(in_dump() != 0, "OK if dumping");
tty->print("[bad uncommon trap]");
return 0;
}