--- a/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp	Thu Nov 22 09:55:44 2018 +0100
+++ b/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp	Thu Nov 22 10:01:38 2018 +0100
@@ -228,8 +228,8 @@
   // can be safely skipped.
   MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
   // Iterate over non-profiled and profiled nmethods
-  NMethodIterator iter;
-  while(iter.next_alive()) {
+  NMethodIterator iter(NMethodIterator::only_alive_and_not_unloading);
+  while(iter.next()) {
     nmethod* current = iter.method();
     // Lock the nmethod so it can't be freed
     nmethodLocker nml(current);