src/share/vm/code/nmethod.cpp

rev 8978 : imported patch remove_err_msg

*** 1707,1717 ****
      }
  
      // Clean inline caches pointing to both zombie and not_entrant methods
      if (!nm->is_in_use() || (nm->method()->code() != nm)) {
        ic->set_to_clean();
!       assert(ic->is_clean(), err_msg("nmethod " PTR_FORMAT "not clean %s", from, from->method()->name_and_sig_as_C_string()));
      }
    }
  
    return false;
  }
--- 1707,1717 ----
      }
  
      // Clean inline caches pointing to both zombie and not_entrant methods
      if (!nm->is_in_use() || (nm->method()->code() != nm)) {
        ic->set_to_clean();
!       assert(ic->is_clean(), "nmethod " PTR_FORMAT "not clean %s", from, from->method()->name_and_sig_as_C_string());
      }
    }
  
    return false;
  }
*** 2538,2557 ****
    // assert(method()->is_oop(), "must be valid");
  
    ResourceMark rm;
  
    if (!CodeCache::contains(this)) {
!     fatal(err_msg("nmethod at " INTPTR_FORMAT " not in zone", this));
    }
  
    if(is_native_method() )
      return;
  
    nmethod* nm = CodeCache::find_nmethod(verified_entry_point());
    if (nm != this) {
!     fatal(err_msg("findNMethod did not find this nmethod (" INTPTR_FORMAT ")",
!                   this));
    }
  
    for (PcDesc* p = scopes_pcs_begin(); p < scopes_pcs_end(); p++) {
      if (! p->verify(this)) {
        tty->print_cr("\t\tin nmethod at " INTPTR_FORMAT " (pcs)", this);
--- 2538,2556 ----
    // assert(method()->is_oop(), "must be valid");
  
    ResourceMark rm;
  
    if (!CodeCache::contains(this)) {
!     fatal("nmethod at " INTPTR_FORMAT " not in zone", this);
    }
  
    if(is_native_method() )
      return;
  
    nmethod* nm = CodeCache::find_nmethod(verified_entry_point());
    if (nm != this) {
!     fatal("findNMethod did not find this nmethod (" INTPTR_FORMAT ")", this);
    }
  
    for (PcDesc* p = scopes_pcs_begin(); p < scopes_pcs_end(); p++) {
      if (! p->verify(this)) {
        tty->print_cr("\t\tin nmethod at " INTPTR_FORMAT " (pcs)", this);