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

     1.1 --- a/src/share/vm/opto/doCall.cpp	Fri Jul 27 16:14:15 2012 -0700
     1.2 +++ b/src/share/vm/opto/doCall.cpp	Mon Jul 30 09:49:25 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("rt=%d, ct=%d", rt, ct));
     1.8 +            assert(ct == T_INT, err_msg_res("rt=%d, ct=%d", rt, ct));
     1.9            }
    1.10          } else if (rt == T_OBJECT) {
    1.11 -          assert(ct == T_OBJECT, err_msg("rt=T_OBJECT, ct=%d", ct));
    1.12 +          assert(ct == T_OBJECT, err_msg_res("rt=T_OBJECT, ct=%d", ct));
    1.13            if (ctype->is_loaded()) {
    1.14              Node* if_fail = top();
    1.15              retnode = gen_checkcast(retnode, makecon(TypeKlassPtr::make(ctype->as_klass())), &if_fail);
    1.16 @@ -539,7 +539,7 @@
    1.17              push(retnode);
    1.18            }
    1.19          } else {
    1.20 -          assert(ct == rt, err_msg("unexpected mismatch rt=%d, ct=%d", rt, ct));
    1.21 +          assert(ct == rt, err_msg_res("unexpected mismatch rt=%d, ct=%d", rt, ct));
    1.22            // push a zero; it's better than getting an oop/int mismatch
    1.23            retnode = pop_node(rt);
    1.24            retnode = zerocon(ct);