--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java	2017-07-07 09:30:20.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java	2017-07-07 09:30:19.000000000 -0700
@@ -42,7 +42,6 @@
 import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.FingerprintUtil;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode;
 import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
@@ -148,7 +147,7 @@
                         return false;
                     }
                     // check if the holder has a valid fingerprint
-                    if (FingerprintUtil.getFingerprint((HotSpotResolvedObjectType) method.getDeclaringClass()) == 0) {
+                    if (((HotSpotResolvedObjectType) method.getDeclaringClass()).getFingerprint() == 0) {
                         // Deopt otherwise
                         b.append(new DeoptimizeNode(InvalidateRecompile, Unresolved));
                         return true;
@@ -163,7 +162,7 @@
                             if (clazz.equals(String.class)) {
                                 return false;
                             }
-                            if (Class.class.isAssignableFrom(clazz) && FingerprintUtil.getFingerprint((HotSpotResolvedObjectType) type) != 0) {
+                            if (Class.class.isAssignableFrom(clazz) && ((HotSpotResolvedObjectType) type).getFingerprint() != 0) {
                                 return false;
                             }
                             b.append(new DeoptimizeNode(InvalidateRecompile, Unresolved));