--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java	Tue Aug 23 22:58:50 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java	Tue Aug 23 23:42:00 2016 +0200
@@ -716,18 +716,16 @@
 
     }
 
-    // Lazily initialized.
-    private static String[] signaturePolymorphicHolders;
+    static class Lazy {
+        static final String[] signaturePolymorphicHolders = compilerToVM().getSignaturePolymorphicHolders();
+    }
 
     /**
      * Determines if {@code type} contains signature polymorphic methods.
      */
     private static boolean isSignaturePolymorphicHolder(final HotSpotResolvedObjectTypeImpl type) {
         String name = type.getName();
-        if (signaturePolymorphicHolders == null) {
-            signaturePolymorphicHolders = compilerToVM().getSignaturePolymorphicHolders();
-        }
-        for (String holder : signaturePolymorphicHolders) {
+        for (String holder : Lazy.signaturePolymorphicHolders) {
             if (name.equals(holder)) {
                 return true;
             }