diff -r 5cebeef576b2 -r 7030aea81558 hotspot/src/share/vm/oops/instanceKlass.cpp
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Tue Jun 20 17:00:07 2017 +0800
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Wed Jun 21 10:28:27 2017 -0700
@@ -1954,7 +1954,7 @@
 bool InstanceKlass::should_store_fingerprint() {
 #if INCLUDE_AOT
   // We store the fingerprint into the InstanceKlass only in the following 2 cases:
-  if (EnableJVMCI && !UseJVMCICompiler) {
+  if (CalculateClassFingerprint) {
     // (1) We are running AOT to generate a shared library.
     return true;
   }