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

8131675: EA fails with assert(false) failed: not unsafe or G1 barrier raw StoreP

Browse Source 
Reviewed-by: roland
This commit is contained in:
Vladimir Ivanov 2015-07-22 20:23:53 +03:00
parent 1e08e6133d
commit 259aeb3399
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,7 +526,7 @@ void ConnectionGraph::add_node_to_connection_graph(Node *n, Unique_Node_List *de
if (adr->is_BoxLock())
break;
// Stored value escapes in unsafe access.
if ((opcode == Op_StoreP) && (adr_type == TypeRawPtr::BOTTOM)) {
if ((opcode == Op_StoreP) && adr_type->isa_rawptr()) {
// Pointer stores in G1 barriers looks like unsafe access.
// Ignore such stores to be able scalar replace non-escaping
// allocations.
@ -540,11 +540,11 @@ void ConnectionGraph::add_node_to_connection_graph(Node *n, Unique_Node_List *de
int offs = (int)igvn->find_intptr_t_con(adr->in(AddPNode::Offset), Type::OffsetBot);
if (offs == in_bytes(JavaThread::satb_mark_queue_offset() +
PtrQueue::byte_offset_of_buf())) {
break; // G1 pre barier previous oop value store.
break; // G1 pre barrier previous oop value store.
}
if (offs == in_bytes(JavaThread::dirty_card_queue_offset() +
PtrQueue::byte_offset_of_buf())) {
break; // G1 post barier card address store.
break; // G1 post barrier card address store.
}
}
}
@ -725,7 +725,7 @@ void ConnectionGraph::add_final_edges(Node *n) {
assert(ptn != NULL, "node should be registered");
add_edge(adr_ptn, ptn);
break;
} else if ((opcode == Op_StoreP) && (adr_type == TypeRawPtr::BOTTOM)) {
} else if ((opcode == Op_StoreP) && adr_type->isa_rawptr()) {
// Stored value escapes in unsafe access.
Node *val = n->in(MemNode::ValueIn);
PointsToNode* ptn = ptnode_adr(val->_idx);