stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6679854: assert in escape.cpp:397

Browse Source 
The assert misses the case CastX2P 'base' for an unsafe field reference

Reviewed-by: never, jrose
This commit is contained in:
Vladimir Kozlov 2008-03-27 09:12:54 -07:00
parent 446895de2d
commit fb63e29743
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hotspot/src/share/vm/opto/escape.cpp
View File

@ -51,21 +51,21 @@ void PointsToNode::remove_edge(uint targIdx, PointsToNode::EdgeType et) {
} }
#ifndef PRODUCT #ifndef PRODUCT
static char *node_type_names[] = { static const char *node_type_names[] = {
"UnknownType", "UnknownType",
"JavaObject", "JavaObject",
"LocalVar", "LocalVar",
"Field" "Field"
}; };
static char *esc_names[] = { static const char *esc_names[] = {
"UnknownEscape", "UnknownEscape",
"NoEscape", "NoEscape",
"ArgEscape", "ArgEscape",
"GlobalEscape" "GlobalEscape"
}; };
static char *edge_type_suffix[] = { static const char *edge_type_suffix[] = {
"?", // UnknownEdge "?", // UnknownEdge
"P", // PointsToEdge "P", // PointsToEdge
"D", // DeferredEdge "D", // DeferredEdge
@ -383,18 +383,25 @@ static Node* get_addp_base(Node *addp) {
// | | // | |
// AddP ( base == address ) // AddP ( base == address )
// //
// case #6. Constant Pool or ThreadLocal or Raw object's field reference: // case #6. Constant Pool, ThreadLocal, CastX2P or
// ConP # Object from Constant Pool. // Raw object's field reference:
// {ConP, ThreadLocal, CastX2P, raw Load}
// top | // top |
// \ | // \ |
// AddP ( base == top ) // AddP ( base == top )
// //
// case #7. Klass's field reference.
// LoadKlass
// | |
// AddP ( base == address )
//
Node *base = addp->in(AddPNode::Base)->uncast(); Node *base = addp->in(AddPNode::Base)->uncast();
if (base->is_top()) { // The AddP case #3 and #6. if (base->is_top()) { // The AddP case #3 and #6.
base = addp->in(AddPNode::Address)->uncast(); base = addp->in(AddPNode::Address)->uncast();
assert(base->Opcode() == Op_ConP || base->Opcode() == Op_ThreadLocal || assert(base->Opcode() == Op_ConP || base->Opcode() == Op_ThreadLocal ||
base->is_Mem() && base->bottom_type() == TypeRawPtr::NOTNULL || base->Opcode() == Op_CastX2P ||
base->is_Proj() && base->in(0)->is_Allocate(), "sanity"); (base->is_Mem() && base->bottom_type() == TypeRawPtr::NOTNULL) ||
(base->is_Proj() && base->in(0)->is_Allocate()), "sanity");
} }
return base; return base;
} }