author | iveresov |
Thu, 22 Jan 2015 11:25:23 -0800 | |
changeset 28723 | 0a36120cb225 |
parent 28486 | b0df113b962e |
child 28927 | 48e4a707e777 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
22234
da823d78ad65
8029233: Update copyright year to match last edit in jdk8 hotspot repository for 2013
mikael
parents:
21089
diff
changeset
|
2 |
* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
1 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4582
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4582
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4582
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "memory/allocation.inline.hpp" |
|
27 |
#include "opto/addnode.hpp" |
|
28 |
#include "opto/cfgnode.hpp" |
|
29 |
#include "opto/connode.hpp" |
|
9101 | 30 |
#include "opto/loopnode.hpp" |
7397 | 31 |
#include "opto/phaseX.hpp" |
32 |
#include "opto/runtime.hpp" |
|
33 |
#include "opto/subnode.hpp" |
|
34 |
||
1 | 35 |
// Portions of code courtesy of Clifford Click |
36 |
||
37 |
// Optimization - Graph Style |
|
38 |
||
39 |
||
40 |
extern int explicit_null_checks_elided; |
|
41 |
||
42 |
//============================================================================= |
|
43 |
//------------------------------Value------------------------------------------ |
|
44 |
// Return a tuple for whichever arm of the IF is reachable |
|
45 |
const Type *IfNode::Value( PhaseTransform *phase ) const { |
|
46 |
if( !in(0) ) return Type::TOP; |
|
47 |
if( phase->type(in(0)) == Type::TOP ) |
|
48 |
return Type::TOP; |
|
49 |
const Type *t = phase->type(in(1)); |
|
50 |
if( t == Type::TOP ) // data is undefined |
|
51 |
return TypeTuple::IFNEITHER; // unreachable altogether |
|
52 |
if( t == TypeInt::ZERO ) // zero, or false |
|
53 |
return TypeTuple::IFFALSE; // only false branch is reachable |
|
54 |
if( t == TypeInt::ONE ) // 1, or true |
|
55 |
return TypeTuple::IFTRUE; // only true branch is reachable |
|
56 |
assert( t == TypeInt::BOOL, "expected boolean type" ); |
|
57 |
||
58 |
return TypeTuple::IFBOTH; // No progress |
|
59 |
} |
|
60 |
||
61 |
const RegMask &IfNode::out_RegMask() const { |
|
62 |
return RegMask::Empty; |
|
63 |
} |
|
64 |
||
65 |
//------------------------------split_if--------------------------------------- |
|
66 |
// Look for places where we merge constants, then test on the merged value. |
|
67 |
// If the IF test will be constant folded on the path with the constant, we |
|
68 |
// win by splitting the IF to before the merge point. |
|
69 |
static Node* split_if(IfNode *iff, PhaseIterGVN *igvn) { |
|
70 |
// I could be a lot more general here, but I'm trying to squeeze this |
|
71 |
// in before the Christmas '98 break so I'm gonna be kinda restrictive |
|
72 |
// on the patterns I accept. CNC |
|
73 |
||
74 |
// Look for a compare of a constant and a merged value |
|
75 |
Node *i1 = iff->in(1); |
|
76 |
if( !i1->is_Bool() ) return NULL; |
|
77 |
BoolNode *b = i1->as_Bool(); |
|
78 |
Node *cmp = b->in(1); |
|
79 |
if( !cmp->is_Cmp() ) return NULL; |
|
80 |
i1 = cmp->in(1); |
|
81 |
if( i1 == NULL || !i1->is_Phi() ) return NULL; |
|
82 |
PhiNode *phi = i1->as_Phi(); |
|
83 |
if( phi->is_copy() ) return NULL; |
|
84 |
Node *con2 = cmp->in(2); |
|
85 |
if( !con2->is_Con() ) return NULL; |
|
86 |
// See that the merge point contains some constants |
|
87 |
Node *con1=NULL; |
|
88 |
uint i4; |
|
89 |
for( i4 = 1; i4 < phi->req(); i4++ ) { |
|
90 |
con1 = phi->in(i4); |
|
2131 | 91 |
if( !con1 ) return NULL; // Do not optimize partially collapsed merges |
1 | 92 |
if( con1->is_Con() ) break; // Found a constant |
93 |
// Also allow null-vs-not-null checks |
|
94 |
const TypePtr *tp = igvn->type(con1)->isa_ptr(); |
|
95 |
if( tp && tp->_ptr == TypePtr::NotNull ) |
|
96 |
break; |
|
97 |
} |
|
98 |
if( i4 >= phi->req() ) return NULL; // Found no constants |
|
99 |
||
100 |
igvn->C->set_has_split_ifs(true); // Has chance for split-if |
|
101 |
||
102 |
// Make sure that the compare can be constant folded away |
|
103 |
Node *cmp2 = cmp->clone(); |
|
104 |
cmp2->set_req(1,con1); |
|
105 |
cmp2->set_req(2,con2); |
|
106 |
const Type *t = cmp2->Value(igvn); |
|
107 |
// This compare is dead, so whack it! |
|
108 |
igvn->remove_dead_node(cmp2); |
|
109 |
if( !t->singleton() ) return NULL; |
|
110 |
||
111 |
// No intervening control, like a simple Call |
|
112 |
Node *r = iff->in(0); |
|
113 |
if( !r->is_Region() ) return NULL; |
|
114 |
if( phi->region() != r ) return NULL; |
|
115 |
// No other users of the cmp/bool |
|
116 |
if (b->outcnt() != 1 || cmp->outcnt() != 1) { |
|
117 |
//tty->print_cr("many users of cmp/bool"); |
|
118 |
return NULL; |
|
119 |
} |
|
120 |
||
121 |
// Make sure we can determine where all the uses of merged values go |
|
122 |
for (DUIterator_Fast jmax, j = r->fast_outs(jmax); j < jmax; j++) { |
|
123 |
Node* u = r->fast_out(j); |
|
124 |
if( u == r ) continue; |
|
125 |
if( u == iff ) continue; |
|
126 |
if( u->outcnt() == 0 ) continue; // use is dead & ignorable |
|
127 |
if( !u->is_Phi() ) { |
|
128 |
/* |
|
129 |
if( u->is_Start() ) { |
|
130 |
tty->print_cr("Region has inlined start use"); |
|
131 |
} else { |
|
132 |
tty->print_cr("Region has odd use"); |
|
133 |
u->dump(2); |
|
134 |
}*/ |
|
135 |
return NULL; |
|
136 |
} |
|
137 |
if( u != phi ) { |
|
138 |
// CNC - do not allow any other merged value |
|
139 |
//tty->print_cr("Merging another value"); |
|
140 |
//u->dump(2); |
|
141 |
return NULL; |
|
142 |
} |
|
143 |
// Make sure we can account for all Phi uses |
|
144 |
for (DUIterator_Fast kmax, k = u->fast_outs(kmax); k < kmax; k++) { |
|
145 |
Node* v = u->fast_out(k); // User of the phi |
|
146 |
// CNC - Allow only really simple patterns. |
|
147 |
// In particular I disallow AddP of the Phi, a fairly common pattern |
|
148 |
if( v == cmp ) continue; // The compare is OK |
|
149 |
if( (v->is_ConstraintCast()) && |
|
150 |
v->in(0)->in(0) == iff ) |
|
151 |
continue; // CastPP/II of the IfNode is OK |
|
152 |
// Disabled following code because I cannot tell if exactly one |
|
153 |
// path dominates without a real dominator check. CNC 9/9/1999 |
|
154 |
//uint vop = v->Opcode(); |
|
155 |
//if( vop == Op_Phi ) { // Phi from another merge point might be OK |
|
156 |
// Node *r = v->in(0); // Get controlling point |
|
157 |
// if( !r ) return NULL; // Degraded to a copy |
|
158 |
// // Find exactly one path in (either True or False doms, but not IFF) |
|
159 |
// int cnt = 0; |
|
160 |
// for( uint i = 1; i < r->req(); i++ ) |
|
161 |
// if( r->in(i) && r->in(i)->in(0) == iff ) |
|
162 |
// cnt++; |
|
163 |
// if( cnt == 1 ) continue; // Exactly one of True or False guards Phi |
|
164 |
//} |
|
165 |
if( !v->is_Call() ) { |
|
166 |
/* |
|
167 |
if( v->Opcode() == Op_AddP ) { |
|
168 |
tty->print_cr("Phi has AddP use"); |
|
169 |
} else if( v->Opcode() == Op_CastPP ) { |
|
170 |
tty->print_cr("Phi has CastPP use"); |
|
171 |
} else if( v->Opcode() == Op_CastII ) { |
|
172 |
tty->print_cr("Phi has CastII use"); |
|
173 |
} else { |
|
174 |
tty->print_cr("Phi has use I cant be bothered with"); |
|
175 |
} |
|
176 |
*/ |
|
177 |
} |
|
178 |
return NULL; |
|
179 |
||
180 |
/* CNC - Cut out all the fancy acceptance tests |
|
181 |
// Can we clone this use when doing the transformation? |
|
182 |
// If all uses are from Phis at this merge or constants, then YES. |
|
183 |
if( !v->in(0) && v != cmp ) { |
|
184 |
tty->print_cr("Phi has free-floating use"); |
|
185 |
v->dump(2); |
|
186 |
return NULL; |
|
187 |
} |
|
188 |
for( uint l = 1; l < v->req(); l++ ) { |
|
189 |
if( (!v->in(l)->is_Phi() || v->in(l)->in(0) != r) && |
|
190 |
!v->in(l)->is_Con() ) { |
|
191 |
tty->print_cr("Phi has use"); |
|
192 |
v->dump(2); |
|
193 |
return NULL; |
|
194 |
} // End of if Phi-use input is neither Phi nor Constant |
|
195 |
} // End of for all inputs to Phi-use |
|
196 |
*/ |
|
197 |
} // End of for all uses of Phi |
|
198 |
} // End of for all uses of Region |
|
199 |
||
200 |
// Only do this if the IF node is in a sane state |
|
201 |
if (iff->outcnt() != 2) |
|
202 |
return NULL; |
|
203 |
||
204 |
// Got a hit! Do the Mondo Hack! |
|
205 |
// |
|
206 |
//ABC a1c def ghi B 1 e h A C a c d f g i |
|
207 |
// R - Phi - Phi - Phi Rc - Phi - Phi - Phi Rx - Phi - Phi - Phi |
|
208 |
// cmp - 2 cmp - 2 cmp - 2 |
|
209 |
// bool bool_c bool_x |
|
210 |
// if if_c if_x |
|
211 |
// T F T F T F |
|
212 |
// ..s.. ..t .. ..s.. ..t.. ..s.. ..t.. |
|
213 |
// |
|
2131 | 214 |
// Split the paths coming into the merge point into 2 separate groups of |
1 | 215 |
// merges. On the left will be all the paths feeding constants into the |
216 |
// Cmp's Phi. On the right will be the remaining paths. The Cmp's Phi |
|
217 |
// will fold up into a constant; this will let the Cmp fold up as well as |
|
218 |
// all the control flow. Below the original IF we have 2 control |
|
219 |
// dependent regions, 's' and 't'. Now we will merge the two paths |
|
220 |
// just prior to 's' and 't' from the two IFs. At least 1 path (and quite |
|
221 |
// likely 2 or more) will promptly constant fold away. |
|
222 |
PhaseGVN *phase = igvn; |
|
223 |
||
224 |
// Make a region merging constants and a region merging the rest |
|
225 |
uint req_c = 0; |
|
9101 | 226 |
Node* predicate_proj = NULL; |
1 | 227 |
for (uint ii = 1; ii < r->req(); ii++) { |
9101 | 228 |
if (phi->in(ii) == con1) { |
1 | 229 |
req_c++; |
230 |
} |
|
9101 | 231 |
Node* proj = PhaseIdealLoop::find_predicate(r->in(ii)); |
232 |
if (proj != NULL) { |
|
233 |
assert(predicate_proj == NULL, "only one predicate entry expected"); |
|
234 |
predicate_proj = proj; |
|
235 |
} |
|
1 | 236 |
} |
9101 | 237 |
Node* predicate_c = NULL; |
238 |
Node* predicate_x = NULL; |
|
9446 | 239 |
bool counted_loop = r->is_CountedLoop(); |
9101 | 240 |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
241 |
Node *region_c = new RegionNode(req_c + 1); |
1 | 242 |
Node *phi_c = con1; |
243 |
uint len = r->req(); |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
244 |
Node *region_x = new RegionNode(len - req_c); |
1 | 245 |
Node *phi_x = PhiNode::make_blank(region_x, phi); |
246 |
for (uint i = 1, i_c = 1, i_x = 1; i < len; i++) { |
|
9101 | 247 |
if (phi->in(i) == con1) { |
1 | 248 |
region_c->init_req( i_c++, r ->in(i) ); |
9101 | 249 |
if (r->in(i) == predicate_proj) |
250 |
predicate_c = predicate_proj; |
|
1 | 251 |
} else { |
252 |
region_x->init_req( i_x, r ->in(i) ); |
|
253 |
phi_x ->init_req( i_x++, phi->in(i) ); |
|
9101 | 254 |
if (r->in(i) == predicate_proj) |
255 |
predicate_x = predicate_proj; |
|
1 | 256 |
} |
257 |
} |
|
10258
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
258 |
if (predicate_c != NULL && (req_c > 1)) { |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
259 |
assert(predicate_x == NULL, "only one predicate entry expected"); |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
260 |
predicate_c = NULL; // Do not clone predicate below merge point |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
261 |
} |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
262 |
if (predicate_x != NULL && ((len - req_c) > 2)) { |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
263 |
assert(predicate_c == NULL, "only one predicate entry expected"); |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
264 |
predicate_x = NULL; // Do not clone predicate below merge point |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
265 |
} |
1 | 266 |
|
267 |
// Register the new RegionNodes but do not transform them. Cannot |
|
2131 | 268 |
// transform until the entire Region/Phi conglomerate has been hacked |
1 | 269 |
// as a single huge transform. |
270 |
igvn->register_new_node_with_optimizer( region_c ); |
|
271 |
igvn->register_new_node_with_optimizer( region_x ); |
|
272 |
// Prevent the untimely death of phi_x. Currently he has no uses. He is |
|
273 |
// about to get one. If this only use goes away, then phi_x will look dead. |
|
274 |
// However, he will be picking up some more uses down below. |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
275 |
Node *hook = new Node(4); |
1 | 276 |
hook->init_req(0, phi_x); |
277 |
hook->init_req(1, phi_c); |
|
4016
9c11d6d519f7
6889300: assert(i != k || is_new || i->outcnt() > 0, "don't return dead nodes")
kvn
parents:
3268
diff
changeset
|
278 |
phi_x = phase->transform( phi_x ); |
1 | 279 |
|
280 |
// Make the compare |
|
281 |
Node *cmp_c = phase->makecon(t); |
|
282 |
Node *cmp_x = cmp->clone(); |
|
283 |
cmp_x->set_req(1,phi_x); |
|
284 |
cmp_x->set_req(2,con2); |
|
285 |
cmp_x = phase->transform(cmp_x); |
|
286 |
// Make the bool |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
287 |
Node *b_c = phase->transform(new BoolNode(cmp_c,b->_test._test)); |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
288 |
Node *b_x = phase->transform(new BoolNode(cmp_x,b->_test._test)); |
1 | 289 |
// Make the IfNode |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
290 |
IfNode *iff_c = new IfNode(region_c,b_c,iff->_prob,iff->_fcnt); |
1 | 291 |
igvn->set_type_bottom(iff_c); |
292 |
igvn->_worklist.push(iff_c); |
|
293 |
hook->init_req(2, iff_c); |
|
294 |
||
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
295 |
IfNode *iff_x = new IfNode(region_x,b_x,iff->_prob, iff->_fcnt); |
1 | 296 |
igvn->set_type_bottom(iff_x); |
297 |
igvn->_worklist.push(iff_x); |
|
298 |
hook->init_req(3, iff_x); |
|
299 |
||
300 |
// Make the true/false arms |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
301 |
Node *iff_c_t = phase->transform(new IfTrueNode (iff_c)); |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
302 |
Node *iff_c_f = phase->transform(new IfFalseNode(iff_c)); |
9101 | 303 |
if (predicate_c != NULL) { |
304 |
assert(predicate_x == NULL, "only one predicate entry expected"); |
|
305 |
// Clone loop predicates to each path |
|
9446 | 306 |
iff_c_t = igvn->clone_loop_predicates(predicate_c, iff_c_t, !counted_loop); |
307 |
iff_c_f = igvn->clone_loop_predicates(predicate_c, iff_c_f, !counted_loop); |
|
9101 | 308 |
} |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
309 |
Node *iff_x_t = phase->transform(new IfTrueNode (iff_x)); |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
310 |
Node *iff_x_f = phase->transform(new IfFalseNode(iff_x)); |
9101 | 311 |
if (predicate_x != NULL) { |
312 |
assert(predicate_c == NULL, "only one predicate entry expected"); |
|
313 |
// Clone loop predicates to each path |
|
9446 | 314 |
iff_x_t = igvn->clone_loop_predicates(predicate_x, iff_x_t, !counted_loop); |
315 |
iff_x_f = igvn->clone_loop_predicates(predicate_x, iff_x_f, !counted_loop); |
|
9101 | 316 |
} |
1 | 317 |
|
318 |
// Merge the TRUE paths |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
319 |
Node *region_s = new RegionNode(3); |
1 | 320 |
igvn->_worklist.push(region_s); |
321 |
region_s->init_req(1, iff_c_t); |
|
322 |
region_s->init_req(2, iff_x_t); |
|
323 |
igvn->register_new_node_with_optimizer( region_s ); |
|
324 |
||
325 |
// Merge the FALSE paths |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
326 |
Node *region_f = new RegionNode(3); |
1 | 327 |
igvn->_worklist.push(region_f); |
328 |
region_f->init_req(1, iff_c_f); |
|
329 |
region_f->init_req(2, iff_x_f); |
|
330 |
igvn->register_new_node_with_optimizer( region_f ); |
|
331 |
||
332 |
igvn->hash_delete(cmp);// Remove soon-to-be-dead node from hash table. |
|
333 |
cmp->set_req(1,NULL); // Whack the inputs to cmp because it will be dead |
|
334 |
cmp->set_req(2,NULL); |
|
335 |
// Check for all uses of the Phi and give them a new home. |
|
336 |
// The 'cmp' got cloned, but CastPP/IIs need to be moved. |
|
337 |
Node *phi_s = NULL; // do not construct unless needed |
|
338 |
Node *phi_f = NULL; // do not construct unless needed |
|
339 |
for (DUIterator_Last i2min, i2 = phi->last_outs(i2min); i2 >= i2min; --i2) { |
|
340 |
Node* v = phi->last_out(i2);// User of the phi |
|
12958
009b6c9586d8
7173340: C2: code cleanup: use PhaseIterGVN::replace_edge(Node*, int, Node*) where applicable
kvn
parents:
10258
diff
changeset
|
341 |
igvn->rehash_node_delayed(v); // Have to fixup other Phi users |
1 | 342 |
uint vop = v->Opcode(); |
343 |
Node *proj = NULL; |
|
344 |
if( vop == Op_Phi ) { // Remote merge point |
|
345 |
Node *r = v->in(0); |
|
346 |
for (uint i3 = 1; i3 < r->req(); i3++) |
|
347 |
if (r->in(i3) && r->in(i3)->in(0) == iff) { |
|
348 |
proj = r->in(i3); |
|
349 |
break; |
|
350 |
} |
|
351 |
} else if( v->is_ConstraintCast() ) { |
|
352 |
proj = v->in(0); // Controlling projection |
|
353 |
} else { |
|
354 |
assert( 0, "do not know how to handle this guy" ); |
|
355 |
} |
|
356 |
||
357 |
Node *proj_path_data, *proj_path_ctrl; |
|
358 |
if( proj->Opcode() == Op_IfTrue ) { |
|
359 |
if( phi_s == NULL ) { |
|
360 |
// Only construct phi_s if needed, otherwise provides |
|
361 |
// interfering use. |
|
362 |
phi_s = PhiNode::make_blank(region_s,phi); |
|
363 |
phi_s->init_req( 1, phi_c ); |
|
364 |
phi_s->init_req( 2, phi_x ); |
|
4016
9c11d6d519f7
6889300: assert(i != k || is_new || i->outcnt() > 0, "don't return dead nodes")
kvn
parents:
3268
diff
changeset
|
365 |
hook->add_req(phi_s); |
1 | 366 |
phi_s = phase->transform(phi_s); |
367 |
} |
|
368 |
proj_path_data = phi_s; |
|
369 |
proj_path_ctrl = region_s; |
|
370 |
} else { |
|
371 |
if( phi_f == NULL ) { |
|
372 |
// Only construct phi_f if needed, otherwise provides |
|
373 |
// interfering use. |
|
374 |
phi_f = PhiNode::make_blank(region_f,phi); |
|
375 |
phi_f->init_req( 1, phi_c ); |
|
376 |
phi_f->init_req( 2, phi_x ); |
|
4016
9c11d6d519f7
6889300: assert(i != k || is_new || i->outcnt() > 0, "don't return dead nodes")
kvn
parents:
3268
diff
changeset
|
377 |
hook->add_req(phi_f); |
1 | 378 |
phi_f = phase->transform(phi_f); |
379 |
} |
|
380 |
proj_path_data = phi_f; |
|
381 |
proj_path_ctrl = region_f; |
|
382 |
} |
|
383 |
||
384 |
// Fixup 'v' for for the split |
|
385 |
if( vop == Op_Phi ) { // Remote merge point |
|
386 |
uint i; |
|
387 |
for( i = 1; i < v->req(); i++ ) |
|
388 |
if( v->in(i) == phi ) |
|
389 |
break; |
|
390 |
v->set_req(i, proj_path_data ); |
|
391 |
} else if( v->is_ConstraintCast() ) { |
|
392 |
v->set_req(0, proj_path_ctrl ); |
|
393 |
v->set_req(1, proj_path_data ); |
|
394 |
} else |
|
395 |
ShouldNotReachHere(); |
|
396 |
} |
|
397 |
||
398 |
// Now replace the original iff's True/False with region_s/region_t. |
|
399 |
// This makes the original iff go dead. |
|
400 |
for (DUIterator_Last i3min, i3 = iff->last_outs(i3min); i3 >= i3min; --i3) { |
|
401 |
Node* p = iff->last_out(i3); |
|
402 |
assert( p->Opcode() == Op_IfTrue || p->Opcode() == Op_IfFalse, "" ); |
|
403 |
Node *u = (p->Opcode() == Op_IfTrue) ? region_s : region_f; |
|
404 |
// Replace p with u |
|
405 |
igvn->add_users_to_worklist(p); |
|
406 |
for (DUIterator_Last lmin, l = p->last_outs(lmin); l >= lmin;) { |
|
407 |
Node* x = p->last_out(l); |
|
408 |
igvn->hash_delete(x); |
|
409 |
uint uses_found = 0; |
|
410 |
for( uint j = 0; j < x->req(); j++ ) { |
|
411 |
if( x->in(j) == p ) { |
|
412 |
x->set_req(j, u); |
|
413 |
uses_found++; |
|
414 |
} |
|
415 |
} |
|
416 |
l -= uses_found; // we deleted 1 or more copies of this edge |
|
417 |
} |
|
418 |
igvn->remove_dead_node(p); |
|
419 |
} |
|
420 |
||
421 |
// Force the original merge dead |
|
422 |
igvn->hash_delete(r); |
|
3268
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
423 |
// First, remove region's dead users. |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
424 |
for (DUIterator_Last lmin, l = r->last_outs(lmin); l >= lmin;) { |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
425 |
Node* u = r->last_out(l); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
426 |
if( u == r ) { |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
427 |
r->set_req(0, NULL); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
428 |
} else { |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
429 |
assert(u->outcnt() == 0, "only dead users"); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
430 |
igvn->remove_dead_node(u); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
431 |
} |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
432 |
l -= 1; |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
433 |
} |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
434 |
igvn->remove_dead_node(r); |
1 | 435 |
|
436 |
// Now remove the bogus extra edges used to keep things alive |
|
437 |
igvn->remove_dead_node( hook ); |
|
438 |
||
439 |
// Must return either the original node (now dead) or a new node |
|
440 |
// (Do not return a top here, since that would break the uniqueness of top.) |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
441 |
return new ConINode(TypeInt::ZERO); |
1 | 442 |
} |
443 |
||
444 |
//------------------------------is_range_check--------------------------------- |
|
445 |
// Return 0 if not a range check. Return 1 if a range check and set index and |
|
446 |
// offset. Return 2 if we had to negate the test. Index is NULL if the check |
|
447 |
// is versus a constant. |
|
448 |
int IfNode::is_range_check(Node* &range, Node* &index, jint &offset) { |
|
449 |
Node* b = in(1); |
|
450 |
if (b == NULL || !b->is_Bool()) return 0; |
|
451 |
BoolNode* bn = b->as_Bool(); |
|
452 |
Node* cmp = bn->in(1); |
|
453 |
if (cmp == NULL) return 0; |
|
454 |
if (cmp->Opcode() != Op_CmpU) return 0; |
|
455 |
||
456 |
Node* l = cmp->in(1); |
|
457 |
Node* r = cmp->in(2); |
|
458 |
int flip_test = 1; |
|
459 |
if (bn->_test._test == BoolTest::le) { |
|
460 |
l = cmp->in(2); |
|
461 |
r = cmp->in(1); |
|
462 |
flip_test = 2; |
|
463 |
} else if (bn->_test._test != BoolTest::lt) { |
|
464 |
return 0; |
|
465 |
} |
|
466 |
if (l->is_top()) return 0; // Top input means dead test |
|
467 |
if (r->Opcode() != Op_LoadRange) return 0; |
|
468 |
||
469 |
// We have recognized one of these forms: |
|
470 |
// Flip 1: If (Bool[<] CmpU(l, LoadRange)) ... |
|
471 |
// Flip 2: If (Bool[<=] CmpU(LoadRange, l)) ... |
|
472 |
||
473 |
// Make sure it's a real range check by requiring an uncommon trap |
|
474 |
// along the OOB path. Otherwise, it's possible that the user wrote |
|
475 |
// something which optimized to look like a range check but behaves |
|
476 |
// in some other way. |
|
477 |
Node* iftrap = proj_out(flip_test == 2 ? true : false); |
|
478 |
bool found_trap = false; |
|
479 |
if (iftrap != NULL) { |
|
480 |
Node* u = iftrap->unique_ctrl_out(); |
|
481 |
if (u != NULL) { |
|
482 |
// It could be a merge point (Region) for uncommon trap. |
|
483 |
if (u->is_Region()) { |
|
484 |
Node* c = u->unique_ctrl_out(); |
|
485 |
if (c != NULL) { |
|
486 |
iftrap = u; |
|
487 |
u = c; |
|
488 |
} |
|
489 |
} |
|
490 |
if (u->in(0) == iftrap && u->is_CallStaticJava()) { |
|
491 |
int req = u->as_CallStaticJava()->uncommon_trap_request(); |
|
492 |
if (Deoptimization::trap_request_reason(req) == |
|
493 |
Deoptimization::Reason_range_check) { |
|
494 |
found_trap = true; |
|
495 |
} |
|
496 |
} |
|
497 |
} |
|
498 |
} |
|
499 |
if (!found_trap) return 0; // sorry, no cigar |
|
500 |
||
501 |
// Look for index+offset form |
|
502 |
Node* ind = l; |
|
503 |
jint off = 0; |
|
504 |
if (l->is_top()) { |
|
505 |
return 0; |
|
26173
4275dfc46177
8054883: Segmentation error while running program
iveresov
parents:
24923
diff
changeset
|
506 |
} else if (l->Opcode() == Op_AddI) { |
1 | 507 |
if ((off = l->in(1)->find_int_con(0)) != 0) { |
508 |
ind = l->in(2); |
|
509 |
} else if ((off = l->in(2)->find_int_con(0)) != 0) { |
|
510 |
ind = l->in(1); |
|
511 |
} |
|
512 |
} else if ((off = l->find_int_con(-1)) >= 0) { |
|
513 |
// constant offset with no variable index |
|
514 |
ind = NULL; |
|
515 |
} else { |
|
516 |
// variable index with no constant offset (or dead negative index) |
|
517 |
off = 0; |
|
518 |
} |
|
519 |
||
520 |
// Return all the values: |
|
521 |
index = ind; |
|
522 |
offset = off; |
|
523 |
range = r; |
|
524 |
return flip_test; |
|
525 |
} |
|
526 |
||
527 |
//------------------------------adjust_check----------------------------------- |
|
528 |
// Adjust (widen) a prior range check |
|
529 |
static void adjust_check(Node* proj, Node* range, Node* index, |
|
530 |
int flip, jint off_lo, PhaseIterGVN* igvn) { |
|
531 |
PhaseGVN *gvn = igvn; |
|
532 |
// Break apart the old check |
|
533 |
Node *iff = proj->in(0); |
|
534 |
Node *bol = iff->in(1); |
|
535 |
if( bol->is_top() ) return; // In case a partially dead range check appears |
|
536 |
// bail (or bomb[ASSERT/DEBUG]) if NOT projection-->IfNode-->BoolNode |
|
537 |
DEBUG_ONLY( if( !bol->is_Bool() ) { proj->dump(3); fatal("Expect projection-->IfNode-->BoolNode"); } ) |
|
538 |
if( !bol->is_Bool() ) return; |
|
539 |
||
540 |
Node *cmp = bol->in(1); |
|
541 |
// Compute a new check |
|
542 |
Node *new_add = gvn->intcon(off_lo); |
|
543 |
if( index ) { |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
544 |
new_add = off_lo ? gvn->transform(new AddINode( index, new_add )) : index; |
1 | 545 |
} |
546 |
Node *new_cmp = (flip == 1) |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
547 |
? new CmpUNode( new_add, range ) |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
548 |
: new CmpUNode( range, new_add ); |
1 | 549 |
new_cmp = gvn->transform(new_cmp); |
550 |
// See if no need to adjust the existing check |
|
551 |
if( new_cmp == cmp ) return; |
|
552 |
// Else, adjust existing check |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
553 |
Node *new_bol = gvn->transform( new BoolNode( new_cmp, bol->as_Bool()->_test._test ) ); |
12958
009b6c9586d8
7173340: C2: code cleanup: use PhaseIterGVN::replace_edge(Node*, int, Node*) where applicable
kvn
parents:
10258
diff
changeset
|
554 |
igvn->rehash_node_delayed( iff ); |
1 | 555 |
iff->set_req_X( 1, new_bol, igvn ); |
556 |
} |
|
557 |
||
558 |
//------------------------------up_one_dom------------------------------------- |
|
559 |
// Walk up the dominator tree one step. Return NULL at root or true |
|
560 |
// complex merges. Skips through small diamonds. |
|
561 |
Node* IfNode::up_one_dom(Node *curr, bool linear_only) { |
|
562 |
Node *dom = curr->in(0); |
|
563 |
if( !dom ) // Found a Region degraded to a copy? |
|
564 |
return curr->nonnull_req(); // Skip thru it |
|
565 |
||
566 |
if( curr != dom ) // Normal walk up one step? |
|
567 |
return dom; |
|
568 |
||
569 |
// Use linear_only if we are still parsing, since we cannot |
|
570 |
// trust the regions to be fully filled in. |
|
571 |
if (linear_only) |
|
572 |
return NULL; |
|
573 |
||
4582
1a6662d11385
6915110: IfNode::up_one_dom moves beyond RootNode bug in src/share/vm/opto/ifnode.cpp
kvn
parents:
4020
diff
changeset
|
574 |
if( dom->is_Root() ) |
1a6662d11385
6915110: IfNode::up_one_dom moves beyond RootNode bug in src/share/vm/opto/ifnode.cpp
kvn
parents:
4020
diff
changeset
|
575 |
return NULL; |
1a6662d11385
6915110: IfNode::up_one_dom moves beyond RootNode bug in src/share/vm/opto/ifnode.cpp
kvn
parents:
4020
diff
changeset
|
576 |
|
1 | 577 |
// Else hit a Region. Check for a loop header |
578 |
if( dom->is_Loop() ) |
|
579 |
return dom->in(1); // Skip up thru loops |
|
580 |
||
581 |
// Check for small diamonds |
|
582 |
Node *din1, *din2, *din3, *din4; |
|
583 |
if( dom->req() == 3 && // 2-path merge point |
|
584 |
(din1 = dom ->in(1)) && // Left path exists |
|
585 |
(din2 = dom ->in(2)) && // Right path exists |
|
586 |
(din3 = din1->in(0)) && // Left path up one |
|
587 |
(din4 = din2->in(0)) ) { // Right path up one |
|
588 |
if( din3->is_Call() && // Handle a slow-path call on either arm |
|
589 |
(din3 = din3->in(0)) ) |
|
590 |
din3 = din3->in(0); |
|
591 |
if( din4->is_Call() && // Handle a slow-path call on either arm |
|
592 |
(din4 = din4->in(0)) ) |
|
593 |
din4 = din4->in(0); |
|
594 |
if( din3 == din4 && din3->is_If() ) |
|
595 |
return din3; // Skip around diamonds |
|
596 |
} |
|
597 |
||
598 |
// Give up the search at true merges |
|
599 |
return NULL; // Dead loop? Or hit root? |
|
600 |
} |
|
601 |
||
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
602 |
|
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
603 |
//------------------------------filtered_int_type-------------------------------- |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
604 |
// Return a possibly more restrictive type for val based on condition control flow for an if |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
605 |
const TypeInt* IfNode::filtered_int_type(PhaseGVN* gvn, Node *val, Node* if_proj) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
606 |
assert(if_proj && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
607 |
(if_proj->Opcode() == Op_IfTrue || if_proj->Opcode() == Op_IfFalse), "expecting an if projection"); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
608 |
if (if_proj->in(0) && if_proj->in(0)->is_If()) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
609 |
IfNode* iff = if_proj->in(0)->as_If(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
610 |
if (iff->in(1) && iff->in(1)->is_Bool()) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
611 |
BoolNode* bol = iff->in(1)->as_Bool(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
612 |
if (bol->in(1) && bol->in(1)->is_Cmp()) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
613 |
const CmpNode* cmp = bol->in(1)->as_Cmp(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
614 |
if (cmp->in(1) == val) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
615 |
const TypeInt* cmp2_t = gvn->type(cmp->in(2))->isa_int(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
616 |
if (cmp2_t != NULL) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
617 |
jint lo = cmp2_t->_lo; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
618 |
jint hi = cmp2_t->_hi; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
619 |
BoolTest::mask msk = if_proj->Opcode() == Op_IfTrue ? bol->_test._test : bol->_test.negate(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
620 |
switch (msk) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
621 |
case BoolTest::ne: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
622 |
// Can't refine type |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
623 |
return NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
624 |
case BoolTest::eq: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
625 |
return cmp2_t; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
626 |
case BoolTest::lt: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
627 |
lo = TypeInt::INT->_lo; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
628 |
if (hi - 1 < hi) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
629 |
hi = hi - 1; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
630 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
631 |
break; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
632 |
case BoolTest::le: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
633 |
lo = TypeInt::INT->_lo; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
634 |
break; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
635 |
case BoolTest::gt: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
636 |
if (lo + 1 > lo) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
637 |
lo = lo + 1; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
638 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
639 |
hi = TypeInt::INT->_hi; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
640 |
break; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
641 |
case BoolTest::ge: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
642 |
// lo unchanged |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
643 |
hi = TypeInt::INT->_hi; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
644 |
break; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
645 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
646 |
const TypeInt* rtn_t = TypeInt::make(lo, hi, cmp2_t->_widen); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
647 |
return rtn_t; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
648 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
649 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
650 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
651 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
652 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
653 |
return NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
654 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
655 |
|
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
656 |
//------------------------------fold_compares---------------------------- |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
657 |
// See if a pair of CmpIs can be converted into a CmpU. In some cases |
2131 | 658 |
// the direction of this if is determined by the preceding if so it |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
659 |
// can be eliminate entirely. Given an if testing (CmpI n c) check |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
660 |
// for an immediately control dependent if that is testing (CmpI n c2) |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
661 |
// and has one projection leading to this if and the other projection |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
662 |
// leading to a region that merges one of this ifs control |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
663 |
// projections. |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
664 |
// |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
665 |
// If |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
666 |
// / | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
667 |
// / | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
668 |
// / | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
669 |
// If | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
670 |
// /\ | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
671 |
// / \ | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
672 |
// / \ | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
673 |
// / Region |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
674 |
// |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
675 |
Node* IfNode::fold_compares(PhaseGVN* phase) { |
24479 | 676 |
if (Opcode() != Op_If) return NULL; |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
677 |
|
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
678 |
Node* this_cmp = in(1)->in(1); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
679 |
if (this_cmp != NULL && this_cmp->Opcode() == Op_CmpI && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
680 |
this_cmp->in(2)->is_Con() && this_cmp->in(2) != phase->C->top()) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
681 |
Node* ctrl = in(0); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
682 |
BoolNode* this_bool = in(1)->as_Bool(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
683 |
Node* n = this_cmp->in(1); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
684 |
int hi = this_cmp->in(2)->get_int(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
685 |
if (ctrl != NULL && ctrl->is_Proj() && ctrl->outcnt() == 1 && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
686 |
ctrl->in(0)->is_If() && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
687 |
ctrl->in(0)->outcnt() == 2 && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
688 |
ctrl->in(0)->in(1)->is_Bool() && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
689 |
ctrl->in(0)->in(1)->in(1)->Opcode() == Op_CmpI && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
690 |
ctrl->in(0)->in(1)->in(1)->in(2)->is_Con() && |
20701
ef9996662fd5
8020750: Node::get_int: guarantee(t != NULL) failed: must be con
twisti
parents:
20289
diff
changeset
|
691 |
ctrl->in(0)->in(1)->in(1)->in(2) != phase->C->top() && |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
692 |
ctrl->in(0)->in(1)->in(1)->in(1) == n) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
693 |
IfNode* dom_iff = ctrl->in(0)->as_If(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
694 |
Node* otherproj = dom_iff->proj_out(!ctrl->as_Proj()->_con); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
695 |
if (otherproj->outcnt() == 1 && otherproj->unique_out()->is_Region() && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
696 |
this_bool->_test._test != BoolTest::ne && this_bool->_test._test != BoolTest::eq) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
697 |
// Identify which proj goes to the region and which continues on |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
698 |
RegionNode* region = otherproj->unique_out()->as_Region(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
699 |
Node* success = NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
700 |
Node* fail = NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
701 |
for (int i = 0; i < 2; i++) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
702 |
Node* proj = proj_out(i); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
703 |
if (success == NULL && proj->outcnt() == 1 && proj->unique_out() == region) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
704 |
success = proj; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
705 |
} else if (fail == NULL) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
706 |
fail = proj; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
707 |
} else { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
708 |
success = fail = NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
709 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
710 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
711 |
if (success != NULL && fail != NULL && !region->has_phi()) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
712 |
int lo = dom_iff->in(1)->in(1)->in(2)->get_int(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
713 |
BoolNode* dom_bool = dom_iff->in(1)->as_Bool(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
714 |
Node* dom_cmp = dom_bool->in(1); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
715 |
const TypeInt* failtype = filtered_int_type(phase, n, ctrl); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
716 |
if (failtype != NULL) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
717 |
const TypeInt* type2 = filtered_int_type(phase, n, fail); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
718 |
if (type2 != NULL) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
719 |
failtype = failtype->join(type2)->is_int(); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
720 |
} else { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
721 |
failtype = NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
722 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
723 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
724 |
|
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
725 |
if (failtype != NULL && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
726 |
dom_bool->_test._test != BoolTest::ne && dom_bool->_test._test != BoolTest::eq) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
727 |
int bound = failtype->_hi - failtype->_lo + 1; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
728 |
if (failtype->_hi != max_jint && failtype->_lo != min_jint && bound > 1) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
729 |
// Merge the two compares into a single unsigned compare by building (CmpU (n - lo) hi) |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
730 |
BoolTest::mask cond = fail->as_Proj()->_con ? BoolTest::lt : BoolTest::ge; |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
731 |
Node* adjusted = phase->transform(new SubINode(n, phase->intcon(failtype->_lo))); |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
732 |
Node* newcmp = phase->transform(new CmpUNode(adjusted, phase->intcon(bound))); |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
733 |
Node* newbool = phase->transform(new BoolNode(newcmp, cond)); |
12958
009b6c9586d8
7173340: C2: code cleanup: use PhaseIterGVN::replace_edge(Node*, int, Node*) where applicable
kvn
parents:
10258
diff
changeset
|
734 |
phase->is_IterGVN()->replace_input_of(dom_iff, 1, phase->intcon(ctrl->as_Proj()->_con)); |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
735 |
phase->hash_delete(this); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
736 |
set_req(1, newbool); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
737 |
return this; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
738 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
739 |
if (failtype->_lo > failtype->_hi) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
740 |
// previous if determines the result of this if so |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
741 |
// replace Bool with constant |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
742 |
phase->hash_delete(this); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
743 |
set_req(1, phase->intcon(success->as_Proj()->_con)); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
744 |
return this; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
745 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
746 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
747 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
748 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
749 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
750 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
751 |
return NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
752 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
753 |
|
1 | 754 |
//------------------------------remove_useless_bool---------------------------- |
755 |
// Check for people making a useless boolean: things like |
|
756 |
// if( (x < y ? true : false) ) { ... } |
|
757 |
// Replace with if( x < y ) { ... } |
|
758 |
static Node *remove_useless_bool(IfNode *iff, PhaseGVN *phase) { |
|
759 |
Node *i1 = iff->in(1); |
|
760 |
if( !i1->is_Bool() ) return NULL; |
|
761 |
BoolNode *bol = i1->as_Bool(); |
|
762 |
||
763 |
Node *cmp = bol->in(1); |
|
764 |
if( cmp->Opcode() != Op_CmpI ) return NULL; |
|
765 |
||
766 |
// Must be comparing against a bool |
|
767 |
const Type *cmp2_t = phase->type( cmp->in(2) ); |
|
768 |
if( cmp2_t != TypeInt::ZERO && |
|
769 |
cmp2_t != TypeInt::ONE ) |
|
770 |
return NULL; |
|
771 |
||
772 |
// Find a prior merge point merging the boolean |
|
773 |
i1 = cmp->in(1); |
|
774 |
if( !i1->is_Phi() ) return NULL; |
|
775 |
PhiNode *phi = i1->as_Phi(); |
|
776 |
if( phase->type( phi ) != TypeInt::BOOL ) |
|
777 |
return NULL; |
|
778 |
||
779 |
// Check for diamond pattern |
|
780 |
int true_path = phi->is_diamond_phi(); |
|
781 |
if( true_path == 0 ) return NULL; |
|
782 |
||
958
4c4709e8b7ee
6712835: Server compiler fails with assertion (loop_count < K,"infinite loop in PhaseIterGVN::transform")
never
parents:
190
diff
changeset
|
783 |
// Make sure that iff and the control of the phi are different. This |
4c4709e8b7ee
6712835: Server compiler fails with assertion (loop_count < K,"infinite loop in PhaseIterGVN::transform")
never
parents:
190
diff
changeset
|
784 |
// should really only happen for dead control flow since it requires |
4c4709e8b7ee
6712835: Server compiler fails with assertion (loop_count < K,"infinite loop in PhaseIterGVN::transform")
never
parents:
190
diff
changeset
|
785 |
// an illegal cycle. |
4c4709e8b7ee
6712835: Server compiler fails with assertion (loop_count < K,"infinite loop in PhaseIterGVN::transform")
never
parents:
190
diff
changeset
|
786 |
if (phi->in(0)->in(1)->in(0) == iff) return NULL; |
4c4709e8b7ee
6712835: Server compiler fails with assertion (loop_count < K,"infinite loop in PhaseIterGVN::transform")
never
parents:
190
diff
changeset
|
787 |
|
1 | 788 |
// phi->region->if_proj->ifnode->bool->cmp |
789 |
BoolNode *bol2 = phi->in(0)->in(1)->in(0)->in(1)->as_Bool(); |
|
790 |
||
791 |
// Now get the 'sense' of the test correct so we can plug in |
|
792 |
// either iff2->in(1) or its complement. |
|
793 |
int flip = 0; |
|
794 |
if( bol->_test._test == BoolTest::ne ) flip = 1-flip; |
|
795 |
else if( bol->_test._test != BoolTest::eq ) return NULL; |
|
796 |
if( cmp2_t == TypeInt::ZERO ) flip = 1-flip; |
|
797 |
||
798 |
const Type *phi1_t = phase->type( phi->in(1) ); |
|
799 |
const Type *phi2_t = phase->type( phi->in(2) ); |
|
800 |
// Check for Phi(0,1) and flip |
|
801 |
if( phi1_t == TypeInt::ZERO ) { |
|
802 |
if( phi2_t != TypeInt::ONE ) return NULL; |
|
803 |
flip = 1-flip; |
|
804 |
} else { |
|
805 |
// Check for Phi(1,0) |
|
806 |
if( phi1_t != TypeInt::ONE ) return NULL; |
|
807 |
if( phi2_t != TypeInt::ZERO ) return NULL; |
|
808 |
} |
|
809 |
if( true_path == 2 ) { |
|
810 |
flip = 1-flip; |
|
811 |
} |
|
812 |
||
813 |
Node* new_bol = (flip ? phase->transform( bol2->negate(phase) ) : bol2); |
|
958
4c4709e8b7ee
6712835: Server compiler fails with assertion (loop_count < K,"infinite loop in PhaseIterGVN::transform")
never
parents:
190
diff
changeset
|
814 |
assert(new_bol != iff->in(1), "must make progress"); |
1 | 815 |
iff->set_req(1, new_bol); |
816 |
// Intervening diamond probably goes dead |
|
817 |
phase->C->set_major_progress(); |
|
818 |
return iff; |
|
819 |
} |
|
820 |
||
821 |
static IfNode* idealize_test(PhaseGVN* phase, IfNode* iff); |
|
822 |
||
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
823 |
struct RangeCheck { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
824 |
Node* ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
825 |
jint off; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
826 |
}; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
827 |
|
1 | 828 |
//------------------------------Ideal------------------------------------------ |
829 |
// Return a node which is more "ideal" than the current node. Strip out |
|
830 |
// control copies |
|
831 |
Node *IfNode::Ideal(PhaseGVN *phase, bool can_reshape) { |
|
832 |
if (remove_dead_region(phase, can_reshape)) return this; |
|
833 |
// No Def-Use info? |
|
834 |
if (!can_reshape) return NULL; |
|
835 |
PhaseIterGVN *igvn = phase->is_IterGVN(); |
|
836 |
||
837 |
// Don't bother trying to transform a dead if |
|
838 |
if (in(0)->is_top()) return NULL; |
|
839 |
// Don't bother trying to transform an if with a dead test |
|
840 |
if (in(1)->is_top()) return NULL; |
|
841 |
// Another variation of a dead test |
|
842 |
if (in(1)->is_Con()) return NULL; |
|
843 |
// Another variation of a dead if |
|
844 |
if (outcnt() < 2) return NULL; |
|
845 |
||
846 |
// Canonicalize the test. |
|
847 |
Node* idt_if = idealize_test(phase, this); |
|
848 |
if (idt_if != NULL) return idt_if; |
|
849 |
||
850 |
// Try to split the IF |
|
851 |
Node *s = split_if(this, igvn); |
|
852 |
if (s != NULL) return s; |
|
853 |
||
854 |
// Check for people making a useless boolean: things like |
|
855 |
// if( (x < y ? true : false) ) { ... } |
|
856 |
// Replace with if( x < y ) { ... } |
|
857 |
Node *bol2 = remove_useless_bool(this, phase); |
|
858 |
if( bol2 ) return bol2; |
|
859 |
||
860 |
// Setup to scan up the CFG looking for a dominating test |
|
861 |
Node *dom = in(0); |
|
862 |
Node *prev_dom = this; |
|
863 |
||
864 |
// Check for range-check vs other kinds of tests |
|
865 |
Node *index1, *range1; |
|
866 |
jint offset1; |
|
867 |
int flip1 = is_range_check(range1, index1, offset1); |
|
868 |
if( flip1 ) { |
|
869 |
// Try to remove extra range checks. All 'up_one_dom' gives up at merges |
|
870 |
// so all checks we inspect post-dominate the top-most check we find. |
|
871 |
// If we are going to fail the current check and we reach the top check |
|
2131 | 872 |
// then we are guaranteed to fail, so just start interpreting there. |
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
873 |
// We 'expand' the top 3 range checks to include all post-dominating |
1 | 874 |
// checks. |
875 |
||
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
876 |
// The top 3 range checks seen |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
877 |
const int NRC =3; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
878 |
RangeCheck prev_checks[NRC]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
879 |
int nb_checks = 0; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
880 |
|
1 | 881 |
// Low and high offsets seen so far |
882 |
jint off_lo = offset1; |
|
883 |
jint off_hi = offset1; |
|
884 |
||
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
885 |
bool found_immediate_dominator = false; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
886 |
|
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
887 |
// Scan for the top checks and collect range of offsets |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
888 |
for (int dist = 0; dist < 999; dist++) { // Range-Check scan limit |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
889 |
if (dom->Opcode() == Op_If && // Not same opcode? |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
890 |
prev_dom->in(0) == dom) { // One path of test does dominate? |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
891 |
if (dom == this) return NULL; // dead loop |
1 | 892 |
// See if this is a range check |
893 |
Node *index2, *range2; |
|
894 |
jint offset2; |
|
895 |
int flip2 = dom->as_If()->is_range_check(range2, index2, offset2); |
|
896 |
// See if this is a _matching_ range check, checking against |
|
897 |
// the same array bounds. |
|
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
898 |
if (flip2 == flip1 && range2 == range1 && index2 == index1 && |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
899 |
dom->outcnt() == 2) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
900 |
if (nb_checks == 0 && dom->in(1) == in(1)) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
901 |
// Found an immediately dominating test at the same offset. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
902 |
// This kind of back-to-back test can be eliminated locally, |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
903 |
// and there is no need to search further for dominating tests. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
904 |
assert(offset2 == offset1, "Same test but different offsets"); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
905 |
found_immediate_dominator = true; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
906 |
break; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
907 |
} |
1 | 908 |
// Gather expanded bounds |
909 |
off_lo = MIN2(off_lo,offset2); |
|
910 |
off_hi = MAX2(off_hi,offset2); |
|
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
911 |
// Record top NRC range checks |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
912 |
prev_checks[nb_checks%NRC].ctl = prev_dom; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
913 |
prev_checks[nb_checks%NRC].off = offset2; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
914 |
nb_checks++; |
1 | 915 |
} |
916 |
} |
|
917 |
prev_dom = dom; |
|
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
918 |
dom = up_one_dom(dom); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
919 |
if (!dom) break; |
1 | 920 |
} |
921 |
||
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
922 |
if (!found_immediate_dominator) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
923 |
// Attempt to widen the dominating range check to cover some later |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
924 |
// ones. Since range checks "fail" by uncommon-trapping to the |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
925 |
// interpreter, widening a check can make us speculatively enter |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
926 |
// the interpreter. If we see range-check deopt's, do not widen! |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
927 |
if (!phase->C->allow_range_check_smearing()) return NULL; |
1 | 928 |
|
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
929 |
// Didn't find prior covering check, so cannot remove anything. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
930 |
if (nb_checks == 0) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
931 |
return NULL; |
1 | 932 |
} |
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
933 |
// Constant indices only need to check the upper bound. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
934 |
// Non-constant indices must check both low and high. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
935 |
int chk0 = (nb_checks - 1) % NRC; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
936 |
if (index1) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
937 |
if (nb_checks == 1) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
938 |
return NULL; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
939 |
} else { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
940 |
// If the top range check's constant is the min or max of |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
941 |
// all constants we widen the next one to cover the whole |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
942 |
// range of constants. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
943 |
RangeCheck rc0 = prev_checks[chk0]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
944 |
int chk1 = (nb_checks - 2) % NRC; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
945 |
RangeCheck rc1 = prev_checks[chk1]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
946 |
if (rc0.off == off_lo) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
947 |
adjust_check(rc1.ctl, range1, index1, flip1, off_hi, igvn); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
948 |
prev_dom = rc1.ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
949 |
} else if (rc0.off == off_hi) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
950 |
adjust_check(rc1.ctl, range1, index1, flip1, off_lo, igvn); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
951 |
prev_dom = rc1.ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
952 |
} else { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
953 |
// If the top test's constant is not the min or max of all |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
954 |
// constants, we need 3 range checks. We must leave the |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
955 |
// top test unchanged because widening it would allow the |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
956 |
// accesses it protects to successfully read/write out of |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
957 |
// bounds. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
958 |
if (nb_checks == 2) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
959 |
return NULL; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
960 |
} |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
961 |
int chk2 = (nb_checks - 3) % NRC; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
962 |
RangeCheck rc2 = prev_checks[chk2]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
963 |
// The top range check a+i covers interval: -a <= i < length-a |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
964 |
// The second range check b+i covers interval: -b <= i < length-b |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
965 |
if (rc1.off <= rc0.off) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
966 |
// if b <= a, we change the second range check to: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
967 |
// -min_of_all_constants <= i < length-min_of_all_constants |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
968 |
// Together top and second range checks now cover: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
969 |
// -min_of_all_constants <= i < length-a |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
970 |
// which is more restrictive than -b <= i < length-b: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
971 |
// -b <= -min_of_all_constants <= i < length-a <= length-b |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
972 |
// The third check is then changed to: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
973 |
// -max_of_all_constants <= i < length-max_of_all_constants |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
974 |
// so 2nd and 3rd checks restrict allowed values of i to: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
975 |
// -min_of_all_constants <= i < length-max_of_all_constants |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
976 |
adjust_check(rc1.ctl, range1, index1, flip1, off_lo, igvn); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
977 |
adjust_check(rc2.ctl, range1, index1, flip1, off_hi, igvn); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
978 |
} else { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
979 |
// if b > a, we change the second range check to: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
980 |
// -max_of_all_constants <= i < length-max_of_all_constants |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
981 |
// Together top and second range checks now cover: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
982 |
// -a <= i < length-max_of_all_constants |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
983 |
// which is more restrictive than -b <= i < length-b: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
984 |
// -b < -a <= i < length-max_of_all_constants <= length-b |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
985 |
// The third check is then changed to: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
986 |
// -max_of_all_constants <= i < length-max_of_all_constants |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
987 |
// so 2nd and 3rd checks restrict allowed values of i to: |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
988 |
// -min_of_all_constants <= i < length-max_of_all_constants |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
989 |
adjust_check(rc1.ctl, range1, index1, flip1, off_hi, igvn); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
990 |
adjust_check(rc2.ctl, range1, index1, flip1, off_lo, igvn); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
991 |
} |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
992 |
prev_dom = rc2.ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
993 |
} |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
994 |
} |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
995 |
} else { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
996 |
RangeCheck rc0 = prev_checks[chk0]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
997 |
// 'Widen' the offset of the 1st and only covering check |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
998 |
adjust_check(rc0.ctl, range1, index1, flip1, off_hi, igvn); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
999 |
// Test is now covered by prior checks, dominate it out |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1000 |
prev_dom = rc0.ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1001 |
} |
1 | 1002 |
} |
1003 |
||
1004 |
} else { // Scan for an equivalent test |
|
1005 |
||
1006 |
Node *cmp; |
|
1007 |
int dist = 0; // Cutoff limit for search |
|
1008 |
int op = Opcode(); |
|
1009 |
if( op == Op_If && |
|
1010 |
(cmp=in(1)->in(1))->Opcode() == Op_CmpP ) { |
|
1011 |
if( cmp->in(2) != NULL && // make sure cmp is not already dead |
|
1012 |
cmp->in(2)->bottom_type() == TypePtr::NULL_PTR ) { |
|
1013 |
dist = 64; // Limit for null-pointer scans |
|
1014 |
} else { |
|
1015 |
dist = 4; // Do not bother for random pointer tests |
|
1016 |
} |
|
1017 |
} else { |
|
1018 |
dist = 4; // Limit for random junky scans |
|
1019 |
} |
|
1020 |
||
1021 |
// Normal equivalent-test check. |
|
1022 |
if( !dom ) return NULL; // Dead loop? |
|
1023 |
||
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1024 |
Node* result = fold_compares(phase); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1025 |
if (result != NULL) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1026 |
return result; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1027 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1028 |
|
1 | 1029 |
// Search up the dominator tree for an If with an identical test |
1030 |
while( dom->Opcode() != op || // Not same opcode? |
|
1031 |
dom->in(1) != in(1) || // Not same input 1? |
|
1032 |
(req() == 3 && dom->in(2) != in(2)) || // Not same input 2? |
|
1033 |
prev_dom->in(0) != dom ) { // One path of test does not dominate? |
|
1034 |
if( dist < 0 ) return NULL; |
|
1035 |
||
1036 |
dist--; |
|
1037 |
prev_dom = dom; |
|
1038 |
dom = up_one_dom( dom ); |
|
1039 |
if( !dom ) return NULL; |
|
1040 |
} |
|
1041 |
||
1042 |
// Check that we did not follow a loop back to ourselves |
|
1043 |
if( this == dom ) |
|
1044 |
return NULL; |
|
1045 |
||
1046 |
if( dist > 2 ) // Add to count of NULL checks elided |
|
1047 |
explicit_null_checks_elided++; |
|
1048 |
||
1049 |
} // End of Else scan for an equivalent test |
|
1050 |
||
1051 |
// Hit! Remove this IF |
|
1052 |
#ifndef PRODUCT |
|
1053 |
if( TraceIterativeGVN ) { |
|
1054 |
tty->print(" Removing IfNode: "); this->dump(); |
|
1055 |
} |
|
1056 |
if( VerifyOpto && !phase->allow_progress() ) { |
|
1057 |
// Found an equivalent dominating test, |
|
1058 |
// we can not guarantee reaching a fix-point for these during iterativeGVN |
|
1059 |
// since intervening nodes may not change. |
|
1060 |
return NULL; |
|
1061 |
} |
|
1062 |
#endif |
|
1063 |
||
1064 |
// Replace dominated IfNode |
|
1065 |
dominated_by( prev_dom, igvn ); |
|
1066 |
||
1067 |
// Must return either the original node (now dead) or a new node |
|
1068 |
// (Do not return a top here, since that would break the uniqueness of top.) |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
1069 |
return new ConINode(TypeInt::ZERO); |
1 | 1070 |
} |
1071 |
||
1072 |
//------------------------------dominated_by----------------------------------- |
|
1073 |
void IfNode::dominated_by( Node *prev_dom, PhaseIterGVN *igvn ) { |
|
1074 |
igvn->hash_delete(this); // Remove self to prevent spurious V-N |
|
1075 |
Node *idom = in(0); |
|
1076 |
// Need opcode to decide which way 'this' test goes |
|
1077 |
int prev_op = prev_dom->Opcode(); |
|
1078 |
Node *top = igvn->C->top(); // Shortcut to top |
|
1079 |
||
10253
35b975b1e8f3
7070134: Hotspot crashes with sigsegv from PorterStemmer
kvn
parents:
9449
diff
changeset
|
1080 |
// Loop predicates may have depending checks which should not |
35b975b1e8f3
7070134: Hotspot crashes with sigsegv from PorterStemmer
kvn
parents:
9449
diff
changeset
|
1081 |
// be skipped. For example, range check predicate has two checks |
35b975b1e8f3
7070134: Hotspot crashes with sigsegv from PorterStemmer
kvn
parents:
9449
diff
changeset
|
1082 |
// for lower and upper bounds. |
35b975b1e8f3
7070134: Hotspot crashes with sigsegv from PorterStemmer
kvn
parents:
9449
diff
changeset
|
1083 |
ProjNode* unc_proj = proj_out(1 - prev_dom->as_Proj()->_con)->as_Proj(); |
21089
e1986ff6fe2e
8024069: replace_in_map() should operate on parent maps
roland
parents:
20701
diff
changeset
|
1084 |
if (unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_predicate)) |
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1085 |
prev_dom = idom; |
10253
35b975b1e8f3
7070134: Hotspot crashes with sigsegv from PorterStemmer
kvn
parents:
9449
diff
changeset
|
1086 |
|
1 | 1087 |
// Now walk the current IfNode's projections. |
1088 |
// Loop ends when 'this' has no more uses. |
|
1089 |
for (DUIterator_Last imin, i = last_outs(imin); i >= imin; --i) { |
|
1090 |
Node *ifp = last_out(i); // Get IfTrue/IfFalse |
|
1091 |
igvn->add_users_to_worklist(ifp); |
|
1092 |
// Check which projection it is and set target. |
|
1093 |
// Data-target is either the dominating projection of the same type |
|
1094 |
// or TOP if the dominating projection is of opposite type. |
|
1095 |
// Data-target will be used as the new control edge for the non-CFG |
|
1096 |
// nodes like Casts and Loads. |
|
10253
35b975b1e8f3
7070134: Hotspot crashes with sigsegv from PorterStemmer
kvn
parents:
9449
diff
changeset
|
1097 |
Node *data_target = (ifp->Opcode() == prev_op) ? prev_dom : top; |
1 | 1098 |
// Control-target is just the If's immediate dominator or TOP. |
10253
35b975b1e8f3
7070134: Hotspot crashes with sigsegv from PorterStemmer
kvn
parents:
9449
diff
changeset
|
1099 |
Node *ctrl_target = (ifp->Opcode() == prev_op) ? idom : top; |
1 | 1100 |
|
1101 |
// For each child of an IfTrue/IfFalse projection, reroute. |
|
1102 |
// Loop ends when projection has no more uses. |
|
1103 |
for (DUIterator_Last jmin, j = ifp->last_outs(jmin); j >= jmin; --j) { |
|
1104 |
Node* s = ifp->last_out(j); // Get child of IfTrue/IfFalse |
|
1105 |
if( !s->depends_only_on_test() ) { |
|
1106 |
// Find the control input matching this def-use edge. |
|
1107 |
// For Regions it may not be in slot 0. |
|
1108 |
uint l; |
|
1109 |
for( l = 0; s->in(l) != ifp; l++ ) { } |
|
12958
009b6c9586d8
7173340: C2: code cleanup: use PhaseIterGVN::replace_edge(Node*, int, Node*) where applicable
kvn
parents:
10258
diff
changeset
|
1110 |
igvn->replace_input_of(s, l, ctrl_target); |
1 | 1111 |
} else { // Else, for control producers, |
12958
009b6c9586d8
7173340: C2: code cleanup: use PhaseIterGVN::replace_edge(Node*, int, Node*) where applicable
kvn
parents:
10258
diff
changeset
|
1112 |
igvn->replace_input_of(s, 0, data_target); // Move child to data-target |
1 | 1113 |
} |
1114 |
} // End for each child of a projection |
|
1115 |
||
1116 |
igvn->remove_dead_node(ifp); |
|
1117 |
} // End for each IfTrue/IfFalse child of If |
|
1118 |
||
1119 |
// Kill the IfNode |
|
1120 |
igvn->remove_dead_node(this); |
|
1121 |
} |
|
1122 |
||
1123 |
//------------------------------Identity--------------------------------------- |
|
1124 |
// If the test is constant & we match, then we are the input Control |
|
28486
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1125 |
Node *IfProjNode::Identity(PhaseTransform *phase) { |
1 | 1126 |
// Can only optimize if cannot go the other way |
1127 |
const TypeTuple *t = phase->type(in(0))->is_tuple(); |
|
28486
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1128 |
if (t == TypeTuple::IFNEITHER || |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1129 |
// kill dead branch first otherwise the IfNode's control will |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1130 |
// have 2 control uses (the IfNode that doesn't go away because |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1131 |
// it still has uses and this branch of the |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1132 |
// If). Node::has_special_unique_user() will cause this node to |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1133 |
// be reprocessed once the dead branch is killed. |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1134 |
(always_taken(t) && in(0)->outcnt() == 1)) { |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1135 |
// IfNode control |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1136 |
return in(0)->in(0); |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1137 |
} |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1138 |
// no progress |
b0df113b962e
8027626: assert(Opcode() != Op_If || outcnt() == 2) failed: bad if #1
roland
parents:
28044
diff
changeset
|
1139 |
return this; |
1 | 1140 |
} |
1141 |
||
1142 |
//------------------------------dump_spec-------------------------------------- |
|
1143 |
#ifndef PRODUCT |
|
1144 |
void IfNode::dump_spec(outputStream *st) const { |
|
1145 |
st->print("P=%f, C=%f",_prob,_fcnt); |
|
1146 |
} |
|
1147 |
#endif |
|
1148 |
||
1149 |
//------------------------------idealize_test---------------------------------- |
|
1150 |
// Try to canonicalize tests better. Peek at the Cmp/Bool/If sequence and |
|
1151 |
// come up with a canonical sequence. Bools getting 'eq', 'gt' and 'ge' forms |
|
1152 |
// converted to 'ne', 'le' and 'lt' forms. IfTrue/IfFalse get swapped as |
|
1153 |
// needed. |
|
1154 |
static IfNode* idealize_test(PhaseGVN* phase, IfNode* iff) { |
|
1155 |
assert(iff->in(0) != NULL, "If must be live"); |
|
1156 |
||
1157 |
if (iff->outcnt() != 2) return NULL; // Malformed projections. |
|
1158 |
Node* old_if_f = iff->proj_out(false); |
|
1159 |
Node* old_if_t = iff->proj_out(true); |
|
1160 |
||
1161 |
// CountedLoopEnds want the back-control test to be TRUE, irregardless of |
|
1162 |
// whether they are testing a 'gt' or 'lt' condition. The 'gt' condition |
|
1163 |
// happens in count-down loops |
|
1164 |
if (iff->is_CountedLoopEnd()) return NULL; |
|
1165 |
if (!iff->in(1)->is_Bool()) return NULL; // Happens for partially optimized IF tests |
|
1166 |
BoolNode *b = iff->in(1)->as_Bool(); |
|
1167 |
BoolTest bt = b->_test; |
|
1168 |
// Test already in good order? |
|
1169 |
if( bt.is_canonical() ) |
|
1170 |
return NULL; |
|
1171 |
||
1172 |
// Flip test to be canonical. Requires flipping the IfFalse/IfTrue and |
|
1173 |
// cloning the IfNode. |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
1174 |
Node* new_b = phase->transform( new BoolNode(b->in(1), bt.negate()) ); |
1 | 1175 |
if( !new_b->is_Bool() ) return NULL; |
1176 |
b = new_b->as_Bool(); |
|
1177 |
||
1178 |
PhaseIterGVN *igvn = phase->is_IterGVN(); |
|
1179 |
assert( igvn, "Test is not canonical in parser?" ); |
|
1180 |
||
1181 |
// The IF node never really changes, but it needs to be cloned |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
1182 |
iff = new IfNode( iff->in(0), b, 1.0-iff->_prob, iff->_fcnt); |
1 | 1183 |
|
1184 |
Node *prior = igvn->hash_find_insert(iff); |
|
1185 |
if( prior ) { |
|
1186 |
igvn->remove_dead_node(iff); |
|
1187 |
iff = (IfNode*)prior; |
|
1188 |
} else { |
|
1189 |
// Cannot call transform on it just yet |
|
1190 |
igvn->set_type_bottom(iff); |
|
1191 |
} |
|
1192 |
igvn->_worklist.push(iff); |
|
1193 |
||
1194 |
// Now handle projections. Cloning not required. |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
1195 |
Node* new_if_f = (Node*)(new IfFalseNode( iff )); |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
1196 |
Node* new_if_t = (Node*)(new IfTrueNode ( iff )); |
1 | 1197 |
|
1198 |
igvn->register_new_node_with_optimizer(new_if_f); |
|
1199 |
igvn->register_new_node_with_optimizer(new_if_t); |
|
1200 |
// Flip test, so flip trailing control |
|
5901
c046f8e9c52b
6677629: PhaseIterGVN::subsume_node() should call hash_delete() and add_users_to_worklist()
kvn
parents:
5547
diff
changeset
|
1201 |
igvn->replace_node(old_if_f, new_if_t); |
c046f8e9c52b
6677629: PhaseIterGVN::subsume_node() should call hash_delete() and add_users_to_worklist()
kvn
parents:
5547
diff
changeset
|
1202 |
igvn->replace_node(old_if_t, new_if_f); |
1 | 1203 |
|
1204 |
// Progress |
|
1205 |
return iff; |
|
1206 |
} |