*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CompressionNode.java	Mon Mar 20 17:38:44 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/CompressionNode.java	Mon Mar 20 17:38:44 2017

*** 24,40 ****
--- 24,40 ----
  
  import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
  import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
  import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
  
+ import org.graalvm.compiler.core.common.CompressEncoding;
  import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
  import org.graalvm.compiler.core.common.type.ObjectStamp;
  import org.graalvm.compiler.core.common.type.Stamp;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.graph.spi.CanonicalizerTool;
  import org.graalvm.compiler.hotspot.CompressEncoding;
  import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
  import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
  import org.graalvm.compiler.hotspot.nodes.type.NarrowOopStamp;
  import org.graalvm.compiler.nodeinfo.NodeInfo;
  import org.graalvm.compiler.nodes.ConstantNode;

*** 174,184 ****
--- 174,184 ----
      }
  
      @Override
      public ValueNode canonical(CanonicalizerTool tool, ValueNode forValue) {
          if (forValue.isConstant()) {
!             if (GeneratePIC.getValue(tool.getOptions())) {
                  // We always want uncompressed constants
                  return this;
              }
              int stableDimension = ((ConstantNode) forValue).getStableDimension();
              boolean isDefaultStable = ((ConstantNode) forValue).isDefaultStable();

*** 212,222 ****
--- 212,225 ----
                  result = hsGen.emitUncompress(gen.operand(getValue()), encoding, nonNull);
                  break;
              default:
                  throw GraalError.shouldNotReachHere();
          }
+ 
          gen.setResult(this, result);
      }
  
      @NodeIntrinsic
!     public static native Object compression(@ConstantNodeParameter CompressionOp op, Object object, @ConstantNodeParameter CompressEncoding encoding);
+     @Override
!     public boolean mayNullCheckSkipConversion() {
+         return true;
+     }
  }