archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6718811: Mismerge of 6680469:macro.cpp

Browse source 
Fixed the mismerge by deleting the lines that were inadvertently left in place.

Reviewed-by: iveresov
This commit is contained in:
Y. Srinivas Ramakrishna 2008-06-26 11:43:34 -07:00
parent f521ab4f1a
commit a0b0fb42fd
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/opto/macro.cpp
View file

@ -919,10 +919,6 @@ void PhaseMacroExpand::expand_allocate_common(
mem = mem->as_MergeMem()->memory_at(Compile::AliasIdxRaw); 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"); assert(ctrl != NULL, "must have control");
// We need a Region and corresponding Phi's to merge the slow-path and fast-path results. // 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 // they will not be used if "always_slow" is set