OpenJDK / bsd-port / jdk9 / hotspot
changeset 8732:46c49754f4b4
8131675: EA fails with assert(false) failed: not unsafe or G1 barrier raw StoreP
Reviewed-by: roland
| author | vlivanov |
|---|---|
| date | Wed, 22 Jul 2015 20:23:53 +0300 |
| parents | 0d3c20ac648e |
| children | 0a3d4779fd89 89a220e70e99 |
| files | src/share/vm/opto/escape.cpp |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/escape.cpp Fri Jul 17 14:51:28 2015 -0700 +++ b/src/share/vm/opto/escape.cpp Wed Jul 22 20:23:53 2015 +0300 @@ -526,7 +526,7 @@ 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 @@ 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 @@ 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);