src/share/vm/oops/method.cpp

*** 244,256 ****
  int Method::bci_from(address bcp) const {
    if (is_native() && bcp == 0) {
      return 0;
    }
  #ifdef ASSERT
!   { ResourceMark rm;
    assert(is_native() && bcp == code_base() || contains(bcp) || is_error_reported(),
!          err_msg("bcp doesn't belong to this method: bcp: " INTPTR_FORMAT ", method: %s", bcp, name_and_sig_as_C_string()));
    }
  #endif
    return bcp - code_base();
  }
  
--- 244,258 ----
  int Method::bci_from(address bcp) const {
    if (is_native() && bcp == 0) {
      return 0;
    }
  #ifdef ASSERT
!   {
!     ResourceMark rm;
      assert(is_native() && bcp == code_base() || contains(bcp) || is_error_reported(),
!            "bcp doesn't belong to this method: bcp: " INTPTR_FORMAT ", method: %s",
!            bcp, name_and_sig_as_C_string());
    }
  #endif
    return bcp - code_base();
  }
  
*** 277,287 ****
    assert(bci == -1 || bci == bci_from(bcp_from(bci)), "sane bci if >=0");
    return bci;
  }
  
  address Method::bcp_from(int bci) const {
!   assert((is_native() && bci == 0)  || (!is_native() && 0 <= bci && bci < code_size()), err_msg("illegal bci: %d", bci));
    address bcp = code_base() + bci;
    assert(is_native() && bcp == code_base() || contains(bcp), "bcp doesn't belong to this method");
    return bcp;
  }
  
--- 279,289 ----
    assert(bci == -1 || bci == bci_from(bcp_from(bci)), "sane bci if >=0");
    return bci;
  }
  
  address Method::bcp_from(int bci) const {
!   assert((is_native() && bci == 0) || (!is_native() && 0 <= bci && bci < code_size()), "illegal bci: %d", bci);
    address bcp = code_base() + bci;
    assert(is_native() && bcp == code_base() || contains(bcp), "bcp doesn't belong to this method");
    return bcp;
  }
  
*** 571,581 ****
    if (is_final_method(class_access_flags))  return true;
  #ifdef ASSERT
    ResourceMark rm;
    bool is_nonv = (vtable_index() == nonvirtual_vtable_index);
    if (class_access_flags.is_interface()) {
!       assert(is_nonv == is_static(), err_msg("is_nonv=%s", name_and_sig_as_C_string()));
    }
  #endif
    assert(valid_vtable_index() || valid_itable_index(), "method must be linked before we ask this question");
    return vtable_index() == nonvirtual_vtable_index;
  }
--- 573,583 ----
    if (is_final_method(class_access_flags))  return true;
  #ifdef ASSERT
    ResourceMark rm;
    bool is_nonv = (vtable_index() == nonvirtual_vtable_index);
    if (class_access_flags.is_interface()) {
!     assert(is_nonv == is_static(), "is_nonv=%s", name_and_sig_as_C_string());
    }
  #endif
    assert(valid_vtable_index() || valid_itable_index(), "method must be linked before we ask this question");
    return vtable_index() == nonvirtual_vtable_index;
  }
*** 1570,1580 ****
        return bp->orig_bytecode();
      }
    }
    {
      ResourceMark rm;
!     fatal(err_msg("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci));
    }
    return Bytecodes::_shouldnotreachhere;
  }
  
  void Method::set_orig_bytecode_at(int bci, Bytecodes::Code code) {
--- 1572,1582 ----
        return bp->orig_bytecode();
      }
    }
    {
      ResourceMark rm;
!     fatal("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci);
    }
    return Bytecodes::_shouldnotreachhere;
  }
  
  void Method::set_orig_bytecode_at(int bci, Bytecodes::Code code) {