comparison src/share/vm/opto/loopTransform.cpp @ 23660:b5f3a471e646

Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 01 Jun 2016 00:11:44 +0200
parents dd9cc155639c 192643caadca
children f13e777eb255
comparison
equal deleted inserted replaced
23411:d7cf78885a3a 23660:b5f3a471e646
1737 if (p_offset != NULL) { 1737 if (p_offset != NULL) {
1738 *p_offset = exp->in(2); 1738 *p_offset = exp->in(2);
1739 } 1739 }
1740 return true; 1740 return true;
1741 } 1741 }
1742 if (is_scaled_iv(exp->in(2), iv, p_scale)) {
1743 if (p_offset != NULL) {
1744 *p_offset = exp->in(1);
1745 }
1746 return true;
1747 }
1742 if (exp->in(2)->is_Con()) { 1748 if (exp->in(2)->is_Con()) {
1743 Node* offset2 = NULL; 1749 Node* offset2 = NULL;
1744 if (depth < 2 && 1750 if (depth < 2 &&
1745 is_scaled_iv_plus_offset(exp->in(1), iv, p_scale, 1751 is_scaled_iv_plus_offset(exp->in(1), iv, p_scale,
1746 p_offset != NULL ? &offset2 : NULL, depth+1)) { 1752 p_offset != NULL ? &offset2 : NULL, depth+1)) {