--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Fri Apr 24 10:49:38 2015 +0200
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Tue May 05 16:50:25 2015 +0200
@@ -1018,7 +1018,7 @@
           // NOTE we use pc() not original_pc() because we already know they are
           // identical otherwise we'd have never entered this block of code
 
-          OopMap* map = caller_code->oop_map_for_return_address(caller_frame.pc());
+          const ImmutableOopMap* map = caller_code->oop_map_for_return_address(caller_frame.pc());
           assert(map != NULL, "null check");
           map->print();
           tty->cr();