src/share/vm/compiler/oopMap.cpp

*** 610,629 ****
  ImmutableOopMapBuilder::ImmutableOopMapBuilder(const OopMapSet* set) : _set(set), _new_set(NULL), _empty(NULL), _last(NULL), _empty_offset(-1), _last_offset(-1), _offset(0), _required(-1) {
    _mapping = NEW_RESOURCE_ARRAY(Mapping, _set->size());
  }
  
  int ImmutableOopMapBuilder::size_for(const OopMap* map) const {
!   return align_size_up((int)sizeof(ImmutableOopMap) + map->data_size(), 8);
  }
  
  int ImmutableOopMapBuilder::heap_size() {
    int base = sizeof(ImmutableOopMapSet);
!   base = align_size_up(base, 8);
  
    // all of ours pc / offset pairs
    int pairs = _set->size() * sizeof(ImmutableOopMapPair);
!   pairs = align_size_up(pairs, 8);
  
    for (int i = 0; i < _set->size(); ++i) {
      int size = 0;
      OopMap* map = _set->at(i);
  
--- 610,629 ----
  ImmutableOopMapBuilder::ImmutableOopMapBuilder(const OopMapSet* set) : _set(set), _new_set(NULL), _empty(NULL), _last(NULL), _empty_offset(-1), _last_offset(-1), _offset(0), _required(-1) {
    _mapping = NEW_RESOURCE_ARRAY(Mapping, _set->size());
  }
  
  int ImmutableOopMapBuilder::size_for(const OopMap* map) const {
!   return align_up((int)sizeof(ImmutableOopMap) + map->data_size(), 8);
  }
  
  int ImmutableOopMapBuilder::heap_size() {
    int base = sizeof(ImmutableOopMapSet);
!   base = align_up(base, 8);
  
    // all of ours pc / offset pairs
    int pairs = _set->size() * sizeof(ImmutableOopMapPair);
!   pairs = align_up(pairs, 8);
  
    for (int i = 0; i < _set->size(); ++i) {
      int size = 0;
      OopMap* map = _set->at(i);