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

     1.1 --- a/src/share/vm/opto/compile.cpp	Fri Jul 27 16:14:15 2012 -0700
     1.2 +++ b/src/share/vm/opto/compile.cpp	Mon Jul 30 09:49:25 2012 -0700
     1.3 @@ -3138,7 +3138,7 @@
     1.4      default: ShouldNotReachHere();
     1.5      }
     1.6      assert(constant_addr, "consts section too small");
     1.7 -    assert((constant_addr - _masm.code()->consts()->start()) == con.offset(), err_msg("must be: %d == %d", constant_addr - _masm.code()->consts()->start(), con.offset()));
     1.8 +    assert((constant_addr - _masm.code()->consts()->start()) == con.offset(), err_msg_res("must be: %d == %d", constant_addr - _masm.code()->consts()->start(), con.offset()));
     1.9    }
    1.10  }
    1.11  
    1.12 @@ -3199,7 +3199,7 @@
    1.13    if (Compile::current()->in_scratch_emit_size())  return;
    1.14  
    1.15    assert(labels.is_nonempty(), "must be");
    1.16 -  assert((uint) labels.length() == n->outcnt(), err_msg("must be equal: %d == %d", labels.length(), n->outcnt()));
    1.17 +  assert((uint) labels.length() == n->outcnt(), err_msg_res("must be equal: %d == %d", labels.length(), n->outcnt()));
    1.18  
    1.19    // Since MachConstantNode::constant_offset() also contains
    1.20    // table_base_offset() we need to subtract the table_base_offset()
    1.21 @@ -3211,7 +3211,7 @@
    1.22  
    1.23    for (uint i = 0; i < n->outcnt(); i++) {
    1.24      address* constant_addr = &jump_table_base[i];
    1.25 -    assert(*constant_addr == (((address) n) + i), err_msg("all jump-table entries must contain adjusted node pointer: " INTPTR_FORMAT " == " INTPTR_FORMAT, *constant_addr, (((address) n) + i)));
    1.26 +    assert(*constant_addr == (((address) n) + i), err_msg_res("all jump-table entries must contain adjusted node pointer: " INTPTR_FORMAT " == " INTPTR_FORMAT, *constant_addr, (((address) n) + i)));
    1.27      *constant_addr = cb.consts()->target(*labels.at(i), (address) constant_addr);
    1.28      cb.consts()->relocate((address) constant_addr, relocInfo::internal_word_type);
    1.29    }