*** old/src/share/vm/opto/macro.cpp	Mon Aug 19 17:42:53 2013
--- new/src/share/vm/opto/macro.cpp	Mon Aug 19 17:42:53 2013

*** 70,88 ****
--- 70,90 ----
    uint old_dbg_start = oldcall->tf()->domain()->cnt();
    uint new_dbg_start = newcall->tf()->domain()->cnt();
    int jvms_adj  = new_dbg_start - old_dbg_start;
    assert (new_dbg_start == newcall->req(), "argument count mismatch");
  
+   // SafePointScalarObject node could be referenced several times in debug info.
+   // Use Dict to record cloned nodes.
    Dict* sosn_map = new Dict(cmpkey,hashkey);
    for (uint i = old_dbg_start; i < oldcall->req(); i++) {
      Node* old_in = oldcall->in(i);
      // Clone old SafePointScalarObjectNodes, adjusting their field contents.
      if (old_in != NULL && old_in->is_SafePointScalarObject()) {
        SafePointScalarObjectNode* old_sosn = old_in->as_SafePointScalarObject();
        uint old_unique = C->unique();
-       Node* new_in = old_sosn->clone(jvms_adj, sosn_map);
!       if (old_unique != C->unique()) { // New node?
          new_in->set_req(0, C->root()); // reset control edge
          new_in = transform_later(new_in); // Register new node.
        }
        old_in = new_in;
      }

*** 723,733 ****
--- 725,738 ----
    // Process the safepoint uses
    //
    while (safepoints.length() > 0) {
      SafePointNode* sfpt = safepoints.pop();
      Node* mem = sfpt->memory();
!     uint first_ind = sfpt->req();
!     assert(sfpt->jvms() != NULL, "missed JVMS");
+     // Fields of scalar objs are referenced only at the end
+     // of regular debuginfo at the last (youngest) JVMS.
+     uint first_ind = (sfpt->req() - sfpt->jvms()->scloff());
      SafePointScalarObjectNode* sobj = new (C) SafePointScalarObjectNode(res_type,
  #ifdef ASSERT
                                                   alloc,
  #endif
                                                   first_ind, nfields);

*** 797,807 ****
--- 802,812 ----
            int start = jvms->debug_start();
            int end   = jvms->debug_end();
            for (int i = start; i < end; i++) {
              if (sfpt_done->in(i)->is_SafePointScalarObject()) {
                SafePointScalarObjectNode* scobj = sfpt_done->in(i)->as_SafePointScalarObject();
!               if (scobj->first_index(jvms) == sfpt_done->req() &&
                    scobj->n_fields() == (uint)nfields) {
                  assert(scobj->alloc() == alloc, "sanity");
                  sfpt_done->set_req(i, res);
                }
              }