*** old/src/share/vm/opto/macro.cpp	Thu Feb 26 14:14:01 2009
--- new/src/share/vm/opto/macro.cpp	Thu Feb 26 14:14:01 2009

*** 62,71 ****
--- 62,72 ----
      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_in->set_req(0, newcall->in(0)); // reset control edge
          new_in = transform_later(new_in); // Register new node.
        }
        old_in = new_in;
      }
      newcall->add_req(old_in);