--- a/hotspot/src/share/vm/opto/parse1.cpp	Mon May 02 12:14:26 2016 -0400
+++ b/hotspot/src/share/vm/opto/parse1.cpp	Tue May 03 22:45:27 2016 +0200
@@ -261,7 +261,7 @@
   Node *locals_addr = basic_plus_adr(osr_buf, osr_buf, (max_locals-1)*wordSize);
 
   // find all the locals that the interpreter thinks contain live oops
-  const BitMap live_oops = method()->live_local_oops_at_bci(osr_bci());
+  const ResourceBitMap live_oops = method()->live_local_oops_at_bci(osr_bci());
   for (index = 0; index < max_locals; index++) {
 
     if (!live_locals.at(index)) {