Mercurial > hg > truffle
comparison src/share/vm/opto/macro.cpp @ 349:73278b62f36c
6718811: Mismerge of 6680469:macro.cpp
Summary: Fixed the mismerge by deleting the lines that were inadvertently left in place.
Reviewed-by: iveresov
author | ysr |
---|---|
date | Thu, 26 Jun 2008 11:43:34 -0700 |
parents | 6aae2f9d0294 |
children | fab5f738c515 |
comparison
equal
deleted
inserted
replaced
348:69fefd031e6c | 349:73278b62f36c |
---|---|
917 // optimize it to the raw slice. | 917 // optimize it to the raw slice. |
918 if (mem->is_MergeMem()) { | 918 if (mem->is_MergeMem()) { |
919 mem = mem->as_MergeMem()->memory_at(Compile::AliasIdxRaw); | 919 mem = mem->as_MergeMem()->memory_at(Compile::AliasIdxRaw); |
920 } | 920 } |
921 | 921 |
922 Node* eden_top_adr; | |
923 Node* eden_end_adr; | |
924 set_eden_pointers(eden_top_adr, eden_end_adr); | |
925 | |
926 assert(ctrl != NULL, "must have control"); | 922 assert(ctrl != NULL, "must have control"); |
927 // We need a Region and corresponding Phi's to merge the slow-path and fast-path results. | 923 // We need a Region and corresponding Phi's to merge the slow-path and fast-path results. |
928 // they will not be used if "always_slow" is set | 924 // they will not be used if "always_slow" is set |
929 enum { slow_result_path = 1, fast_result_path = 2 }; | 925 enum { slow_result_path = 1, fast_result_path = 2 }; |
930 Node *result_region; | 926 Node *result_region; |