Skip to content

Commit

Permalink
[C2] Backport JDK-8010500: Possible null pointer dereference at hotsp…
Browse files Browse the repository at this point in the history
…ot/src/share/vm/opto/loopnode.hpp

Summary:  Added NULL check for loopnode() in get_pre_loop_end()
Backport the fix for JDK-8010500 (https://hg.openjdk.java.net/jdk9/jdk9/hotspot/rev/4e7ee57b57bf) from OpenJDK.

Test Plan: none

Reviewed-by: kuaiwei, luchsh

Issue: dragonwell-project/dragonwell8#13
  • Loading branch information
Xiaoming Gu committed Jun 14, 2019
1 parent 66011f3 commit a3c8e68
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/share/vm/opto/superword.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ bool SuperWord::ref_is_alignable(SWPointer& p) {
return true; // no induction variable
}
CountedLoopEndNode* pre_end = get_pre_loop_end(lp()->as_CountedLoop());
assert(pre_end != NULL, "we must have a correct pre-loop");
assert(pre_end->stride_is_con(), "pre loop stride is constant");
int preloop_stride = pre_end->stride_con();

Expand Down Expand Up @@ -2050,7 +2051,7 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
CountedLoopNode *main_head = lp()->as_CountedLoop();
assert(main_head->is_main_loop(), "");
CountedLoopEndNode* pre_end = get_pre_loop_end(main_head);
assert(pre_end != NULL, "");
assert(pre_end != NULL, "we must have a correct pre-loop");
Node *pre_opaq1 = pre_end->limit();
assert(pre_opaq1->Opcode() == Op_Opaque1, "");
Opaque1Node *pre_opaq = (Opaque1Node*)pre_opaq1;
Expand Down Expand Up @@ -2214,7 +2215,8 @@ CountedLoopEndNode* SuperWord::get_pre_loop_end(CountedLoopNode *cl) {
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();
if (!pre_end->loopnode()->is_pre_loop()) return NULL;
CountedLoopNode* loop_node = pre_end->loopnode();
if (loop_node == NULL || !loop_node->is_pre_loop()) return NULL;
return pre_end;
}

Expand Down

0 comments on commit a3c8e68

Please sign in to comment.