diff options
author | thartmann <unknown> | 2019-10-08 15:38:35 +0200 |
---|---|---|
committer | bell-sw <liberica@bell-sw.com> | 2020-01-19 09:12:35 +0300 |
commit | 94d175d6a456974def4a2beb02f370d59d5720ea (patch) | |
tree | e1d795dd0f8d4cbe093251c4ac9af851e74b6428 | |
parent | 9fb289127dbdbe8d9a9654c57f5d69ada7294a97 (diff) | |
download | jdk8u_hotspot-94d175d6a456974def4a2beb02f370d59d5720ea.tar.gz |
8134739: compiler/loopopts/superword/TestVectorizationWithInvariant crashes in loop opts
Summary: Bail out of superword optimization if loop was removed (i.e., if zero-trip Opaque1Node was removed).
Reviewed-by: kvn, roland
-rw-r--r-- | src/share/vm/opto/loopnode.hpp | 1 | ||||
-rw-r--r-- | src/share/vm/opto/superword.cpp | 20 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/share/vm/opto/loopnode.hpp b/src/share/vm/opto/loopnode.hpp index 0ce98a063..032f94e67 100644 --- a/src/share/vm/opto/loopnode.hpp +++ b/src/share/vm/opto/loopnode.hpp @@ -279,6 +279,7 @@ public: if (iv_phi == NULL) { return NULL; } + assert(iv_phi->is_Phi(), "should be PhiNode"); Node *ln = iv_phi->in(0); if (ln->is_CountedLoop() && ln->as_CountedLoop()->loopexit() == this) { return (CountedLoopNode*)ln; diff --git a/src/share/vm/opto/superword.cpp b/src/share/vm/opto/superword.cpp index e24d67f1d..78d9743ec 100644 --- a/src/share/vm/opto/superword.cpp +++ b/src/share/vm/opto/superword.cpp @@ -2208,15 +2208,25 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) { //----------------------------get_pre_loop_end--------------------------- // Find pre loop end from main loop. Returns null if none. -CountedLoopEndNode* SuperWord::get_pre_loop_end(CountedLoopNode *cl) { - Node *ctrl = cl->in(LoopNode::EntryControl); +CountedLoopEndNode* SuperWord::get_pre_loop_end(CountedLoopNode* cl) { + Node* ctrl = cl->in(LoopNode::EntryControl); if (!ctrl->is_IfTrue() && !ctrl->is_IfFalse()) return NULL; - Node *iffm = ctrl->in(0); + Node* iffm = ctrl->in(0); if (!iffm->is_If()) return NULL; - Node *p_f = iffm->in(0); + Node* bolzm = iffm->in(1); + if (!bolzm->is_Bool()) return NULL; + Node* cmpzm = bolzm->in(1); + if (!cmpzm->is_Cmp()) return NULL; + Node* opqzm = cmpzm->in(2); + // Can not optimize a loop if zero-trip Opaque1 node is optimized + // away and then another round of loop opts attempted. + if (opqzm->Opcode() != Op_Opaque1) { + return NULL; + } + Node* p_f = iffm->in(0); if (!p_f->is_IfFalse()) return NULL; if (!p_f->in(0)->is_CountedLoopEnd()) return NULL; - CountedLoopEndNode *pre_end = p_f->in(0)->as_CountedLoopEnd(); + CountedLoopEndNode* pre_end = p_f->in(0)->as_CountedLoopEnd(); CountedLoopNode* loop_node = pre_end->loopnode(); if (loop_node == NULL || !loop_node->is_pre_loop()) return NULL; return pre_end; |