*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java	Wed Dec 13 08:52:36 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java	Wed Dec 13 08:52:36 2017

*** 20,38 ****
--- 20,38 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot;
  
  import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
  import static jdk.vm.ci.code.ValueUtil.asRegister;
  import static jdk.vm.ci.code.ValueUtil.asStackSlot;
  import static jdk.vm.ci.code.ValueUtil.isRegister;
+ import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
  
  import java.util.ArrayList;
  
  import org.graalvm.compiler.core.common.PermanentBailoutException;
  import org.graalvm.compiler.core.common.LIRKind;
+ import org.graalvm.compiler.core.common.PermanentBailoutException;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.lir.LIRFrameState;
  import org.graalvm.compiler.lir.Variable;
  import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder;
  

*** 50,61 ****
--- 50,63 ----
      private final ArrayList<Value> objectValues;
      private int objectCount;
  
      private final int totalFrameSize;
      private final int maxOopMapStackOffset;
+     private final int uncompressedReferenceSize;
  
!     public HotSpotReferenceMapBuilder(int totalFrameSize, int maxOopMapStackOffset, int uncompressedReferenceSize) {
+         this.uncompressedReferenceSize = uncompressedReferenceSize;
          this.objectValues = new ArrayList<>();
          this.objectCount = 0;
          this.maxOopMapStackOffset = maxOopMapStackOffset;
          this.totalFrameSize = totalFrameSize;
      }

*** 114,123 ****
--- 116,126 ----
                      base = toLocation(baseValue, 0);
                  }
  
                  for (int i = 0; i < kind.getPlatformKind().getVectorLength(); i++) {
                      if (kind.isReference(i)) {
+                         assert kind.isCompressedReference(i) ? (bytes < uncompressedReferenceSize) : (bytes == uncompressedReferenceSize);
                          objects[idx] = toLocation(obj, i * bytes);
                          derivedBase[idx] = base;
                          sizeInBytes[idx] = bytes;
                          idx++;
                      }