Print this page


Split Close
Expand all
Collapse all
          --- old/src/cpu/x86/vm/methodHandles_x86.cpp
          +++ new/src/cpu/x86/vm/methodHandles_x86.cpp
↓ open down ↓ 402 lines elided ↑ open up ↑
 403  403    assert(ebp_off + wordSize*frame::interpreter_frame_method_offset      == saved_args_base_offset_in_bytes(), "");
 404  404    assert(ebp_off + wordSize*frame::interpreter_frame_last_sp_offset     == conversion_offset_in_bytes(), "");
 405  405    assert(ebp_off + wordSize*frame::interpreter_frame_sender_sp_offset   == exact_sender_sp_offset_in_bytes(), "");
 406  406    // These last two have to be exact:
 407  407    assert(ebp_off + wordSize*frame::link_offset                          == sender_link_offset_in_bytes(), "");
 408  408    assert(ebp_off + wordSize*frame::return_addr_offset                   == sender_pc_offset_in_bytes(), "");
 409  409  }
 410  410  
 411  411  void MethodHandles::RicochetFrame::verify() const {
 412  412    verify_offsets();
 413      -  assert(magic_number_1() == MAGIC_NUMBER_1, "");
 414      -  assert(magic_number_2() == MAGIC_NUMBER_2, "");
      413 +  assert(magic_number_1() == MAGIC_NUMBER_1, err_msg(PTR_FORMAT " == " PTR_FORMAT, magic_number_1(), MAGIC_NUMBER_1));
      414 +  assert(magic_number_2() == MAGIC_NUMBER_2, err_msg(PTR_FORMAT " == " PTR_FORMAT, magic_number_2(), MAGIC_NUMBER_2));
 415  415    if (!Universe::heap()->is_gc_active()) {
 416  416      if (saved_args_layout() != NULL) {
 417  417        assert(saved_args_layout()->is_method(), "must be valid oop");
 418  418      }
 419  419      if (saved_target() != NULL) {
 420  420        assert(java_lang_invoke_MethodHandle::is_instance(saved_target()), "checking frame value");
 421  421      }
 422  422    }
 423  423    int conv_op = adapter_conversion_op(conversion());
 424  424    assert(conv_op == java_lang_invoke_AdapterMethodHandle::OP_COLLECT_ARGS ||
↓ open down ↓ 2012 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX