src/hotspot/share/classfile/classFileParser.cpp

*** 42,52 ****
  #include "logging/logStream.hpp"
  #include "memory/allocation.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/resourceArea.hpp"
! #include "memory/universe.inline.hpp"
  #include "oops/annotations.hpp"
  #include "oops/constantPool.inline.hpp"
  #include "oops/fieldStreams.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
--- 42,52 ----
  #include "logging/logStream.hpp"
  #include "memory/allocation.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/resourceArea.hpp"
! #include "memory/universe.hpp"
  #include "oops/annotations.hpp"
  #include "oops/constantPool.inline.hpp"
  #include "oops/fieldStreams.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
*** 3765,3777 ****
  
    // Calculate the starting byte offsets
    int next_static_oop_offset    = InstanceMirrorKlass::offset_of_static_fields();
    int next_static_double_offset = next_static_oop_offset +
                                        ((fac->count[STATIC_OOP]) * heapOopSize);
!   if ( fac->count[STATIC_DOUBLE] &&
!        (Universe::field_type_should_be_aligned(T_DOUBLE) ||
!         Universe::field_type_should_be_aligned(T_LONG)) ) {
      next_static_double_offset = align_up(next_static_double_offset, BytesPerLong);
    }
  
    int next_static_word_offset   = next_static_double_offset +
                                      ((fac->count[STATIC_DOUBLE]) * BytesPerLong);
--- 3765,3775 ----
  
    // Calculate the starting byte offsets
    int next_static_oop_offset    = InstanceMirrorKlass::offset_of_static_fields();
    int next_static_double_offset = next_static_oop_offset +
                                        ((fac->count[STATIC_OOP]) * heapOopSize);
!   if (fac->count[STATIC_DOUBLE]) {
      next_static_double_offset = align_up(next_static_double_offset, BytesPerLong);
    }
  
    int next_static_word_offset   = next_static_double_offset +
                                      ((fac->count[STATIC_DOUBLE]) * BytesPerLong);