--- a/hotspot/src/share/vm/opto/output.cpp	Tue Jun 24 10:43:29 2008 -0700
+++ b/hotspot/src/share/vm/opto/output.cpp	Tue Jun 24 16:00:14 2008 -0700
@@ -447,6 +447,7 @@
             // We've got a winner.  Replace this branch.
             MachNode *replacement = mach->short_branch_version(this);
             b->_nodes.map(j, replacement);
+            mach->subsume_by(replacement);
 
             // Update the jmp_end size to save time in our
             // next pass.