1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8188785: CCP sets invalid type for java mirror load

Browse Source 
Added special case for java mirror load to propagate correct type information.

Reviewed-by: kvn
This commit is contained in:
Tobias Hartmann 2017-10-25 08:37:41 +02:00
parent ef5b012bf4
commit f8843b83da
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hotspot/share/opto/phaseX.cpp
View File

@ -1625,6 +1625,17 @@ void PhaseIterGVN::add_users_to_worklist( Node *n ) {
Node* imem = use->as_Initialize()->proj_out(TypeFunc::Memory);
if (imem != NULL) add_users_to_worklist0(imem);
}
// Loading the java mirror from a klass oop requires two loads and the type
// of the mirror load depends on the type of 'n'. See LoadNode::Value().
if (use_op == Op_LoadP && use->bottom_type()->isa_rawptr()) {
for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
Node* u = use->fast_out(i2);
const Type* ut = u->bottom_type();
if (u->Opcode() == Op_LoadP && ut->isa_instptr()) {
_worklist.push(u);
}
}
}
}
}
@ -1760,6 +1771,17 @@ void PhaseCCP::analyze() {
worklist.push(phi);
}
}
// Loading the java mirror from a klass oop requires two loads and the type
// of the mirror load depends on the type of 'n'. See LoadNode::Value().
if (m_op == Op_LoadP && m->bottom_type()->isa_rawptr()) {
for (DUIterator_Fast i2max, i2 = m->fast_outs(i2max); i2 < i2max; i2++) {
Node* u = m->fast_out(i2);
const Type* ut = u->bottom_type();
if (u->Opcode() == Op_LoadP && ut->isa_instptr() && ut != type(u)) {
worklist.push(u);
}
}
}
}
}
}