From a0b0fb42fdcda30e16276872bf74ec1f3ea71515 Mon Sep 17 00:00:00 2001 From: "Y. Srinivas Ramakrishna" Date: Thu, 26 Jun 2008 11:43:34 -0700 Subject: [PATCH] 6718811: Mismerge of 6680469:macro.cpp Fixed the mismerge by deleting the lines that were inadvertently left in place. Reviewed-by: iveresov --- hotspot/src/share/vm/opto/macro.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hotspot/src/share/vm/opto/macro.cpp b/hotspot/src/share/vm/opto/macro.cpp index 908f071634a..87be89bca4d 100644 --- a/hotspot/src/share/vm/opto/macro.cpp +++ b/hotspot/src/share/vm/opto/macro.cpp @@ -919,10 +919,6 @@ void PhaseMacroExpand::expand_allocate_common( 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