*** old/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java	Thu Apr 30 16:11:20 2015
--- new/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java	Thu Apr 30 16:11:20 2015

*** 26,59 ****
--- 26,55 ----
  
  import sun.jvm.hotspot.code.*;
  
  public class OopMapStream {
    private CompressedReadStream stream;
!   private ImmutableOopMap oopMap;
    private int mask;
    private int size;
    private int position;
    private OopMapValue omv;
    private boolean omvValid;
  
!   public OopMapStream(ImmutableOopMap oopMap) {
      this(oopMap, (OopMapValue.OopTypes[]) null);
    }
  
!   public OopMapStream(ImmutableOopMap oopMap, OopMapValue.OopTypes type) {
      this(oopMap, (OopMapValue.OopTypes[]) null);
      mask = type.getValue();
    }
  
!   public OopMapStream(ImmutableOopMap oopMap, OopMapValue.OopTypes[] types) {
      if (oopMap.getOMVData() == null) {
        stream = new CompressedReadStream(oopMap.getWriteStream().getBuffer());
      } else {
        stream = new CompressedReadStream(oopMap.getOMVData());
      }
+     stream = new CompressedReadStream(oopMap.getData());
      mask = computeMask(types);
!     size = (int) oopMap.getOMVCount();
!     size = (int) oopMap.getCount();
      position = 0;
      omv = new OopMapValue();
      omvValid = false;
    }