--- a/hotspot/src/share/vm/code/codeCache.cpp	Thu Feb 09 19:08:32 2017 -0800
+++ b/hotspot/src/share/vm/code/codeCache.cpp	Fri Feb 10 08:16:49 2017 +0100
@@ -417,7 +417,7 @@
 CodeHeap* CodeCache::get_code_heap(const CodeBlob* cb) {
   assert(cb != NULL, "CodeBlob is null");
   FOR_ALL_HEAPS(heap) {
-    if ((*heap)->contains(cb->code_begin())) {
+    if ((*heap)->contains_blob(cb)) {
       return *heap;
     }
   }