*** old/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java	Tue Apr 28 11:53:30 2015
--- new/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java	Tue Apr 28 11:53:30 2015

*** 392,402 ****
--- 392,402 ----
        // For C1, the runtime stub might not have oop maps, so set this flag
        // outside of update_register_map.
        map.setIncludeArgumentOops(cb.callerMustGCArguments());
  
        if (cb.getOopMaps() != null) {
!         ImmutableOopMapSet.updateRegisterMap(this, cb, map, true);
        }
  
        // Since the prolog does the save and restore of EBP there is no oopmap
        // for it so we must fill in its location as if there was an oopmap entry
        // since if our caller was compiled code there could be live jvm state in it.