6718811: Mismerge of 6680469:macro.cpp
Summary: Fixed the mismerge by deleting the lines that were inadvertently left in place.
Reviewed-by: iveresov
--- a/hotspot/src/share/vm/opto/macro.cpp Tue Jun 24 13:20:34 2008 -0700
+++ b/hotspot/src/share/vm/opto/macro.cpp Thu Jun 26 11:43:34 2008 -0700
@@ -919,10 +919,6 @@
mem = mem->as_MergeMem()->memory_at(Compile::AliasIdxRaw);
}
- Node* eden_top_adr;
- Node* eden_end_adr;
- set_eden_pointers(eden_top_adr, eden_end_adr);
-
assert(ctrl != NULL, "must have control");
// We need a Region and corresponding Phi's to merge the slow-path and fast-path results.
// they will not be used if "always_slow" is set