Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/callnode.cpp	Thu Nov 21 19:00:57 2013 -0800
     1.2 +++ b/src/share/vm/opto/callnode.cpp	Fri Nov 22 12:14:09 2013 -0800
     1.3 @@ -342,7 +342,7 @@
     1.4        st->print(" %s%d]=#"INT32_FORMAT,msg,i,t->is_int()->get_con());
     1.5        break;
     1.6      case Type::AnyPtr:
     1.7 -      assert( t == TypePtr::NULL_PTR, "" );
     1.8 +      assert( t == TypePtr::NULL_PTR || n->in_dump(), "" );
     1.9        st->print(" %s%d]=#NULL",msg,i);
    1.10        break;
    1.11      case Type::AryPtr:
    1.12 @@ -887,7 +887,7 @@
    1.13    if (!(call->req() > TypeFunc::Parms &&
    1.14          call->in(TypeFunc::Parms) != NULL &&
    1.15          call->in(TypeFunc::Parms)->is_Con())) {
    1.16 -    assert(_in_dump_cnt != 0, "OK if dumping");
    1.17 +    assert(in_dump() != 0, "OK if dumping");
    1.18      tty->print("[bad uncommon trap]");
    1.19      return 0;
    1.20    }