--- a/hotspot/src/share/vm/classfile/classLoader.cpp	Wed May 24 17:30:45 2017 -0700
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp	Thu May 25 09:38:33 2017 +0200
@@ -1945,7 +1945,7 @@
             if (can_be_compiled(m, comp_level)) {
               if (++_codecache_sweep_counter == CompileTheWorldSafepointInterval) {
                 // Give sweeper a chance to keep up with CTW
-                VM_ForceSafepoint op;
+                VM_CTWThreshold op;
                 VMThread::execute(&op);
                 _codecache_sweep_counter = 0;
               }