提交 372bc0a1 编写于 作者: Y ysr

6718811: Mismerge of 6680469:macro.cpp

Summary: Fixed the mismerge by deleting the lines that were inadvertently left in place.
Reviewed-by: iveresov
上级 c5234d8d
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册