src/share/vm/oops/instanceKlass.cpp

rev 8978 : imported patch remove_err_msg

*** 1497,1507 ****
          if (method_matches(m, signature, skipping_overpass, skipping_static, skipping_private)) return i;
      }
      // not found
  #ifdef ASSERT
      int index = (skipping_overpass || skipping_static || skipping_private) ? -1 : linear_search(methods, name, signature);
!     assert(index == -1, err_msg("binary search should have found entry %d", index));
  #endif
    }
    return -1;
  }
  int InstanceKlass::find_method_by_name(Symbol* name, int* end) {
--- 1497,1507 ----
          if (method_matches(m, signature, skipping_overpass, skipping_static, skipping_private)) return i;
      }
      // not found
  #ifdef ASSERT
      int index = (skipping_overpass || skipping_static || skipping_private) ? -1 : linear_search(methods, name, signature);
!     assert(index == -1, "binary search should have found entry %d", index);
  #endif
    }
    return -1;
  }
  int InstanceKlass::find_method_by_name(Symbol* name, int* end) {
*** 1913,1923 ****
    assert_locked_or_safepoint(CodeCache_lock);
  
    for (nmethodBucket* b = deps; b != NULL; b = b->next()) {
      if (nm == b->get_nmethod()) {
        int val = b->decrement();
!       guarantee(val >= 0, err_msg("Underflow: %d", val));
        return (val == 0);
      }
    }
  #ifdef ASSERT
    tty->print_raw_cr("### can't find dependent nmethod");
--- 1913,1923 ----
    assert_locked_or_safepoint(CodeCache_lock);
  
    for (nmethodBucket* b = deps; b != NULL; b = b->next()) {
      if (nm == b->get_nmethod()) {
        int val = b->decrement();
!       guarantee(val >= 0, "Underflow: %d", val);
        return (val == 0);
      }
    }
  #ifdef ASSERT
    tty->print_raw_cr("### can't find dependent nmethod");
*** 1934,1944 ****
    nmethodBucket* first = deps;
    nmethodBucket* last = NULL;
    nmethodBucket* b = first;
  
    while (b != NULL) {
!     assert(b->count() >= 0, err_msg("bucket count: %d", b->count()));
      nmethodBucket* next = b->next();
      if (b->count() == 0) {
        if (last == NULL) {
          first = next;
        } else {
--- 1934,1944 ----
    nmethodBucket* first = deps;
    nmethodBucket* last = NULL;
    nmethodBucket* b = first;
  
    while (b != NULL) {
!     assert(b->count() >= 0, "bucket count: %d", b->count());
      nmethodBucket* next = b->next();
      if (b->count() == 0) {
        if (last == NULL) {
          first = next;
        } else {
*** 1974,1984 ****
  bool nmethodBucket::is_dependent_nmethod(nmethodBucket* deps, nmethod* nm) {
    for (nmethodBucket* b = deps; b != NULL; b = b->next()) {
      if (nm == b->get_nmethod()) {
  #ifdef ASSERT
        int count = b->count();
!       assert(count >= 0, err_msg("count shouldn't be negative: %d", count));
  #endif
        return true;
      }
    }
    return false;
--- 1974,1984 ----
  bool nmethodBucket::is_dependent_nmethod(nmethodBucket* deps, nmethod* nm) {
    for (nmethodBucket* b = deps; b != NULL; b = b->next()) {
      if (nm == b->get_nmethod()) {
  #ifdef ASSERT
        int count = b->count();
!       assert(count >= 0, "count shouldn't be negative: %d", count);
  #endif
        return true;
      }
    }
    return false;
*** 1999,2009 ****
    }
  #ifdef ASSERT
    else {
      // Verification
      for (nmethodBucket* b = _dependencies; b != NULL; b = b->next()) {
!       assert(b->count() >= 0, err_msg("bucket count: %d", b->count()));
        assert(b->count() != 0, "empty buckets need to be cleaned");
      }
    }
  #endif
  }
--- 1999,2009 ----
    }
  #ifdef ASSERT
    else {
      // Verification
      for (nmethodBucket* b = _dependencies; b != NULL; b = b->next()) {
!       assert(b->count() >= 0, "bucket count: %d", b->count());
        assert(b->count() != 0, "empty buckets need to be cleaned");
      }
    }
  #endif
  }
*** 3108,3118 ****
    // Verify siblings
    Klass* super = this->super();
    Klass* sib = next_sibling();
    if (sib != NULL) {
      if (sib == this) {
!       fatal(err_msg("subclass points to itself " PTR_FORMAT, sib));
      }
  
      guarantee(sib->is_klass(), "should be klass");
      guarantee(sib->super() == super, "siblings should have same superklass");
    }
--- 3108,3118 ----
    // Verify siblings
    Klass* super = this->super();
    Klass* sib = next_sibling();
    if (sib != NULL) {
      if (sib == this) {
!       fatal("subclass points to itself " PTR_FORMAT, sib);
      }
  
      guarantee(sib->is_klass(), "should be klass");
      guarantee(sib->super() == super, "siblings should have same superklass");
    }