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

6857661: 64-bit server VM: assert(is_Initialize(),"invalid node class")

Browse Source 
Move the secondary raw memory barrier to the correct place in generate_arraycopy().

Reviewed-by: never
This commit is contained in:
Vladimir Kozlov 2009-07-06 15:53:30 -07:00
parent 92d332e08b
commit 5a1032d9e6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hotspot/src/share/vm/opto/library_call.cpp
View File

@ -4500,27 +4500,27 @@ LibraryCallKit::generate_arraycopy(const TypePtr* adr_type,
generate_negative_guard(copy_length, slow_region); generate_negative_guard(copy_length, slow_region);
} }
// copy_length is 0.
if (!stopped() && must_clear_dest) { if (!stopped() && must_clear_dest) {
Node* dest_length = alloc->in(AllocateNode::ALength); Node* dest_length = alloc->in(AllocateNode::ALength);
if (_gvn.eqv_uncast(copy_length, dest_length) if (_gvn.eqv_uncast(copy_length, dest_length)
|| _gvn.find_int_con(dest_length, 1) <= 0) { || _gvn.find_int_con(dest_length, 1) <= 0) {
// There is no zeroing to do. // There is no zeroing to do. No need for a secondary raw memory barrier.
} else { } else {
// Clear the whole thing since there are no source elements to copy. // Clear the whole thing since there are no source elements to copy.
generate_clear_array(adr_type, dest, basic_elem_type, generate_clear_array(adr_type, dest, basic_elem_type,
intcon(0), NULL, intcon(0), NULL,
alloc->in(AllocateNode::AllocSize)); alloc->in(AllocateNode::AllocSize));
// Use a secondary InitializeNode as raw memory barrier.
// Currently it is needed only on this path since other
// paths have stub or runtime calls as raw memory barriers.
InitializeNode* init = insert_mem_bar_volatile(Op_Initialize,
Compile::AliasIdxRaw,
top())->as_Initialize();
init->set_complete(&_gvn); // (there is no corresponding AllocateNode)
} }
} }
// Use a secondary InitializeNode as raw memory barrier.
// Currently it is needed only on this path since other
// paths have stub or runtime calls as raw memory barriers.
InitializeNode* init = insert_mem_bar_volatile(Op_Initialize,
Compile::AliasIdxRaw,
top())->as_Initialize();
init->set_complete(&_gvn); // (there is no corresponding AllocateNode)
// Present the results of the fast call. // Present the results of the fast call.
result_region->init_req(zero_path, control()); result_region->init_req(zero_path, control());
result_i_o ->init_req(zero_path, i_o()); result_i_o ->init_req(zero_path, i_o());