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

     1.1 --- a/src/share/vm/opto/doCall.cpp	Wed Aug 01 14:10:32 2012 -0700
     1.2 +++ b/src/share/vm/opto/doCall.cpp	Wed Aug 01 14:44:26 2012 -0700
     1.3 @@ -523,10 +523,10 @@
     1.4              retnode = _gvn.transform( new (C, 3) LShiftINode(retnode, intcon(16)) );
     1.5              retnode = _gvn.transform( new (C, 3) RShiftINode(retnode, intcon(16)) );
     1.6            } else {
     1.7 -            assert(ct == T_INT, err_msg_res("rt=%d, ct=%d", rt, ct));
     1.8 +            assert(ct == T_INT, err_msg_res("rt=%s, ct=%s", type2name(rt), type2name(ct)));
     1.9            }
    1.10 -        } else if (rt == T_OBJECT) {
    1.11 -          assert(ct == T_OBJECT, err_msg_res("rt=T_OBJECT, ct=%d", ct));
    1.12 +        } else if (rt == T_OBJECT || rt == T_ARRAY) {
    1.13 +          assert(ct == T_OBJECT || ct == T_ARRAY, err_msg_res("rt=%s, ct=%s", type2name(rt), type2name(ct)));
    1.14            if (ctype->is_loaded()) {
    1.15              Node* if_fail = top();
    1.16              retnode = gen_checkcast(retnode, makecon(TypeKlassPtr::make(ctype->as_klass())), &if_fail);