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

6916062: assert(_inserts <= _insert_limit,"hash table overflow") in NodeHash::hash_insert

Browse source 
Missing check for not empty worklist when puting memory node back on worklist and expecting address type update.

Reviewed-by: never
This commit is contained in:
Vladimir Kozlov 2010-09-30 18:31:45 -07:00
parent 8309071a08
commit 7cc55737b6
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -256,7 +256,8 @@ Node *MemNode::Ideal_common(PhaseGVN *phase, bool can_reshape) {
if( t_adr == Type::TOP ) return NodeSentinel; // caller will return NULL if( t_adr == Type::TOP ) return NodeSentinel; // caller will return NULL
if( can_reshape && igvn != NULL && if( can_reshape && igvn != NULL &&
(igvn->_worklist.member(address) || phase->type(address) != adr_type()) ) { (igvn->_worklist.member(address) ||
igvn->_worklist.size() > 0 && (phase->type(address) != adr_type())) ) {
// The address's base and type may change when the address is processed. // The address's base and type may change when the address is processed.
// Delay this mem node transformation until the address is processed. // Delay this mem node transformation until the address is processed.
phase->is_IterGVN()->_worklist.push(this); phase->is_IterGVN()->_worklist.push(this);

23
hotspot/src/share/vm/opto/phaseX.cpp
View file

@ -844,10 +844,33 @@ void PhaseIterGVN::optimize() {
} }
#endif #endif
#ifdef ASSERT
Node* prev = NULL;
uint rep_cnt = 0;
#endif
uint loop_count = 0;
// Pull from worklist; transform node; // Pull from worklist; transform node;
// If node has changed: update edge info and put uses on worklist. // If node has changed: update edge info and put uses on worklist.
while( _worklist.size() ) { while( _worklist.size() ) {
Node *n = _worklist.pop(); Node *n = _worklist.pop();
if (++loop_count >= K * C->unique()) {
debug_only(n->dump(4);)
assert(false, "infinite loop in PhaseIterGVN::optimize");
C->record_method_not_compilable("infinite loop in PhaseIterGVN::optimize");
return;
}
#ifdef ASSERT
if (n == prev) {
if (++rep_cnt > 3) {
n->dump(4);
assert(false, "loop in Ideal transformation");
}
} else {
rep_cnt = 0;
}
prev = n;
#endif
if (TraceIterativeGVN && Verbose) { if (TraceIterativeGVN && Verbose) {
tty->print(" Pop "); tty->print(" Pop ");
NOT_PRODUCT( n->dump(); ) NOT_PRODUCT( n->dump(); )