src/share/vm/oops/oop.inline.hpp

rev 8978 : imported patch remove_err_msg

*** 187,197 ****
  inline oop oopDesc::decode_heap_oop_not_null(narrowOop v) {
    assert(!is_null(v), "narrow oop value can never be zero");
    address base = Universe::narrow_oop_base();
    int    shift = Universe::narrow_oop_shift();
    oop result = (oop)(void*)((uintptr_t)base + ((uintptr_t)v << shift));
!   assert(check_obj_alignment(result), err_msg("address not aligned: " INTPTR_FORMAT, p2i((void*) result)));
    return result;
  }
  
  inline oop oopDesc::decode_heap_oop(narrowOop v) {
    return is_null(v) ? (oop)NULL : decode_heap_oop_not_null(v);
--- 187,197 ----
  inline oop oopDesc::decode_heap_oop_not_null(narrowOop v) {
    assert(!is_null(v), "narrow oop value can never be zero");
    address base = Universe::narrow_oop_base();
    int    shift = Universe::narrow_oop_shift();
    oop result = (oop)(void*)((uintptr_t)base + ((uintptr_t)v << shift));
!   assert(check_obj_alignment(result), "address not aligned: " INTPTR_FORMAT, p2i((void*) result));
    return result;
  }
  
  inline oop oopDesc::decode_heap_oop(narrowOop v) {
    return is_null(v) ? (oop)NULL : decode_heap_oop_not_null(v);