*** old/src/share/vm/opto/callGenerator.cpp	Wed May 14 16:33:37 2014
--- new/src/share/vm/opto/callGenerator.cpp	Wed May 14 16:33:37 2014

*** 389,399 ****
--- 389,399 ----
      map->disconnect_inputs(NULL, C);
      return;
    }
  
    // Setup default node notes to be picked up by the inlining
!   Node_Notes* old_nn = C->default_node_notes();
!   Node_Notes* old_nn = C->node_notes_at(call->_idx);
    if (old_nn != NULL) {
      Node_Notes* entry_nn = old_nn->clone(C);
      entry_nn->set_jvms(jvms);
      C->set_default_node_notes(entry_nn);
    }