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

     1.1 --- a/src/share/vm/opto/escape.cpp	Tue Oct 23 13:06:37 2012 -0700
     1.2 +++ b/src/share/vm/opto/escape.cpp	Wed Oct 24 14:33:22 2012 -0700
     1.3 @@ -893,12 +893,16 @@
     1.4                                         arg_has_oops && (i > TypeFunc::Parms);
     1.5  #ifdef ASSERT
     1.6            if (!(is_arraycopy ||
     1.7 -                call->as_CallLeaf()->_name != NULL &&
     1.8 -                (strcmp(call->as_CallLeaf()->_name, "g1_wb_pre")  == 0 ||
     1.9 -                 strcmp(call->as_CallLeaf()->_name, "g1_wb_post") == 0 ))
    1.10 -          ) {
    1.11 +                (call->as_CallLeaf()->_name != NULL &&
    1.12 +                 (strcmp(call->as_CallLeaf()->_name, "g1_wb_pre")  == 0 ||
    1.13 +                  strcmp(call->as_CallLeaf()->_name, "g1_wb_post") == 0 ||
    1.14 +                  strcmp(call->as_CallLeaf()->_name, "aescrypt_encryptBlock") == 0 ||
    1.15 +                  strcmp(call->as_CallLeaf()->_name, "aescrypt_decryptBlock") == 0 ||
    1.16 +                  strcmp(call->as_CallLeaf()->_name, "cipherBlockChaining_encryptAESCrypt") == 0 ||
    1.17 +                  strcmp(call->as_CallLeaf()->_name, "cipherBlockChaining_decryptAESCrypt") == 0)
    1.18 +                  ))) {
    1.19              call->dump();
    1.20 -            assert(false, "EA: unexpected CallLeaf");
    1.21 +            fatal(err_msg_res("EA unexpected CallLeaf %s", call->as_CallLeaf()->_name));
    1.22            }
    1.23  #endif
    1.24            // Always process arraycopy's destination object since