src/share/vm/memory/allocation.cpp

*** 123,133 ****
  
  #ifdef ASSERT
  void ResourceObj::set_allocation_type(address res, allocation_type type) {
      // Set allocation type in the resource object
      uintptr_t allocation = (uintptr_t)res;
!     assert((allocation & allocation_mask) == 0, err_msg("address should be aligned to 4 bytes at least: " INTPTR_FORMAT, p2i(res)));
      assert(type <= allocation_mask, "incorrect allocation type");
      ResourceObj* resobj = (ResourceObj *)res;
      resobj->_allocation_t[0] = ~(allocation + type);
      if (type != STACK_OR_EMBEDDED) {
        // Called from operator new() and CollectionSetChooser(),
--- 123,133 ----
  
  #ifdef ASSERT
  void ResourceObj::set_allocation_type(address res, allocation_type type) {
      // Set allocation type in the resource object
      uintptr_t allocation = (uintptr_t)res;
!     assert((allocation & allocation_mask) == 0, "address should be aligned to 4 bytes at least: " INTPTR_FORMAT, p2i(res));
      assert(type <= allocation_mask, "incorrect allocation type");
      ResourceObj* resobj = (ResourceObj *)res;
      resobj->_allocation_t[0] = ~(allocation + type);
      if (type != STACK_OR_EMBEDDED) {
        // Called from operator new() and CollectionSetChooser(),
*** 159,170 ****
        // (even if it was garbage).
        // Ignore garbage in other fields.
      } else if (is_type_set()) {
        // Operator new() was called and type was set.
        assert(!allocated_on_stack(),
!              err_msg("not embedded or stack, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")",
!                      p2i(this), get_allocation_type(), _allocation_t[0], _allocation_t[1]));
      } else {
        // Operator new() was not called.
        // Assume that it is embedded or stack object.
        set_allocation_type((address)this, STACK_OR_EMBEDDED);
      }
--- 159,170 ----
        // (even if it was garbage).
        // Ignore garbage in other fields.
      } else if (is_type_set()) {
        // Operator new() was called and type was set.
        assert(!allocated_on_stack(),
!              "not embedded or stack, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")",
!              p2i(this), get_allocation_type(), _allocation_t[0], _allocation_t[1]);
      } else {
        // Operator new() was not called.
        // Assume that it is embedded or stack object.
        set_allocation_type((address)this, STACK_OR_EMBEDDED);
      }
*** 173,193 ****
  
  ResourceObj::ResourceObj(const ResourceObj& r) { // default copy constructor
      // Used in ClassFileParser::parse_constant_pool_entries() for ClassFileStream.
      // Note: garbage may resembles valid value.
      assert(~(_allocation_t[0] | allocation_mask) != (uintptr_t)this || !is_type_set(),
!            err_msg("embedded or stack only, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")",
!                    p2i(this), get_allocation_type(), _allocation_t[0], _allocation_t[1]));
      set_allocation_type((address)this, STACK_OR_EMBEDDED);
      _allocation_t[1] = 0; // Zap verification value
  }
  
  ResourceObj& ResourceObj::operator=(const ResourceObj& r) { // default copy assignment
      // Used in InlineTree::ok_to_inline() for WarmCallInfo.
      assert(allocated_on_stack(),
!            err_msg("copy only into local, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")",
!                    p2i(this), get_allocation_type(), _allocation_t[0], _allocation_t[1]));
      // Keep current _allocation_t value;
      return *this;
  }
  
  ResourceObj::~ResourceObj() {
--- 173,193 ----
  
  ResourceObj::ResourceObj(const ResourceObj& r) { // default copy constructor
      // Used in ClassFileParser::parse_constant_pool_entries() for ClassFileStream.
      // Note: garbage may resembles valid value.
      assert(~(_allocation_t[0] | allocation_mask) != (uintptr_t)this || !is_type_set(),
!            "embedded or stack only, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")",
!            p2i(this), get_allocation_type(), _allocation_t[0], _allocation_t[1]);
      set_allocation_type((address)this, STACK_OR_EMBEDDED);
      _allocation_t[1] = 0; // Zap verification value
  }
  
  ResourceObj& ResourceObj::operator=(const ResourceObj& r) { // default copy assignment
      // Used in InlineTree::ok_to_inline() for WarmCallInfo.
      assert(allocated_on_stack(),
!            "copy only into local, this(" PTR_FORMAT ") type %d a[0]=(" PTR_FORMAT ") a[1]=(" PTR_FORMAT ")",
!            p2i(this), get_allocation_type(), _allocation_t[0], _allocation_t[1]);
      // Keep current _allocation_t value;
      return *this;
  }
  
  ResourceObj::~ResourceObj() {
*** 531,541 ****
    }
    return sum;                   // Return total consumed space.
  }
  
  void Arena::signal_out_of_memory(size_t sz, const char* whence) const {
!   vm_exit_out_of_memory(sz, OOM_MALLOC_ERROR, whence);
  }
  
  // Grow a new Chunk
  void* Arena::grow(size_t x, AllocFailType alloc_failmode) {
    // Get minimal required size.  Either real big, or even bigger for giant objs
--- 531,541 ----
    }
    return sum;                   // Return total consumed space.
  }
  
  void Arena::signal_out_of_memory(size_t sz, const char* whence) const {
!   vm_exit_out_of_memory(sz, OOM_MALLOC_ERROR, "%s", whence);
  }
  
  // Grow a new Chunk
  void* Arena::grow(size_t x, AllocFailType alloc_failmode) {
    // Get minimal required size.  Either real big, or even bigger for giant objs