--- old/src/share/vm/opto/callGenerator.cpp	2014-05-14 16:33:37.000000000 -0700
+++ new/src/share/vm/opto/callGenerator.cpp	2014-05-14 16:33:37.000000000 -0700
@@ -391,7 +391,7 @@
   }
 
   // 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);