--- a/hotspot/src/share/vm/runtime/interfaceSupport.cpp	Fri Apr 24 10:49:38 2015 +0200
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.cpp	Tue May 05 16:50:25 2015 +0200
@@ -239,7 +239,7 @@
     CodeBlob* cb = sfs.current()->cb();
     if (cb != NULL && cb->oop_maps() ) {
       // Find oopmap for current method
-      OopMap* map = cb->oop_map_for_return_address(sfs.current()->pc());
+      const ImmutableOopMap* map = cb->oop_map_for_return_address(sfs.current()->pc());
       assert(map != NULL, "no oopmap found for pc");
       found = map->has_derived_pointer();
     }