archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6701887: JDK7 server VM in endless loop in Node::dominates

Browse source 
The method Node::dominates loops in the dead code which does not have a Region node.

Reviewed-by: jrose, never
This commit is contained in:
Vladimir Kozlov 2008-05-15 22:43:11 -07:00
parent 9bcba384cb
commit 60c74ba115
3 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hotspot/src/share/vm/opto/memnode.cpp
View file

@ -256,7 +256,7 @@ bool MemNode::all_controls_dominate(Node* dom, Node* sub) {
if (dom == NULL || dom->is_top())
return false; // Conservative answer for dead code
if (dom->is_Start() || dom->is_Root() || dom == sub)
if (dom->is_Con() || dom->is_Start() || dom->is_Root() || dom == sub)
return true;
// 'dom' dominates 'sub' if its control edge and control edges
@ -298,7 +298,7 @@ bool MemNode::all_controls_dominate(Node* dom, Node* sub) {
return false; // Conservative answer for dead code
assert(n->is_CFG(), "expecting control");
}
if (n->is_Start() || n->is_Root()) {
if (n->is_Con() || n->is_Start() || n->is_Root()) {
only_dominating_controls = true;
} else if (n->is_CFG()) {
if (n->dominates(sub, nlist))
@ -308,12 +308,11 @@ bool MemNode::all_controls_dominate(Node* dom, Node* sub) {
} else {
// First, own control edge.
Node* m = n->find_exact_control(n->in(0));
if (m == NULL)
continue;
if (m->is_top())
return false; // Conservative answer for dead code
dom_list.push(m);
if (m != NULL) {
if (m->is_top())
return false; // Conservative answer for dead code
dom_list.push(m);
}
// Now, the rest of edges.
uint cnt = n->req();
for (uint i = 1; i < cnt; i++) {