--- a/hotspot/src/share/vm/code/codeCache.hpp	Thu Feb 09 19:08:32 2017 -0800
+++ b/hotspot/src/share/vm/code/codeCache.hpp	Fri Feb 10 08:16:49 2017 +0100
@@ -304,11 +304,10 @@
     // If set to NULL, initialized by first call to next()
     _code_blob = (CodeBlob*)nm;
     if (nm != NULL) {
-      address start = nm->code_begin();
-      while(!(*_heap)->contains(start)) {
+      while(!(*_heap)->contains_blob(_code_blob)) {
         ++_heap;
       }
-      assert((*_heap)->contains(start), "match not found");
+      assert((*_heap)->contains_blob(_code_blob), "match not found");
     }
   }