archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-24 04:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8129094: assert(is_java_primitive(bt)) failed: only primitive type vectors

Browse source 
Ignored non-primitive type memory operation regardless its (or its inputs) control.

Reviewed-by: roland, mcberg
This commit is contained in:
Vladimir Kozlov 2015-06-18 11:09:29 -07:00
parent c4c528df14
commit d62598136b
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hotspot/src/share/vm/opto/superword.cpp
View file

@ -184,18 +184,17 @@ void SuperWord::unrolling_analysis(CountedLoopNode *cl, int &local_loop_unroll_f
} }
if (n->is_Mem()) { if (n->is_Mem()) {
MemNode* current = n->as_Mem();
BasicType bt = current->memory_type();
if (is_java_primitive(bt) == false) {
ignored_loop_nodes[i] = n->_idx;
continue;
}
Node* adr = n->in(MemNode::Address); Node* adr = n->in(MemNode::Address);
Node* n_ctrl = _phase->get_ctrl(adr); Node* n_ctrl = _phase->get_ctrl(adr);
// save a queue of post process nodes // save a queue of post process nodes
if (n_ctrl != NULL && lpt()->is_member(_phase->get_loop(n_ctrl))) { if (n_ctrl != NULL && lpt()->is_member(_phase->get_loop(n_ctrl))) {
MemNode* current = n->as_Mem();
BasicType bt = current->memory_type();
if (is_java_primitive(bt) == false) {
ignored_loop_nodes[i] = n->_idx;
continue;
}
// Process the memory expression // Process the memory expression
int stack_idx = 0; int stack_idx = 0;
bool have_side_effects = true; bool have_side_effects = true;
@ -234,8 +233,7 @@ void SuperWord::unrolling_analysis(CountedLoopNode *cl, int &local_loop_unroll_f
Node* n = lpt()->_body.at(i); Node* n = lpt()->_body.at(i);
if (n->is_Store()) { if (n->is_Store()) {
bt = n->as_Mem()->memory_type(); bt = n->as_Mem()->memory_type();
} } else {
else {
bt = n->bottom_type()->basic_type(); bt = n->bottom_type()->basic_type();
} }