--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java	Mon Dec 12 16:16:27 2016 +0300
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java	Wed Mar 22 13:42:45 2017 -0700
@@ -90,7 +90,7 @@
 
     @Override
     public ValueNode canonical(CanonicalizerTool tool) {
-        if (!GeneratePIC.getValue()) {
+        if (!GeneratePIC.getValue(tool.getOptions())) {
             MetaAccessProvider metaAccess = tool.getMetaAccess();
             ValueNode curValue = getValue();
             ValueNode newNode = findSynonym(curValue, stamp(), metaAccess, tool.getConstantReflection());
@@ -102,7 +102,7 @@
     }
 
     public static ValueNode findSynonym(ValueNode curValue, Stamp stamp, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) {
-        if (!GeneratePIC.getValue()) {
+        if (!GeneratePIC.getValue(curValue.getOptions())) {
             TypeReference type = StampTool.typeReferenceOrNull(curValue);
             if (type != null && type.isExact()) {
                 return ConstantNode.forConstant(stamp, constantReflection.asObjectHub(type.getType()), metaAccess);
@@ -113,7 +113,7 @@
 
     @Override
     public void virtualize(VirtualizerTool tool) {
-        if (!GeneratePIC.getValue()) {
+        if (!GeneratePIC.getValue(tool.getOptions())) {
             ValueNode alias = tool.getAlias(getValue());
             TypeReference type = StampTool.typeReferenceOrNull(alias);
             if (type != null && type.isExact()) {