src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java

*** 36,46 ****
  import sun.jvm.hotspot.runtime.VMObjectFactory;
  import sun.jvm.hotspot.types.AddressField;
  import sun.jvm.hotspot.types.CIntegerField;
  import sun.jvm.hotspot.types.Type;
  import sun.jvm.hotspot.types.TypeDataBase;
- import sun.jvm.hotspot.utilities.Assert;
  
  // Mirror class for HeapRegion. Currently we don't actually include
  // any of its fields but only iterate over it.
  
  public class HeapRegion extends CompactibleSpace {
--- 36,45 ----
*** 74,89 ****
          return grainBytesField.getValue();
      }
  
      public HeapRegion(Address addr) {
          super(addr);
! 
!         if (Assert.ASSERTS_ENABLED) {
!             Assert.that(addr instanceof OopHandle, "addr should be OopHandle");
!         }
! 
!         Address typeAddr = addr.addOffsetToAsOopHandle(typeFieldOffset);
          type = (HeapRegionType)VMObjectFactory.newObject(HeapRegionType.class, typeAddr);
      }
  
      public Address top() {
          return topField.getValue(addr);
--- 73,84 ----
          return grainBytesField.getValue();
      }
  
      public HeapRegion(Address addr) {
          super(addr);
!         Address typeAddr = (addr instanceof OopHandle) ? addr.addOffsetToAsOopHandle(typeFieldOffset)
!                                                        : addr.addOffsetTo(typeFieldOffset);
          type = (HeapRegionType)VMObjectFactory.newObject(HeapRegionType.class, typeAddr);
      }
  
      public Address top() {
          return topField.getValue(addr);