author | roland |
Wed, 18 Oct 2017 16:06:39 +0200 | |
changeset 47686 | 24ebaf9d7198 |
parent 47216 | 71c04702a3d5 |
child 48145 | f913f6dba2d3 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
44314
diff
changeset
|
2 |
* Copyright (c) 2000, 2017, 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" |
34151
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
26 |
#include "ci/ciTypeFlow.hpp" |
7397 | 27 |
#include "memory/allocation.inline.hpp" |
37248 | 28 |
#include "memory/resourceArea.hpp" |
7397 | 29 |
#include "opto/addnode.hpp" |
30183 | 30 |
#include "opto/castnode.hpp" |
7397 | 31 |
#include "opto/cfgnode.hpp" |
32 |
#include "opto/connode.hpp" |
|
9101 | 33 |
#include "opto/loopnode.hpp" |
7397 | 34 |
#include "opto/phaseX.hpp" |
35 |
#include "opto/runtime.hpp" |
|
30183 | 36 |
#include "opto/rootnode.hpp" |
7397 | 37 |
#include "opto/subnode.hpp" |
38 |
||
1 | 39 |
// Portions of code courtesy of Clifford Click |
40 |
||
41 |
// Optimization - Graph Style |
|
42 |
||
43 |
||
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
44 |
#ifndef PRODUCT |
1 | 45 |
extern int explicit_null_checks_elided; |
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
46 |
#endif |
1 | 47 |
|
48 |
//============================================================================= |
|
49 |
//------------------------------Value------------------------------------------ |
|
50 |
// Return a tuple for whichever arm of the IF is reachable |
|
35551
36ef3841fb34
8146629: Make phase->is_IterGVN() accessible from Node::Identity and Node::Value
thartmann
parents:
34181
diff
changeset
|
51 |
const Type* IfNode::Value(PhaseGVN* phase) const { |
1 | 52 |
if( !in(0) ) return Type::TOP; |
53 |
if( phase->type(in(0)) == Type::TOP ) |
|
54 |
return Type::TOP; |
|
55 |
const Type *t = phase->type(in(1)); |
|
56 |
if( t == Type::TOP ) // data is undefined |
|
57 |
return TypeTuple::IFNEITHER; // unreachable altogether |
|
58 |
if( t == TypeInt::ZERO ) // zero, or false |
|
59 |
return TypeTuple::IFFALSE; // only false branch is reachable |
|
60 |
if( t == TypeInt::ONE ) // 1, or true |
|
61 |
return TypeTuple::IFTRUE; // only true branch is reachable |
|
62 |
assert( t == TypeInt::BOOL, "expected boolean type" ); |
|
63 |
||
64 |
return TypeTuple::IFBOTH; // No progress |
|
65 |
} |
|
66 |
||
67 |
const RegMask &IfNode::out_RegMask() const { |
|
68 |
return RegMask::Empty; |
|
69 |
} |
|
70 |
||
71 |
//------------------------------split_if--------------------------------------- |
|
72 |
// Look for places where we merge constants, then test on the merged value. |
|
73 |
// If the IF test will be constant folded on the path with the constant, we |
|
74 |
// win by splitting the IF to before the merge point. |
|
75 |
static Node* split_if(IfNode *iff, PhaseIterGVN *igvn) { |
|
76 |
// I could be a lot more general here, but I'm trying to squeeze this |
|
77 |
// in before the Christmas '98 break so I'm gonna be kinda restrictive |
|
78 |
// on the patterns I accept. CNC |
|
79 |
||
80 |
// Look for a compare of a constant and a merged value |
|
81 |
Node *i1 = iff->in(1); |
|
82 |
if( !i1->is_Bool() ) return NULL; |
|
83 |
BoolNode *b = i1->as_Bool(); |
|
84 |
Node *cmp = b->in(1); |
|
85 |
if( !cmp->is_Cmp() ) return NULL; |
|
86 |
i1 = cmp->in(1); |
|
87 |
if( i1 == NULL || !i1->is_Phi() ) return NULL; |
|
88 |
PhiNode *phi = i1->as_Phi(); |
|
89 |
if( phi->is_copy() ) return NULL; |
|
90 |
Node *con2 = cmp->in(2); |
|
91 |
if( !con2->is_Con() ) return NULL; |
|
92 |
// See that the merge point contains some constants |
|
93 |
Node *con1=NULL; |
|
94 |
uint i4; |
|
95 |
for( i4 = 1; i4 < phi->req(); i4++ ) { |
|
96 |
con1 = phi->in(i4); |
|
2131 | 97 |
if( !con1 ) return NULL; // Do not optimize partially collapsed merges |
1 | 98 |
if( con1->is_Con() ) break; // Found a constant |
99 |
// Also allow null-vs-not-null checks |
|
100 |
const TypePtr *tp = igvn->type(con1)->isa_ptr(); |
|
101 |
if( tp && tp->_ptr == TypePtr::NotNull ) |
|
102 |
break; |
|
103 |
} |
|
104 |
if( i4 >= phi->req() ) return NULL; // Found no constants |
|
105 |
||
106 |
igvn->C->set_has_split_ifs(true); // Has chance for split-if |
|
107 |
||
108 |
// Make sure that the compare can be constant folded away |
|
109 |
Node *cmp2 = cmp->clone(); |
|
110 |
cmp2->set_req(1,con1); |
|
111 |
cmp2->set_req(2,con2); |
|
112 |
const Type *t = cmp2->Value(igvn); |
|
113 |
// This compare is dead, so whack it! |
|
114 |
igvn->remove_dead_node(cmp2); |
|
115 |
if( !t->singleton() ) return NULL; |
|
116 |
||
117 |
// No intervening control, like a simple Call |
|
118 |
Node *r = iff->in(0); |
|
119 |
if( !r->is_Region() ) return NULL; |
|
120 |
if( phi->region() != r ) return NULL; |
|
121 |
// No other users of the cmp/bool |
|
122 |
if (b->outcnt() != 1 || cmp->outcnt() != 1) { |
|
123 |
//tty->print_cr("many users of cmp/bool"); |
|
124 |
return NULL; |
|
125 |
} |
|
126 |
||
127 |
// Make sure we can determine where all the uses of merged values go |
|
128 |
for (DUIterator_Fast jmax, j = r->fast_outs(jmax); j < jmax; j++) { |
|
129 |
Node* u = r->fast_out(j); |
|
130 |
if( u == r ) continue; |
|
131 |
if( u == iff ) continue; |
|
132 |
if( u->outcnt() == 0 ) continue; // use is dead & ignorable |
|
133 |
if( !u->is_Phi() ) { |
|
134 |
/* |
|
135 |
if( u->is_Start() ) { |
|
136 |
tty->print_cr("Region has inlined start use"); |
|
137 |
} else { |
|
138 |
tty->print_cr("Region has odd use"); |
|
139 |
u->dump(2); |
|
140 |
}*/ |
|
141 |
return NULL; |
|
142 |
} |
|
143 |
if( u != phi ) { |
|
144 |
// CNC - do not allow any other merged value |
|
145 |
//tty->print_cr("Merging another value"); |
|
146 |
//u->dump(2); |
|
147 |
return NULL; |
|
148 |
} |
|
149 |
// Make sure we can account for all Phi uses |
|
150 |
for (DUIterator_Fast kmax, k = u->fast_outs(kmax); k < kmax; k++) { |
|
151 |
Node* v = u->fast_out(k); // User of the phi |
|
152 |
// CNC - Allow only really simple patterns. |
|
153 |
// In particular I disallow AddP of the Phi, a fairly common pattern |
|
28927
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
154 |
if (v == cmp) continue; // The compare is OK |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
155 |
if (v->is_ConstraintCast()) { |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
156 |
// If the cast is derived from data flow edges, it may not have a control edge. |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
157 |
// If so, it should be safe to split. But follow-up code can not deal with |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
158 |
// this (l. 359). So skip. |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
159 |
if (v->in(0) == NULL) { |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
160 |
return NULL; |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
161 |
} |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
162 |
if (v->in(0)->in(0) == iff) { |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
163 |
continue; // CastPP/II of the IfNode is OK |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
164 |
} |
48e4a707e777
8071996: split_if accesses NULL region of ConstraintCast
goetz
parents:
28486
diff
changeset
|
165 |
} |
1 | 166 |
// Disabled following code because I cannot tell if exactly one |
167 |
// path dominates without a real dominator check. CNC 9/9/1999 |
|
168 |
//uint vop = v->Opcode(); |
|
169 |
//if( vop == Op_Phi ) { // Phi from another merge point might be OK |
|
170 |
// Node *r = v->in(0); // Get controlling point |
|
171 |
// if( !r ) return NULL; // Degraded to a copy |
|
172 |
// // Find exactly one path in (either True or False doms, but not IFF) |
|
173 |
// int cnt = 0; |
|
174 |
// for( uint i = 1; i < r->req(); i++ ) |
|
175 |
// if( r->in(i) && r->in(i)->in(0) == iff ) |
|
176 |
// cnt++; |
|
177 |
// if( cnt == 1 ) continue; // Exactly one of True or False guards Phi |
|
178 |
//} |
|
179 |
if( !v->is_Call() ) { |
|
180 |
/* |
|
181 |
if( v->Opcode() == Op_AddP ) { |
|
182 |
tty->print_cr("Phi has AddP use"); |
|
183 |
} else if( v->Opcode() == Op_CastPP ) { |
|
184 |
tty->print_cr("Phi has CastPP use"); |
|
185 |
} else if( v->Opcode() == Op_CastII ) { |
|
186 |
tty->print_cr("Phi has CastII use"); |
|
187 |
} else { |
|
188 |
tty->print_cr("Phi has use I cant be bothered with"); |
|
189 |
} |
|
190 |
*/ |
|
191 |
} |
|
192 |
return NULL; |
|
193 |
||
194 |
/* CNC - Cut out all the fancy acceptance tests |
|
195 |
// Can we clone this use when doing the transformation? |
|
196 |
// If all uses are from Phis at this merge or constants, then YES. |
|
197 |
if( !v->in(0) && v != cmp ) { |
|
198 |
tty->print_cr("Phi has free-floating use"); |
|
199 |
v->dump(2); |
|
200 |
return NULL; |
|
201 |
} |
|
202 |
for( uint l = 1; l < v->req(); l++ ) { |
|
203 |
if( (!v->in(l)->is_Phi() || v->in(l)->in(0) != r) && |
|
204 |
!v->in(l)->is_Con() ) { |
|
205 |
tty->print_cr("Phi has use"); |
|
206 |
v->dump(2); |
|
207 |
return NULL; |
|
208 |
} // End of if Phi-use input is neither Phi nor Constant |
|
209 |
} // End of for all inputs to Phi-use |
|
210 |
*/ |
|
211 |
} // End of for all uses of Phi |
|
212 |
} // End of for all uses of Region |
|
213 |
||
214 |
// Only do this if the IF node is in a sane state |
|
215 |
if (iff->outcnt() != 2) |
|
216 |
return NULL; |
|
217 |
||
218 |
// Got a hit! Do the Mondo Hack! |
|
219 |
// |
|
220 |
//ABC a1c def ghi B 1 e h A C a c d f g i |
|
221 |
// R - Phi - Phi - Phi Rc - Phi - Phi - Phi Rx - Phi - Phi - Phi |
|
222 |
// cmp - 2 cmp - 2 cmp - 2 |
|
223 |
// bool bool_c bool_x |
|
224 |
// if if_c if_x |
|
225 |
// T F T F T F |
|
226 |
// ..s.. ..t .. ..s.. ..t.. ..s.. ..t.. |
|
227 |
// |
|
2131 | 228 |
// Split the paths coming into the merge point into 2 separate groups of |
1 | 229 |
// merges. On the left will be all the paths feeding constants into the |
230 |
// Cmp's Phi. On the right will be the remaining paths. The Cmp's Phi |
|
231 |
// will fold up into a constant; this will let the Cmp fold up as well as |
|
232 |
// all the control flow. Below the original IF we have 2 control |
|
233 |
// dependent regions, 's' and 't'. Now we will merge the two paths |
|
234 |
// just prior to 's' and 't' from the two IFs. At least 1 path (and quite |
|
235 |
// likely 2 or more) will promptly constant fold away. |
|
236 |
PhaseGVN *phase = igvn; |
|
237 |
||
238 |
// Make a region merging constants and a region merging the rest |
|
239 |
uint req_c = 0; |
|
9101 | 240 |
Node* predicate_proj = NULL; |
30309
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
241 |
int nb_predicate_proj = 0; |
1 | 242 |
for (uint ii = 1; ii < r->req(); ii++) { |
9101 | 243 |
if (phi->in(ii) == con1) { |
1 | 244 |
req_c++; |
245 |
} |
|
9101 | 246 |
Node* proj = PhaseIdealLoop::find_predicate(r->in(ii)); |
247 |
if (proj != NULL) { |
|
30309
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
248 |
nb_predicate_proj++; |
9101 | 249 |
predicate_proj = proj; |
250 |
} |
|
1 | 251 |
} |
44241
99010d3fcc97
8164954: split_if creates empty phi and region nodes
neliasso
parents:
37248
diff
changeset
|
252 |
|
99010d3fcc97
8164954: split_if creates empty phi and region nodes
neliasso
parents:
37248
diff
changeset
|
253 |
// If all the defs of the phi are the same constant, we already have the desired end state. |
99010d3fcc97
8164954: split_if creates empty phi and region nodes
neliasso
parents:
37248
diff
changeset
|
254 |
// Skip the split that would create empty phi and region nodes. |
99010d3fcc97
8164954: split_if creates empty phi and region nodes
neliasso
parents:
37248
diff
changeset
|
255 |
if((r->req() - req_c) == 1) { |
99010d3fcc97
8164954: split_if creates empty phi and region nodes
neliasso
parents:
37248
diff
changeset
|
256 |
return NULL; |
99010d3fcc97
8164954: split_if creates empty phi and region nodes
neliasso
parents:
37248
diff
changeset
|
257 |
} |
99010d3fcc97
8164954: split_if creates empty phi and region nodes
neliasso
parents:
37248
diff
changeset
|
258 |
|
30309
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
259 |
if (nb_predicate_proj > 1) { |
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
260 |
// Can happen in case of loop unswitching and when the loop is |
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
261 |
// optimized out: it's not a loop anymore so we don't care about |
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
262 |
// predicates. |
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
263 |
assert(!r->is_Loop(), "this must not be a loop anymore"); |
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
264 |
predicate_proj = NULL; |
da3efc8ed2cb
8078426: mb/jvm/compiler/InterfaceCalls/testAC2 - assert(predicate_proj == 0L) failed: only one predicate entry expected
roland
parents:
30183
diff
changeset
|
265 |
} |
9101 | 266 |
Node* predicate_c = NULL; |
267 |
Node* predicate_x = NULL; |
|
9446 | 268 |
bool counted_loop = r->is_CountedLoop(); |
9101 | 269 |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
270 |
Node *region_c = new RegionNode(req_c + 1); |
1 | 271 |
Node *phi_c = con1; |
272 |
uint len = r->req(); |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
273 |
Node *region_x = new RegionNode(len - req_c); |
1 | 274 |
Node *phi_x = PhiNode::make_blank(region_x, phi); |
275 |
for (uint i = 1, i_c = 1, i_x = 1; i < len; i++) { |
|
9101 | 276 |
if (phi->in(i) == con1) { |
1 | 277 |
region_c->init_req( i_c++, r ->in(i) ); |
9101 | 278 |
if (r->in(i) == predicate_proj) |
279 |
predicate_c = predicate_proj; |
|
1 | 280 |
} else { |
281 |
region_x->init_req( i_x, r ->in(i) ); |
|
282 |
phi_x ->init_req( i_x++, phi->in(i) ); |
|
9101 | 283 |
if (r->in(i) == predicate_proj) |
284 |
predicate_x = predicate_proj; |
|
1 | 285 |
} |
286 |
} |
|
10258
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
287 |
if (predicate_c != NULL && (req_c > 1)) { |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
288 |
assert(predicate_x == NULL, "only one predicate entry expected"); |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
289 |
predicate_c = NULL; // Do not clone predicate below merge point |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
290 |
} |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
291 |
if (predicate_x != NULL && ((len - req_c) > 2)) { |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
292 |
assert(predicate_c == NULL, "only one predicate entry expected"); |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
293 |
predicate_x = NULL; // Do not clone predicate below merge point |
10c77b8c8d3e
7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
kvn
parents:
10253
diff
changeset
|
294 |
} |
1 | 295 |
|
296 |
// Register the new RegionNodes but do not transform them. Cannot |
|
2131 | 297 |
// transform until the entire Region/Phi conglomerate has been hacked |
1 | 298 |
// as a single huge transform. |
299 |
igvn->register_new_node_with_optimizer( region_c ); |
|
300 |
igvn->register_new_node_with_optimizer( region_x ); |
|
301 |
// Prevent the untimely death of phi_x. Currently he has no uses. He is |
|
302 |
// about to get one. If this only use goes away, then phi_x will look dead. |
|
303 |
// 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
|
304 |
Node *hook = new Node(4); |
1 | 305 |
hook->init_req(0, phi_x); |
306 |
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
|
307 |
phi_x = phase->transform( phi_x ); |
1 | 308 |
|
309 |
// Make the compare |
|
310 |
Node *cmp_c = phase->makecon(t); |
|
311 |
Node *cmp_x = cmp->clone(); |
|
312 |
cmp_x->set_req(1,phi_x); |
|
313 |
cmp_x->set_req(2,con2); |
|
314 |
cmp_x = phase->transform(cmp_x); |
|
315 |
// Make the bool |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
316 |
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
|
317 |
Node *b_x = phase->transform(new BoolNode(cmp_x,b->_test._test)); |
1 | 318 |
// Make the IfNode |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
319 |
IfNode* iff_c = iff->clone()->as_If(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
320 |
iff_c->set_req(0, region_c); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
321 |
iff_c->set_req(1, b_c); |
1 | 322 |
igvn->set_type_bottom(iff_c); |
323 |
igvn->_worklist.push(iff_c); |
|
324 |
hook->init_req(2, iff_c); |
|
325 |
||
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
326 |
IfNode* iff_x = iff->clone()->as_If(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
327 |
iff_x->set_req(0, region_x); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
328 |
iff_x->set_req(1, b_x); |
1 | 329 |
igvn->set_type_bottom(iff_x); |
330 |
igvn->_worklist.push(iff_x); |
|
331 |
hook->init_req(3, iff_x); |
|
332 |
||
333 |
// Make the true/false arms |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
334 |
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
|
335 |
Node *iff_c_f = phase->transform(new IfFalseNode(iff_c)); |
9101 | 336 |
if (predicate_c != NULL) { |
337 |
assert(predicate_x == NULL, "only one predicate entry expected"); |
|
338 |
// Clone loop predicates to each path |
|
9446 | 339 |
iff_c_t = igvn->clone_loop_predicates(predicate_c, iff_c_t, !counted_loop); |
340 |
iff_c_f = igvn->clone_loop_predicates(predicate_c, iff_c_f, !counted_loop); |
|
9101 | 341 |
} |
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
342 |
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
|
343 |
Node *iff_x_f = phase->transform(new IfFalseNode(iff_x)); |
9101 | 344 |
if (predicate_x != NULL) { |
345 |
assert(predicate_c == NULL, "only one predicate entry expected"); |
|
346 |
// Clone loop predicates to each path |
|
9446 | 347 |
iff_x_t = igvn->clone_loop_predicates(predicate_x, iff_x_t, !counted_loop); |
348 |
iff_x_f = igvn->clone_loop_predicates(predicate_x, iff_x_f, !counted_loop); |
|
9101 | 349 |
} |
1 | 350 |
|
351 |
// Merge the TRUE paths |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
352 |
Node *region_s = new RegionNode(3); |
1 | 353 |
igvn->_worklist.push(region_s); |
354 |
region_s->init_req(1, iff_c_t); |
|
355 |
region_s->init_req(2, iff_x_t); |
|
356 |
igvn->register_new_node_with_optimizer( region_s ); |
|
357 |
||
358 |
// Merge the FALSE paths |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
359 |
Node *region_f = new RegionNode(3); |
1 | 360 |
igvn->_worklist.push(region_f); |
361 |
region_f->init_req(1, iff_c_f); |
|
362 |
region_f->init_req(2, iff_x_f); |
|
363 |
igvn->register_new_node_with_optimizer( region_f ); |
|
364 |
||
365 |
igvn->hash_delete(cmp);// Remove soon-to-be-dead node from hash table. |
|
366 |
cmp->set_req(1,NULL); // Whack the inputs to cmp because it will be dead |
|
367 |
cmp->set_req(2,NULL); |
|
368 |
// Check for all uses of the Phi and give them a new home. |
|
369 |
// The 'cmp' got cloned, but CastPP/IIs need to be moved. |
|
370 |
Node *phi_s = NULL; // do not construct unless needed |
|
371 |
Node *phi_f = NULL; // do not construct unless needed |
|
372 |
for (DUIterator_Last i2min, i2 = phi->last_outs(i2min); i2 >= i2min; --i2) { |
|
373 |
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
|
374 |
igvn->rehash_node_delayed(v); // Have to fixup other Phi users |
1 | 375 |
uint vop = v->Opcode(); |
376 |
Node *proj = NULL; |
|
377 |
if( vop == Op_Phi ) { // Remote merge point |
|
378 |
Node *r = v->in(0); |
|
379 |
for (uint i3 = 1; i3 < r->req(); i3++) |
|
380 |
if (r->in(i3) && r->in(i3)->in(0) == iff) { |
|
381 |
proj = r->in(i3); |
|
382 |
break; |
|
383 |
} |
|
384 |
} else if( v->is_ConstraintCast() ) { |
|
385 |
proj = v->in(0); // Controlling projection |
|
386 |
} else { |
|
387 |
assert( 0, "do not know how to handle this guy" ); |
|
388 |
} |
|
389 |
||
390 |
Node *proj_path_data, *proj_path_ctrl; |
|
391 |
if( proj->Opcode() == Op_IfTrue ) { |
|
392 |
if( phi_s == NULL ) { |
|
393 |
// Only construct phi_s if needed, otherwise provides |
|
394 |
// interfering use. |
|
395 |
phi_s = PhiNode::make_blank(region_s,phi); |
|
396 |
phi_s->init_req( 1, phi_c ); |
|
397 |
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
|
398 |
hook->add_req(phi_s); |
1 | 399 |
phi_s = phase->transform(phi_s); |
400 |
} |
|
401 |
proj_path_data = phi_s; |
|
402 |
proj_path_ctrl = region_s; |
|
403 |
} else { |
|
404 |
if( phi_f == NULL ) { |
|
405 |
// Only construct phi_f if needed, otherwise provides |
|
406 |
// interfering use. |
|
407 |
phi_f = PhiNode::make_blank(region_f,phi); |
|
408 |
phi_f->init_req( 1, phi_c ); |
|
409 |
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
|
410 |
hook->add_req(phi_f); |
1 | 411 |
phi_f = phase->transform(phi_f); |
412 |
} |
|
413 |
proj_path_data = phi_f; |
|
414 |
proj_path_ctrl = region_f; |
|
415 |
} |
|
416 |
||
417 |
// Fixup 'v' for for the split |
|
418 |
if( vop == Op_Phi ) { // Remote merge point |
|
419 |
uint i; |
|
420 |
for( i = 1; i < v->req(); i++ ) |
|
421 |
if( v->in(i) == phi ) |
|
422 |
break; |
|
423 |
v->set_req(i, proj_path_data ); |
|
424 |
} else if( v->is_ConstraintCast() ) { |
|
425 |
v->set_req(0, proj_path_ctrl ); |
|
426 |
v->set_req(1, proj_path_data ); |
|
427 |
} else |
|
428 |
ShouldNotReachHere(); |
|
429 |
} |
|
430 |
||
431 |
// Now replace the original iff's True/False with region_s/region_t. |
|
432 |
// This makes the original iff go dead. |
|
433 |
for (DUIterator_Last i3min, i3 = iff->last_outs(i3min); i3 >= i3min; --i3) { |
|
434 |
Node* p = iff->last_out(i3); |
|
435 |
assert( p->Opcode() == Op_IfTrue || p->Opcode() == Op_IfFalse, "" ); |
|
436 |
Node *u = (p->Opcode() == Op_IfTrue) ? region_s : region_f; |
|
437 |
// Replace p with u |
|
438 |
igvn->add_users_to_worklist(p); |
|
439 |
for (DUIterator_Last lmin, l = p->last_outs(lmin); l >= lmin;) { |
|
440 |
Node* x = p->last_out(l); |
|
441 |
igvn->hash_delete(x); |
|
442 |
uint uses_found = 0; |
|
443 |
for( uint j = 0; j < x->req(); j++ ) { |
|
444 |
if( x->in(j) == p ) { |
|
445 |
x->set_req(j, u); |
|
446 |
uses_found++; |
|
447 |
} |
|
448 |
} |
|
449 |
l -= uses_found; // we deleted 1 or more copies of this edge |
|
450 |
} |
|
451 |
igvn->remove_dead_node(p); |
|
452 |
} |
|
453 |
||
454 |
// Force the original merge dead |
|
455 |
igvn->hash_delete(r); |
|
3268
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
456 |
// First, remove region's dead users. |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
457 |
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
|
458 |
Node* u = r->last_out(l); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
459 |
if( u == r ) { |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
460 |
r->set_req(0, NULL); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
461 |
} else { |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
462 |
assert(u->outcnt() == 0, "only dead users"); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
463 |
igvn->remove_dead_node(u); |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
464 |
} |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
465 |
l -= 1; |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
466 |
} |
f034e0c86895
6851742: (EA) allocation elimination doesn't work with UseG1GC
kvn
parents:
2131
diff
changeset
|
467 |
igvn->remove_dead_node(r); |
1 | 468 |
|
469 |
// Now remove the bogus extra edges used to keep things alive |
|
470 |
igvn->remove_dead_node( hook ); |
|
471 |
||
472 |
// Must return either the original node (now dead) or a new node |
|
473 |
// (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
|
474 |
return new ConINode(TypeInt::ZERO); |
1 | 475 |
} |
476 |
||
30183 | 477 |
// if this IfNode follows a range check pattern return the projection |
478 |
// for the failed path |
|
479 |
ProjNode* IfNode::range_check_trap_proj(int& flip_test, Node*& l, Node*& r) { |
|
47686
24ebaf9d7198
8188223: IfNode::range_check_trap_proj() should handler dying subgraph with single if proj
roland
parents:
47216
diff
changeset
|
480 |
if (outcnt() != 2) { |
24ebaf9d7198
8188223: IfNode::range_check_trap_proj() should handler dying subgraph with single if proj
roland
parents:
47216
diff
changeset
|
481 |
return NULL; |
24ebaf9d7198
8188223: IfNode::range_check_trap_proj() should handler dying subgraph with single if proj
roland
parents:
47216
diff
changeset
|
482 |
} |
1 | 483 |
Node* b = in(1); |
30183 | 484 |
if (b == NULL || !b->is_Bool()) return NULL; |
1 | 485 |
BoolNode* bn = b->as_Bool(); |
486 |
Node* cmp = bn->in(1); |
|
30183 | 487 |
if (cmp == NULL) return NULL; |
488 |
if (cmp->Opcode() != Op_CmpU) return NULL; |
|
1 | 489 |
|
30183 | 490 |
l = cmp->in(1); |
491 |
r = cmp->in(2); |
|
492 |
flip_test = 1; |
|
1 | 493 |
if (bn->_test._test == BoolTest::le) { |
494 |
l = cmp->in(2); |
|
495 |
r = cmp->in(1); |
|
496 |
flip_test = 2; |
|
497 |
} else if (bn->_test._test != BoolTest::lt) { |
|
30183 | 498 |
return NULL; |
1 | 499 |
} |
30183 | 500 |
if (l->is_top()) return NULL; // Top input means dead test |
34180
f0ec91019db2
8042997: Make intrinsic some or all check index/range methods
roland
parents:
34164
diff
changeset
|
501 |
if (r->Opcode() != Op_LoadRange && !is_RangeCheck()) return NULL; |
1 | 502 |
|
503 |
// We have recognized one of these forms: |
|
504 |
// Flip 1: If (Bool[<] CmpU(l, LoadRange)) ... |
|
505 |
// Flip 2: If (Bool[<=] CmpU(LoadRange, l)) ... |
|
506 |
||
30183 | 507 |
ProjNode* iftrap = proj_out(flip_test == 2 ? true : false); |
508 |
return iftrap; |
|
509 |
} |
|
510 |
||
511 |
||
512 |
//------------------------------is_range_check--------------------------------- |
|
513 |
// Return 0 if not a range check. Return 1 if a range check and set index and |
|
514 |
// offset. Return 2 if we had to negate the test. Index is NULL if the check |
|
515 |
// is versus a constant. |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
516 |
int RangeCheckNode::is_range_check(Node* &range, Node* &index, jint &offset) { |
30183 | 517 |
int flip_test = 0; |
518 |
Node* l = NULL; |
|
519 |
Node* r = NULL; |
|
520 |
ProjNode* iftrap = range_check_trap_proj(flip_test, l, r); |
|
521 |
||
522 |
if (iftrap == NULL) { |
|
523 |
return 0; |
|
524 |
} |
|
525 |
||
1 | 526 |
// Make sure it's a real range check by requiring an uncommon trap |
527 |
// along the OOB path. Otherwise, it's possible that the user wrote |
|
528 |
// something which optimized to look like a range check but behaves |
|
529 |
// in some other way. |
|
30183 | 530 |
if (iftrap->is_uncommon_trap_proj(Deoptimization::Reason_range_check) == NULL) { |
531 |
return 0; |
|
1 | 532 |
} |
533 |
||
534 |
// Look for index+offset form |
|
535 |
Node* ind = l; |
|
536 |
jint off = 0; |
|
537 |
if (l->is_top()) { |
|
538 |
return 0; |
|
26173
4275dfc46177
8054883: Segmentation error while running program
iveresov
parents:
24923
diff
changeset
|
539 |
} else if (l->Opcode() == Op_AddI) { |
1 | 540 |
if ((off = l->in(1)->find_int_con(0)) != 0) { |
34180
f0ec91019db2
8042997: Make intrinsic some or all check index/range methods
roland
parents:
34164
diff
changeset
|
541 |
ind = l->in(2)->uncast(); |
1 | 542 |
} else if ((off = l->in(2)->find_int_con(0)) != 0) { |
34180
f0ec91019db2
8042997: Make intrinsic some or all check index/range methods
roland
parents:
34164
diff
changeset
|
543 |
ind = l->in(1)->uncast(); |
1 | 544 |
} |
545 |
} else if ((off = l->find_int_con(-1)) >= 0) { |
|
546 |
// constant offset with no variable index |
|
547 |
ind = NULL; |
|
548 |
} else { |
|
549 |
// variable index with no constant offset (or dead negative index) |
|
550 |
off = 0; |
|
551 |
} |
|
552 |
||
553 |
// Return all the values: |
|
554 |
index = ind; |
|
555 |
offset = off; |
|
556 |
range = r; |
|
557 |
return flip_test; |
|
558 |
} |
|
559 |
||
560 |
//------------------------------adjust_check----------------------------------- |
|
561 |
// Adjust (widen) a prior range check |
|
562 |
static void adjust_check(Node* proj, Node* range, Node* index, |
|
563 |
int flip, jint off_lo, PhaseIterGVN* igvn) { |
|
564 |
PhaseGVN *gvn = igvn; |
|
565 |
// Break apart the old check |
|
566 |
Node *iff = proj->in(0); |
|
567 |
Node *bol = iff->in(1); |
|
568 |
if( bol->is_top() ) return; // In case a partially dead range check appears |
|
569 |
// bail (or bomb[ASSERT/DEBUG]) if NOT projection-->IfNode-->BoolNode |
|
570 |
DEBUG_ONLY( if( !bol->is_Bool() ) { proj->dump(3); fatal("Expect projection-->IfNode-->BoolNode"); } ) |
|
571 |
if( !bol->is_Bool() ) return; |
|
572 |
||
573 |
Node *cmp = bol->in(1); |
|
574 |
// Compute a new check |
|
575 |
Node *new_add = gvn->intcon(off_lo); |
|
576 |
if( index ) { |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
577 |
new_add = off_lo ? gvn->transform(new AddINode( index, new_add )) : index; |
1 | 578 |
} |
579 |
Node *new_cmp = (flip == 1) |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
580 |
? new CmpUNode( new_add, range ) |
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
581 |
: new CmpUNode( range, new_add ); |
1 | 582 |
new_cmp = gvn->transform(new_cmp); |
583 |
// See if no need to adjust the existing check |
|
584 |
if( new_cmp == cmp ) return; |
|
585 |
// Else, adjust existing check |
|
24923
9631f7d691dc
8034812: remove IDX_INIT macro hack in Node class
thartmann
parents:
24479
diff
changeset
|
586 |
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
|
587 |
igvn->rehash_node_delayed( iff ); |
1 | 588 |
iff->set_req_X( 1, new_bol, igvn ); |
589 |
} |
|
590 |
||
591 |
//------------------------------up_one_dom------------------------------------- |
|
592 |
// Walk up the dominator tree one step. Return NULL at root or true |
|
593 |
// complex merges. Skips through small diamonds. |
|
594 |
Node* IfNode::up_one_dom(Node *curr, bool linear_only) { |
|
595 |
Node *dom = curr->in(0); |
|
596 |
if( !dom ) // Found a Region degraded to a copy? |
|
597 |
return curr->nonnull_req(); // Skip thru it |
|
598 |
||
599 |
if( curr != dom ) // Normal walk up one step? |
|
600 |
return dom; |
|
601 |
||
602 |
// Use linear_only if we are still parsing, since we cannot |
|
603 |
// trust the regions to be fully filled in. |
|
604 |
if (linear_only) |
|
605 |
return NULL; |
|
606 |
||
4582
1a6662d11385
6915110: IfNode::up_one_dom moves beyond RootNode bug in src/share/vm/opto/ifnode.cpp
kvn
parents:
4020
diff
changeset
|
607 |
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
|
608 |
return NULL; |
1a6662d11385
6915110: IfNode::up_one_dom moves beyond RootNode bug in src/share/vm/opto/ifnode.cpp
kvn
parents:
4020
diff
changeset
|
609 |
|
1 | 610 |
// Else hit a Region. Check for a loop header |
611 |
if( dom->is_Loop() ) |
|
612 |
return dom->in(1); // Skip up thru loops |
|
613 |
||
614 |
// Check for small diamonds |
|
615 |
Node *din1, *din2, *din3, *din4; |
|
616 |
if( dom->req() == 3 && // 2-path merge point |
|
617 |
(din1 = dom ->in(1)) && // Left path exists |
|
618 |
(din2 = dom ->in(2)) && // Right path exists |
|
619 |
(din3 = din1->in(0)) && // Left path up one |
|
620 |
(din4 = din2->in(0)) ) { // Right path up one |
|
621 |
if( din3->is_Call() && // Handle a slow-path call on either arm |
|
622 |
(din3 = din3->in(0)) ) |
|
623 |
din3 = din3->in(0); |
|
624 |
if( din4->is_Call() && // Handle a slow-path call on either arm |
|
625 |
(din4 = din4->in(0)) ) |
|
626 |
din4 = din4->in(0); |
|
627 |
if( din3 == din4 && din3->is_If() ) |
|
628 |
return din3; // Skip around diamonds |
|
629 |
} |
|
630 |
||
631 |
// Give up the search at true merges |
|
632 |
return NULL; // Dead loop? Or hit root? |
|
633 |
} |
|
634 |
||
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
635 |
|
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
636 |
//------------------------------filtered_int_type-------------------------------- |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
637 |
// 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
|
638 |
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
|
639 |
assert(if_proj && |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
640 |
(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
|
641 |
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
|
642 |
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
|
643 |
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
|
644 |
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
|
645 |
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
|
646 |
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
|
647 |
if (cmp->in(1) == val) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
648 |
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
|
649 |
if (cmp2_t != NULL) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
650 |
jint lo = cmp2_t->_lo; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
651 |
jint hi = cmp2_t->_hi; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
652 |
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
|
653 |
switch (msk) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
654 |
case BoolTest::ne: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
655 |
// Can't refine type |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
656 |
return NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
657 |
case BoolTest::eq: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
658 |
return cmp2_t; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
659 |
case BoolTest::lt: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
660 |
lo = TypeInt::INT->_lo; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
661 |
if (hi - 1 < hi) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
662 |
hi = hi - 1; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
663 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
664 |
break; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
665 |
case BoolTest::le: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
666 |
lo = TypeInt::INT->_lo; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
667 |
break; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
668 |
case BoolTest::gt: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
669 |
if (lo + 1 > lo) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
670 |
lo = lo + 1; |
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 |
hi = TypeInt::INT->_hi; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
673 |
break; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
674 |
case BoolTest::ge: |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
675 |
// lo unchanged |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
676 |
hi = TypeInt::INT->_hi; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
677 |
break; |
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
44314
diff
changeset
|
678 |
default: |
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
44314
diff
changeset
|
679 |
break; |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
680 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
681 |
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
|
682 |
return rtn_t; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
683 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
684 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
685 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
686 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
687 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
688 |
return NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
689 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
690 |
|
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
691 |
//------------------------------fold_compares---------------------------- |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
692 |
// See if a pair of CmpIs can be converted into a CmpU. In some cases |
2131 | 693 |
// the direction of this if is determined by the preceding if so it |
30183 | 694 |
// can be eliminate entirely. |
695 |
// |
|
696 |
// Given an if testing (CmpI n v) check for an immediately control |
|
697 |
// dependent if that is testing (CmpI n v2) and has one projection |
|
698 |
// leading to this if and the other projection leading to a region |
|
699 |
// that merges one of this ifs control projections. |
|
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
700 |
// |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
701 |
// If |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
702 |
// / | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
703 |
// / | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
704 |
// / | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
705 |
// If | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
706 |
// /\ | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
707 |
// / \ | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
708 |
// / \ | |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
709 |
// / Region |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
710 |
// |
30183 | 711 |
// Or given an if testing (CmpI n v) check for a dominating if that is |
712 |
// testing (CmpI n v2), both having one projection leading to an |
|
713 |
// uncommon trap. Allow Another independent guard in between to cover |
|
714 |
// an explicit range check: |
|
715 |
// if (index < 0 || index >= array.length) { |
|
716 |
// which may need a null check to guard the LoadRange |
|
717 |
// |
|
718 |
// If |
|
719 |
// / \ |
|
720 |
// / \ |
|
721 |
// / \ |
|
722 |
// If unc |
|
723 |
// /\ |
|
724 |
// / \ |
|
725 |
// / \ |
|
726 |
// / unc |
|
727 |
// |
|
728 |
||
729 |
// Is the comparison for this If suitable for folding? |
|
730 |
bool IfNode::cmpi_folds(PhaseIterGVN* igvn) { |
|
731 |
return in(1) != NULL && |
|
732 |
in(1)->is_Bool() && |
|
733 |
in(1)->in(1) != NULL && |
|
734 |
in(1)->in(1)->Opcode() == Op_CmpI && |
|
735 |
in(1)->in(1)->in(2) != NULL && |
|
736 |
in(1)->in(1)->in(2) != igvn->C->top() && |
|
737 |
(in(1)->as_Bool()->_test.is_less() || |
|
738 |
in(1)->as_Bool()->_test.is_greater()); |
|
739 |
} |
|
740 |
||
741 |
// Is a dominating control suitable for folding with this if? |
|
742 |
bool IfNode::is_ctrl_folds(Node* ctrl, PhaseIterGVN* igvn) { |
|
743 |
return ctrl != NULL && |
|
744 |
ctrl->is_Proj() && |
|
745 |
ctrl->in(0) != NULL && |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
746 |
ctrl->in(0)->Opcode() == Op_If && |
30183 | 747 |
ctrl->in(0)->outcnt() == 2 && |
748 |
ctrl->in(0)->as_If()->cmpi_folds(igvn) && |
|
749 |
// Must compare same value |
|
750 |
ctrl->in(0)->in(1)->in(1)->in(1) != NULL && |
|
751 |
ctrl->in(0)->in(1)->in(1)->in(1) == in(1)->in(1)->in(1); |
|
752 |
} |
|
753 |
||
754 |
// Do this If and the dominating If share a region? |
|
755 |
bool IfNode::has_shared_region(ProjNode* proj, ProjNode*& success, ProjNode*& fail) { |
|
756 |
ProjNode* otherproj = proj->other_if_proj(); |
|
757 |
Node* otherproj_ctrl_use = otherproj->unique_ctrl_out(); |
|
758 |
RegionNode* region = (otherproj_ctrl_use != NULL && otherproj_ctrl_use->is_Region()) ? otherproj_ctrl_use->as_Region() : NULL; |
|
759 |
success = NULL; |
|
760 |
fail = NULL; |
|
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
761 |
|
30183 | 762 |
if (otherproj->outcnt() == 1 && region != NULL && !region->has_phi()) { |
763 |
for (int i = 0; i < 2; i++) { |
|
764 |
ProjNode* proj = proj_out(i); |
|
765 |
if (success == NULL && proj->outcnt() == 1 && proj->unique_out() == region) { |
|
766 |
success = proj; |
|
767 |
} else if (fail == NULL) { |
|
768 |
fail = proj; |
|
769 |
} else { |
|
770 |
success = fail = NULL; |
|
771 |
} |
|
772 |
} |
|
773 |
} |
|
774 |
return success != NULL && fail != NULL; |
|
775 |
} |
|
776 |
||
777 |
// Return projection that leads to an uncommon trap if any |
|
778 |
ProjNode* IfNode::uncommon_trap_proj(CallStaticJavaNode*& call) const { |
|
779 |
for (int i = 0; i < 2; i++) { |
|
780 |
call = proj_out(i)->is_uncommon_trap_proj(Deoptimization::Reason_none); |
|
781 |
if (call != NULL) { |
|
782 |
return proj_out(i); |
|
783 |
} |
|
784 |
} |
|
785 |
return NULL; |
|
786 |
} |
|
787 |
||
788 |
// Do this If and the dominating If both branch out to an uncommon trap |
|
789 |
bool IfNode::has_only_uncommon_traps(ProjNode* proj, ProjNode*& success, ProjNode*& fail, PhaseIterGVN* igvn) { |
|
790 |
ProjNode* otherproj = proj->other_if_proj(); |
|
791 |
CallStaticJavaNode* dom_unc = otherproj->is_uncommon_trap_proj(Deoptimization::Reason_none); |
|
792 |
||
793 |
if (otherproj->outcnt() == 1 && dom_unc != NULL) { |
|
34151
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
794 |
// We need to re-execute the folded Ifs after deoptimization from the merged traps |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
795 |
if (!dom_unc->jvms()->should_reexecute()) { |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
796 |
return false; |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
797 |
} |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
798 |
|
30183 | 799 |
CallStaticJavaNode* unc = NULL; |
800 |
ProjNode* unc_proj = uncommon_trap_proj(unc); |
|
801 |
if (unc_proj != NULL && unc_proj->outcnt() == 1) { |
|
802 |
if (dom_unc == unc) { |
|
803 |
// Allow the uncommon trap to be shared through a region |
|
804 |
RegionNode* r = unc->in(0)->as_Region(); |
|
805 |
if (r->outcnt() != 2 || r->req() != 3 || r->find_edge(otherproj) == -1 || r->find_edge(unc_proj) == -1) { |
|
806 |
return false; |
|
807 |
} |
|
808 |
assert(r->has_phi() == NULL, "simple region shouldn't have a phi"); |
|
809 |
} else if (dom_unc->in(0) != otherproj || unc->in(0) != unc_proj) { |
|
810 |
return false; |
|
811 |
} |
|
34151
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
812 |
|
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
813 |
// Different methods and methods containing jsrs are not supported. |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
814 |
ciMethod* method = unc->jvms()->method(); |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
815 |
ciMethod* dom_method = dom_unc->jvms()->method(); |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
816 |
if (method != dom_method || method->has_jsrs()) { |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
817 |
return false; |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
818 |
} |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
819 |
// Check that both traps are in the same activation of the method (instead |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
820 |
// of two activations being inlined through different call sites) by verifying |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
821 |
// that the call stacks are equal for both JVMStates. |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
822 |
JVMState* dom_caller = dom_unc->jvms()->caller(); |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
823 |
JVMState* caller = unc->jvms()->caller(); |
34177
e19e45b065c6
8142500: missing null checks in IfNode::has_only_uncommon_traps
thartmann
parents:
34164
diff
changeset
|
824 |
if ((dom_caller == NULL) != (caller == NULL)) { |
e19e45b065c6
8142500: missing null checks in IfNode::has_only_uncommon_traps
thartmann
parents:
34164
diff
changeset
|
825 |
// The current method must either be inlined into both dom_caller and |
e19e45b065c6
8142500: missing null checks in IfNode::has_only_uncommon_traps
thartmann
parents:
34164
diff
changeset
|
826 |
// caller or must not be inlined at all (top method). Bail out otherwise. |
e19e45b065c6
8142500: missing null checks in IfNode::has_only_uncommon_traps
thartmann
parents:
34164
diff
changeset
|
827 |
return false; |
e19e45b065c6
8142500: missing null checks in IfNode::has_only_uncommon_traps
thartmann
parents:
34164
diff
changeset
|
828 |
} else if (dom_caller != NULL && !dom_caller->same_calls_as(caller)) { |
34151
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
829 |
return false; |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
830 |
} |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
831 |
// Check that the bci of the dominating uncommon trap dominates the bci |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
832 |
// of the dominated uncommon trap. Otherwise we may not re-execute |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
833 |
// the dominated check after deoptimization from the merged uncommon trap. |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
834 |
ciTypeFlow* flow = dom_method->get_flow_analysis(); |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
835 |
int bci = unc->jvms()->bci(); |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
836 |
int dom_bci = dom_unc->jvms()->bci(); |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
837 |
if (!flow->is_dominated_by(bci, dom_bci)) { |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
838 |
return false; |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
839 |
} |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
840 |
|
30183 | 841 |
// See merge_uncommon_traps: the reason of the uncommon trap |
842 |
// will be changed and the state of the dominating If will be |
|
843 |
// used. Checked that we didn't apply this transformation in a |
|
844 |
// previous compilation and it didn't cause too many traps |
|
34151
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
845 |
if (!igvn->C->too_many_traps(dom_method, dom_bci, Deoptimization::Reason_unstable_fused_if) && |
8e0bebdbc29e
8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
thartmann
parents:
32732
diff
changeset
|
846 |
!igvn->C->too_many_traps(dom_method, dom_bci, Deoptimization::Reason_range_check)) { |
30183 | 847 |
success = unc_proj; |
848 |
fail = unc_proj->other_if_proj(); |
|
849 |
return true; |
|
850 |
} |
|
851 |
} |
|
852 |
} |
|
853 |
return false; |
|
854 |
} |
|
855 |
||
856 |
// Check that the 2 CmpI can be folded into as single CmpU and proceed with the folding |
|
857 |
bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* fail, PhaseIterGVN* igvn) { |
|
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
858 |
Node* this_cmp = in(1)->in(1); |
30183 | 859 |
BoolNode* this_bool = in(1)->as_Bool(); |
860 |
IfNode* dom_iff = proj->in(0)->as_If(); |
|
861 |
BoolNode* dom_bool = dom_iff->in(1)->as_Bool(); |
|
862 |
Node* lo = dom_iff->in(1)->in(1)->in(2); |
|
863 |
Node* hi = this_cmp->in(2); |
|
864 |
Node* n = this_cmp->in(1); |
|
865 |
ProjNode* otherproj = proj->other_if_proj(); |
|
866 |
||
867 |
const TypeInt* lo_type = IfNode::filtered_int_type(igvn, n, otherproj); |
|
868 |
const TypeInt* hi_type = IfNode::filtered_int_type(igvn, n, success); |
|
869 |
||
870 |
BoolTest::mask lo_test = dom_bool->_test._test; |
|
871 |
BoolTest::mask hi_test = this_bool->_test._test; |
|
872 |
BoolTest::mask cond = hi_test; |
|
873 |
||
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
874 |
// convert: |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
875 |
// |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
876 |
// dom_bool = x {<,<=,>,>=} a |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
877 |
// / \ |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
878 |
// proj = {True,False} / \ otherproj = {False,True} |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
879 |
// / |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
880 |
// this_bool = x {<,<=} b |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
881 |
// / \ |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
882 |
// fail = {True,False} / \ success = {False,True} |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
883 |
// / |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
884 |
// |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
885 |
// (Second test guaranteed canonicalized, first one may not have |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
886 |
// been canonicalized yet) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
887 |
// |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
888 |
// into: |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
889 |
// |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
890 |
// cond = (x - lo) {<u,<=u,>u,>=u} adjusted_lim |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
891 |
// / \ |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
892 |
// fail / \ success |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
893 |
// / |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
894 |
// |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
895 |
|
30183 | 896 |
// Figure out which of the two tests sets the upper bound and which |
897 |
// sets the lower bound if any. |
|
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
898 |
Node* adjusted_lim = NULL; |
30183 | 899 |
if (hi_type->_lo > lo_type->_hi && hi_type->_hi == max_jint && lo_type->_lo == min_jint) { |
900 |
assert((dom_bool->_test.is_less() && !proj->_con) || |
|
901 |
(dom_bool->_test.is_greater() && proj->_con), "incorrect test"); |
|
902 |
// this test was canonicalized |
|
903 |
assert(this_bool->_test.is_less() && fail->_con, "incorrect test"); |
|
904 |
||
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
905 |
// this_bool = < |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
906 |
// dom_bool = >= (proj = True) or dom_bool = < (proj = False) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
907 |
// x in [a, b[ on the fail (= True) projection, b > a-1 (because of hi_type->_lo > lo_type->_hi test above): |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
908 |
// lo = a, hi = b, adjusted_lim = b-a, cond = <u |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
909 |
// dom_bool = > (proj = True) or dom_bool = <= (proj = False) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
910 |
// x in ]a, b[ on the fail (= True) projection, b > a: |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
911 |
// lo = a+1, hi = b, adjusted_lim = b-a-1, cond = <u |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
912 |
// this_bool = <= |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
913 |
// dom_bool = >= (proj = True) or dom_bool = < (proj = False) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
914 |
// x in [a, b] on the fail (= True) projection, b+1 > a-1: |
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
915 |
// lo = a, hi = b, adjusted_lim = b-a+1, cond = <u |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
916 |
// lo = a, hi = b, adjusted_lim = b-a, cond = <=u doesn't work because b = a - 1 is possible, then b-a = -1 |
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
917 |
// dom_bool = > (proj = True) or dom_bool = <= (proj = False) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
918 |
// x in ]a, b] on the fail (= True) projection b+1 > a: |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
919 |
// lo = a+1, hi = b, adjusted_lim = b-a, cond = <u |
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
920 |
// lo = a+1, hi = b, adjusted_lim = b-a-1, cond = <=u doesn't work because a = b is possible, then b-a-1 = -1 |
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
921 |
|
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
922 |
if (hi_test == BoolTest::lt) { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
923 |
if (lo_test == BoolTest::gt || lo_test == BoolTest::le) { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
924 |
lo = igvn->transform(new AddINode(lo, igvn->intcon(1))); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
925 |
} |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
926 |
} else { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
927 |
assert(hi_test == BoolTest::le, "bad test"); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
928 |
if (lo_test == BoolTest::ge || lo_test == BoolTest::lt) { |
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
929 |
adjusted_lim = igvn->transform(new SubINode(hi, lo)); |
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
930 |
adjusted_lim = igvn->transform(new AddINode(adjusted_lim, igvn->intcon(1))); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
931 |
cond = BoolTest::lt; |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
932 |
} else { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
933 |
assert(lo_test == BoolTest::gt || lo_test == BoolTest::le, "bad test"); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
934 |
adjusted_lim = igvn->transform(new SubINode(hi, lo)); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
935 |
lo = igvn->transform(new AddINode(lo, igvn->intcon(1))); |
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
936 |
cond = BoolTest::lt; |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
937 |
} |
30183 | 938 |
} |
939 |
} else if (lo_type->_lo > hi_type->_hi && lo_type->_hi == max_jint && hi_type->_lo == min_jint) { |
|
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
940 |
|
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
941 |
// this_bool = < |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
942 |
// dom_bool = < (proj = True) or dom_bool = >= (proj = False) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
943 |
// x in [b, a[ on the fail (= False) projection, a > b-1 (because of lo_type->_lo > hi_type->_hi above): |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
944 |
// lo = b, hi = a, adjusted_lim = a-b, cond = >=u |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
945 |
// dom_bool = <= (proj = True) or dom_bool = > (proj = False) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
946 |
// x in [b, a] on the fail (= False) projection, a+1 > b-1: |
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
947 |
// lo = b, hi = a, adjusted_lim = a-b+1, cond = >=u |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
948 |
// lo = b, hi = a, adjusted_lim = a-b, cond = >u doesn't work because a = b - 1 is possible, then b-a = -1 |
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
949 |
// this_bool = <= |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
950 |
// dom_bool = < (proj = True) or dom_bool = >= (proj = False) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
951 |
// x in ]b, a[ on the fail (= False) projection, a > b: |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
952 |
// lo = b+1, hi = a, adjusted_lim = a-b-1, cond = >=u |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
953 |
// dom_bool = <= (proj = True) or dom_bool = > (proj = False) |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
954 |
// x in ]b, a] on the fail (= False) projection, a+1 > b: |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
955 |
// lo = b+1, hi = a, adjusted_lim = a-b, cond = >=u |
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
956 |
// lo = b+1, hi = a, adjusted_lim = a-b-1, cond = >u doesn't work because a = b is possible, then b-a-1 = -1 |
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
957 |
|
30183 | 958 |
swap(lo, hi); |
959 |
swap(lo_type, hi_type); |
|
960 |
swap(lo_test, hi_test); |
|
961 |
||
30631
483c444f36f4
8078436: java/util/stream/boottest/java/util/stream/UnorderedTest.java crashed with an assert in ifnode.cpp
roland
parents:
30629
diff
changeset
|
962 |
assert((dom_bool->_test.is_less() && proj->_con) || |
483c444f36f4
8078436: java/util/stream/boottest/java/util/stream/UnorderedTest.java crashed with an assert in ifnode.cpp
roland
parents:
30629
diff
changeset
|
963 |
(dom_bool->_test.is_greater() && !proj->_con), "incorrect test"); |
30183 | 964 |
// this test was canonicalized |
30631
483c444f36f4
8078436: java/util/stream/boottest/java/util/stream/UnorderedTest.java crashed with an assert in ifnode.cpp
roland
parents:
30629
diff
changeset
|
965 |
assert(this_bool->_test.is_less() && !fail->_con, "incorrect test"); |
30183 | 966 |
|
967 |
cond = (hi_test == BoolTest::le || hi_test == BoolTest::gt) ? BoolTest::gt : BoolTest::ge; |
|
968 |
||
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
969 |
if (lo_test == BoolTest::lt) { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
970 |
if (hi_test == BoolTest::lt || hi_test == BoolTest::ge) { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
971 |
cond = BoolTest::ge; |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
972 |
} else { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
973 |
assert(hi_test == BoolTest::le || hi_test == BoolTest::gt, "bad test"); |
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
974 |
adjusted_lim = igvn->transform(new SubINode(hi, lo)); |
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
975 |
adjusted_lim = igvn->transform(new AddINode(adjusted_lim, igvn->intcon(1))); |
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
976 |
cond = BoolTest::ge; |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
977 |
} |
32732
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
978 |
} else if (lo_test == BoolTest::le) { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
979 |
if (hi_test == BoolTest::lt || hi_test == BoolTest::ge) { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
980 |
lo = igvn->transform(new AddINode(lo, igvn->intcon(1))); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
981 |
cond = BoolTest::ge; |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
982 |
} else { |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
983 |
assert(hi_test == BoolTest::le || hi_test == BoolTest::gt, "bad test"); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
984 |
adjusted_lim = igvn->transform(new SubINode(hi, lo)); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
985 |
lo = igvn->transform(new AddINode(lo, igvn->intcon(1))); |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
986 |
cond = BoolTest::ge; |
9f4cf1523072
8135069: C2 replaces range checks by unsigned comparison with -1
roland
parents:
32084
diff
changeset
|
987 |
} |
30183 | 988 |
} |
989 |
} else { |
|
990 |
const TypeInt* failtype = filtered_int_type(igvn, n, proj); |
|
991 |
if (failtype != NULL) { |
|
992 |
const TypeInt* type2 = filtered_int_type(igvn, n, fail); |
|
993 |
if (type2 != NULL) { |
|
994 |
failtype = failtype->join(type2)->is_int(); |
|
995 |
if (failtype->_lo > failtype->_hi) { |
|
996 |
// previous if determines the result of this if so |
|
997 |
// replace Bool with constant |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
998 |
igvn->_worklist.push(in(1)); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
999 |
igvn->replace_input_of(this, 1, igvn->intcon(success->_con)); |
30183 | 1000 |
return true; |
1001 |
} |
|
1002 |
} |
|
1003 |
} |
|
1004 |
lo = NULL; |
|
1005 |
hi = NULL; |
|
1006 |
} |
|
1007 |
||
1008 |
if (lo && hi) { |
|
1009 |
// Merge the two compares into a single unsigned compare by building (CmpU (n - lo) (hi - lo)) |
|
1010 |
Node* adjusted_val = igvn->transform(new SubINode(n, lo)); |
|
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
1011 |
if (adjusted_lim == NULL) { |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
1012 |
adjusted_lim = igvn->transform(new SubINode(hi, lo)); |
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
1013 |
} |
30183 | 1014 |
Node* newcmp = igvn->transform(new CmpUNode(adjusted_val, adjusted_lim)); |
1015 |
Node* newbool = igvn->transform(new BoolNode(newcmp, cond)); |
|
1016 |
||
31132
328ac96a30d6
8081823: C2 performs unsigned comparison against -1
roland
parents:
30631
diff
changeset
|
1017 |
igvn->replace_input_of(dom_iff, 1, igvn->intcon(proj->_con)); |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1018 |
igvn->_worklist.push(in(1)); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1019 |
igvn->replace_input_of(this, 1, newbool); |
30183 | 1020 |
|
1021 |
return true; |
|
1022 |
} |
|
1023 |
return false; |
|
1024 |
} |
|
1025 |
||
1026 |
// Merge the branches that trap for this If and the dominating If into |
|
1027 |
// a single region that branches to the uncommon trap for the |
|
1028 |
// dominating If |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1029 |
Node* IfNode::merge_uncommon_traps(ProjNode* proj, ProjNode* success, ProjNode* fail, PhaseIterGVN* igvn) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1030 |
Node* res = this; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1031 |
assert(success->in(0) == this, "bad projection"); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1032 |
|
30183 | 1033 |
ProjNode* otherproj = proj->other_if_proj(); |
1034 |
||
1035 |
CallStaticJavaNode* unc = success->is_uncommon_trap_proj(Deoptimization::Reason_none); |
|
1036 |
CallStaticJavaNode* dom_unc = otherproj->is_uncommon_trap_proj(Deoptimization::Reason_none); |
|
1037 |
||
1038 |
if (unc != dom_unc) { |
|
1039 |
Node* r = new RegionNode(3); |
|
1040 |
||
1041 |
r->set_req(1, otherproj); |
|
1042 |
r->set_req(2, success); |
|
1043 |
r = igvn->transform(r); |
|
1044 |
assert(r->is_Region(), "can't go away"); |
|
1045 |
||
1046 |
// Make both If trap at the state of the first If: once the CmpI |
|
1047 |
// nodes are merged, if we trap we don't know which of the CmpI |
|
1048 |
// nodes would have caused the trap so we have to restart |
|
1049 |
// execution at the first one |
|
1050 |
igvn->replace_input_of(dom_unc, 0, r); |
|
1051 |
igvn->replace_input_of(unc, 0, igvn->C->top()); |
|
1052 |
} |
|
1053 |
int trap_request = dom_unc->uncommon_trap_request(); |
|
1054 |
Deoptimization::DeoptReason reason = Deoptimization::trap_request_reason(trap_request); |
|
1055 |
Deoptimization::DeoptAction action = Deoptimization::trap_request_action(trap_request); |
|
1056 |
||
1057 |
int flip_test = 0; |
|
1058 |
Node* l = NULL; |
|
1059 |
Node* r = NULL; |
|
1060 |
||
1061 |
if (success->in(0)->as_If()->range_check_trap_proj(flip_test, l, r) != NULL) { |
|
1062 |
// If this looks like a range check, change the trap to |
|
1063 |
// Reason_range_check so the compiler recognizes it as a range |
|
1064 |
// check and applies the corresponding optimizations |
|
1065 |
trap_request = Deoptimization::make_trap_request(Deoptimization::Reason_range_check, action); |
|
1066 |
||
1067 |
improve_address_types(l, r, fail, igvn); |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1068 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1069 |
res = igvn->transform(new RangeCheckNode(in(0), in(1), _prob, _fcnt)); |
30183 | 1070 |
} else if (unc != dom_unc) { |
1071 |
// If we trap we won't know what CmpI would have caused the trap |
|
1072 |
// so use a special trap reason to mark this pair of CmpI nodes as |
|
1073 |
// bad candidate for folding. On recompilation we won't fold them |
|
1074 |
// and we may trap again but this time we'll know what branch |
|
1075 |
// traps |
|
1076 |
trap_request = Deoptimization::make_trap_request(Deoptimization::Reason_unstable_fused_if, action); |
|
1077 |
} |
|
1078 |
igvn->replace_input_of(dom_unc, TypeFunc::Parms, igvn->intcon(trap_request)); |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1079 |
return res; |
30183 | 1080 |
} |
1081 |
||
1082 |
// If we are turning 2 CmpI nodes into a CmpU that follows the pattern |
|
1083 |
// of a rangecheck on index i, on 64 bit the compares may be followed |
|
1084 |
// by memory accesses using i as index. In that case, the CmpU tells |
|
1085 |
// us something about the values taken by i that can help the compiler |
|
1086 |
// (see Compile::conv_I2X_index()) |
|
1087 |
void IfNode::improve_address_types(Node* l, Node* r, ProjNode* fail, PhaseIterGVN* igvn) { |
|
1088 |
#ifdef _LP64 |
|
1089 |
ResourceMark rm; |
|
1090 |
Node_Stack stack(2); |
|
1091 |
||
1092 |
assert(r->Opcode() == Op_LoadRange, "unexpected range check"); |
|
1093 |
const TypeInt* array_size = igvn->type(r)->is_int(); |
|
1094 |
||
1095 |
stack.push(l, 0); |
|
1096 |
||
1097 |
while(stack.size() > 0) { |
|
1098 |
Node* n = stack.node(); |
|
1099 |
uint start = stack.index(); |
|
1100 |
||
1101 |
uint i = start; |
|
1102 |
for (; i < n->outcnt(); i++) { |
|
1103 |
Node* use = n->raw_out(i); |
|
1104 |
if (stack.size() == 1) { |
|
1105 |
if (use->Opcode() == Op_ConvI2L) { |
|
1106 |
const TypeLong* bounds = use->as_Type()->type()->is_long(); |
|
1107 |
if (bounds->_lo <= array_size->_lo && bounds->_hi >= array_size->_hi && |
|
1108 |
(bounds->_lo != array_size->_lo || bounds->_hi != array_size->_hi)) { |
|
1109 |
stack.set_index(i+1); |
|
1110 |
stack.push(use, 0); |
|
1111 |
break; |
|
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1112 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1113 |
} |
30183 | 1114 |
} else if (use->is_Mem()) { |
1115 |
Node* ctrl = use->in(0); |
|
1116 |
for (int i = 0; i < 10 && ctrl != NULL && ctrl != fail; i++) { |
|
1117 |
ctrl = up_one_dom(ctrl); |
|
1118 |
} |
|
1119 |
if (ctrl == fail) { |
|
1120 |
Node* init_n = stack.node_at(1); |
|
1121 |
assert(init_n->Opcode() == Op_ConvI2L, "unexpected first node"); |
|
35574
2b25eb88c8d6
6675699: need comprehensive fix for unconstrained ConvI2L with narrowed type
thartmann
parents:
35552
diff
changeset
|
1122 |
// Create a new narrow ConvI2L node that is dependent on the range check |
2b25eb88c8d6
6675699: need comprehensive fix for unconstrained ConvI2L with narrowed type
thartmann
parents:
35552
diff
changeset
|
1123 |
Node* new_n = igvn->C->conv_I2X_index(igvn, l, array_size, fail); |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1124 |
|
30629
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1125 |
// The type of the ConvI2L may be widen and so the new |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1126 |
// ConvI2L may not be better than an existing ConvI2L |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1127 |
if (new_n != init_n) { |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1128 |
for (uint j = 2; j < stack.size(); j++) { |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1129 |
Node* n = stack.node_at(j); |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1130 |
Node* clone = n->clone(); |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1131 |
int rep = clone->replace_edge(init_n, new_n); |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1132 |
assert(rep > 0, "can't find expected node?"); |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1133 |
clone = igvn->transform(clone); |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1134 |
init_n = n; |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1135 |
new_n = clone; |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1136 |
} |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1137 |
igvn->hash_delete(use); |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1138 |
int rep = use->replace_edge(init_n, new_n); |
30183 | 1139 |
assert(rep > 0, "can't find expected node?"); |
30629
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1140 |
igvn->transform(use); |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1141 |
if (init_n->outcnt() == 0) { |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1142 |
igvn->_worklist.push(init_n); |
b6e5ad2f18d5
8076188: Optimize arraycopy out for non escaping destination
roland
parents:
30309
diff
changeset
|
1143 |
} |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1144 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1145 |
} |
30183 | 1146 |
} else if (use->in(0) == NULL && (igvn->type(use)->isa_long() || |
1147 |
igvn->type(use)->isa_ptr())) { |
|
1148 |
stack.set_index(i+1); |
|
1149 |
stack.push(use, 0); |
|
1150 |
break; |
|
1151 |
} |
|
1152 |
} |
|
1153 |
if (i == n->outcnt()) { |
|
1154 |
stack.pop(); |
|
1155 |
} |
|
1156 |
} |
|
1157 |
#endif |
|
1158 |
} |
|
1159 |
||
1160 |
bool IfNode::is_cmp_with_loadrange(ProjNode* proj) { |
|
1161 |
if (in(1) != NULL && |
|
1162 |
in(1)->in(1) != NULL && |
|
1163 |
in(1)->in(1)->in(2) != NULL) { |
|
1164 |
Node* other = in(1)->in(1)->in(2); |
|
1165 |
if (other->Opcode() == Op_LoadRange && |
|
1166 |
((other->in(0) != NULL && other->in(0) == proj) || |
|
1167 |
(other->in(0) == NULL && |
|
1168 |
other->in(2) != NULL && |
|
1169 |
other->in(2)->is_AddP() && |
|
1170 |
other->in(2)->in(1) != NULL && |
|
1171 |
other->in(2)->in(1)->Opcode() == Op_CastPP && |
|
1172 |
other->in(2)->in(1)->in(0) == proj))) { |
|
1173 |
return true; |
|
1174 |
} |
|
1175 |
} |
|
1176 |
return false; |
|
1177 |
} |
|
1178 |
||
1179 |
bool IfNode::is_null_check(ProjNode* proj, PhaseIterGVN* igvn) { |
|
1180 |
Node* other = in(1)->in(1)->in(2); |
|
1181 |
if (other->in(MemNode::Address) != NULL && |
|
1182 |
proj->in(0)->in(1) != NULL && |
|
1183 |
proj->in(0)->in(1)->is_Bool() && |
|
1184 |
proj->in(0)->in(1)->in(1) != NULL && |
|
1185 |
proj->in(0)->in(1)->in(1)->Opcode() == Op_CmpP && |
|
1186 |
proj->in(0)->in(1)->in(1)->in(2) != NULL && |
|
1187 |
proj->in(0)->in(1)->in(1)->in(1) == other->in(MemNode::Address)->in(AddPNode::Address)->uncast() && |
|
1188 |
igvn->type(proj->in(0)->in(1)->in(1)->in(2)) == TypePtr::NULL_PTR) { |
|
1189 |
return true; |
|
1190 |
} |
|
1191 |
return false; |
|
1192 |
} |
|
1193 |
||
1194 |
// Check that the If that is in between the 2 integer comparisons has |
|
1195 |
// no side effect |
|
1196 |
bool IfNode::is_side_effect_free_test(ProjNode* proj, PhaseIterGVN* igvn) { |
|
1197 |
if (proj != NULL && |
|
1198 |
proj->is_uncommon_trap_if_pattern(Deoptimization::Reason_none) && |
|
1199 |
proj->outcnt() <= 2) { |
|
1200 |
if (proj->outcnt() == 1 || |
|
1201 |
// Allow simple null check from LoadRange |
|
1202 |
(is_cmp_with_loadrange(proj) && is_null_check(proj, igvn))) { |
|
1203 |
CallStaticJavaNode* unc = proj->is_uncommon_trap_if_pattern(Deoptimization::Reason_none); |
|
1204 |
CallStaticJavaNode* dom_unc = proj->in(0)->in(0)->as_Proj()->is_uncommon_trap_if_pattern(Deoptimization::Reason_none); |
|
1205 |
||
1206 |
// reroute_side_effect_free_unc changes the state of this |
|
1207 |
// uncommon trap to restart execution at the previous |
|
1208 |
// CmpI. Check that this change in a previous compilation didn't |
|
1209 |
// cause too many traps. |
|
1210 |
int trap_request = unc->uncommon_trap_request(); |
|
1211 |
Deoptimization::DeoptReason reason = Deoptimization::trap_request_reason(trap_request); |
|
1212 |
||
1213 |
if (igvn->C->too_many_traps(dom_unc->jvms()->method(), dom_unc->jvms()->bci(), reason)) { |
|
1214 |
return false; |
|
1215 |
} |
|
1216 |
||
1217 |
return true; |
|
1218 |
} |
|
1219 |
} |
|
1220 |
return false; |
|
1221 |
} |
|
1222 |
||
1223 |
// Make the If between the 2 integer comparisons trap at the state of |
|
1224 |
// the first If: the last CmpI is the one replaced by a CmpU and the |
|
1225 |
// first CmpI is eliminated, so the test between the 2 CmpI nodes |
|
1226 |
// won't be guarded by the first CmpI anymore. It can trap in cases |
|
1227 |
// where the first CmpI would have prevented it from executing: on a |
|
1228 |
// trap, we need to restart execution at the state of the first CmpI |
|
1229 |
void IfNode::reroute_side_effect_free_unc(ProjNode* proj, ProjNode* dom_proj, PhaseIterGVN* igvn) { |
|
1230 |
CallStaticJavaNode* dom_unc = dom_proj->is_uncommon_trap_if_pattern(Deoptimization::Reason_none); |
|
1231 |
ProjNode* otherproj = proj->other_if_proj(); |
|
1232 |
CallStaticJavaNode* unc = proj->is_uncommon_trap_if_pattern(Deoptimization::Reason_none); |
|
1233 |
Node* call_proj = dom_unc->unique_ctrl_out(); |
|
1234 |
Node* halt = call_proj->unique_ctrl_out(); |
|
1235 |
||
1236 |
Node* new_unc = dom_unc->clone(); |
|
1237 |
call_proj = call_proj->clone(); |
|
1238 |
halt = halt->clone(); |
|
1239 |
Node* c = otherproj->clone(); |
|
1240 |
||
1241 |
c = igvn->transform(c); |
|
1242 |
new_unc->set_req(TypeFunc::Parms, unc->in(TypeFunc::Parms)); |
|
1243 |
new_unc->set_req(0, c); |
|
1244 |
new_unc = igvn->transform(new_unc); |
|
1245 |
call_proj->set_req(0, new_unc); |
|
1246 |
call_proj = igvn->transform(call_proj); |
|
1247 |
halt->set_req(0, call_proj); |
|
1248 |
halt = igvn->transform(halt); |
|
1249 |
||
1250 |
igvn->replace_node(otherproj, igvn->C->top()); |
|
1251 |
igvn->C->root()->add_req(halt); |
|
1252 |
} |
|
1253 |
||
1254 |
Node* IfNode::fold_compares(PhaseIterGVN* igvn) { |
|
1255 |
if (Opcode() != Op_If) return NULL; |
|
1256 |
||
1257 |
if (cmpi_folds(igvn)) { |
|
1258 |
Node* ctrl = in(0); |
|
1259 |
if (is_ctrl_folds(ctrl, igvn) && |
|
1260 |
ctrl->outcnt() == 1) { |
|
1261 |
// A integer comparison immediately dominated by another integer |
|
1262 |
// comparison |
|
1263 |
ProjNode* success = NULL; |
|
1264 |
ProjNode* fail = NULL; |
|
1265 |
ProjNode* dom_cmp = ctrl->as_Proj(); |
|
1266 |
if (has_shared_region(dom_cmp, success, fail) && |
|
1267 |
// Next call modifies graph so must be last |
|
1268 |
fold_compares_helper(dom_cmp, success, fail, igvn)) { |
|
1269 |
return this; |
|
1270 |
} |
|
1271 |
if (has_only_uncommon_traps(dom_cmp, success, fail, igvn) && |
|
1272 |
// Next call modifies graph so must be last |
|
1273 |
fold_compares_helper(dom_cmp, success, fail, igvn)) { |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1274 |
return merge_uncommon_traps(dom_cmp, success, fail, igvn); |
30183 | 1275 |
} |
1276 |
return NULL; |
|
1277 |
} else if (ctrl->in(0) != NULL && |
|
1278 |
ctrl->in(0)->in(0) != NULL) { |
|
1279 |
ProjNode* success = NULL; |
|
1280 |
ProjNode* fail = NULL; |
|
1281 |
Node* dom = ctrl->in(0)->in(0); |
|
1282 |
ProjNode* dom_cmp = dom->isa_Proj(); |
|
1283 |
ProjNode* other_cmp = ctrl->isa_Proj(); |
|
1284 |
||
1285 |
// Check if it's an integer comparison dominated by another |
|
1286 |
// integer comparison with another test in between |
|
1287 |
if (is_ctrl_folds(dom, igvn) && |
|
1288 |
has_only_uncommon_traps(dom_cmp, success, fail, igvn) && |
|
1289 |
is_side_effect_free_test(other_cmp, igvn) && |
|
1290 |
// Next call modifies graph so must be last |
|
1291 |
fold_compares_helper(dom_cmp, success, fail, igvn)) { |
|
1292 |
reroute_side_effect_free_unc(other_cmp, dom_cmp, igvn); |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1293 |
return merge_uncommon_traps(dom_cmp, success, fail, igvn); |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1294 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1295 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1296 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1297 |
return NULL; |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1298 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1299 |
|
1 | 1300 |
//------------------------------remove_useless_bool---------------------------- |
1301 |
// Check for people making a useless boolean: things like |
|
1302 |
// if( (x < y ? true : false) ) { ... } |
|
1303 |
// Replace with if( x < y ) { ... } |
|
1304 |
static Node *remove_useless_bool(IfNode *iff, PhaseGVN *phase) { |
|
1305 |
Node *i1 = iff->in(1); |
|
1306 |
if( !i1->is_Bool() ) return NULL; |
|
1307 |
BoolNode *bol = i1->as_Bool(); |
|
1308 |
||
1309 |
Node *cmp = bol->in(1); |
|
1310 |
if( cmp->Opcode() != Op_CmpI ) return NULL; |
|
1311 |
||
1312 |
// Must be comparing against a bool |
|
1313 |
const Type *cmp2_t = phase->type( cmp->in(2) ); |
|
1314 |
if( cmp2_t != TypeInt::ZERO && |
|
1315 |
cmp2_t != TypeInt::ONE ) |
|
1316 |
return NULL; |
|
1317 |
||
1318 |
// Find a prior merge point merging the boolean |
|
1319 |
i1 = cmp->in(1); |
|
1320 |
if( !i1->is_Phi() ) return NULL; |
|
1321 |
PhiNode *phi = i1->as_Phi(); |
|
1322 |
if( phase->type( phi ) != TypeInt::BOOL ) |
|
1323 |
return NULL; |
|
1324 |
||
1325 |
// Check for diamond pattern |
|
1326 |
int true_path = phi->is_diamond_phi(); |
|
1327 |
if( true_path == 0 ) return NULL; |
|
1328 |
||
958
4c4709e8b7ee
6712835: Server compiler fails with assertion (loop_count < K,"infinite loop in PhaseIterGVN::transform")
never
parents:
190
diff
changeset
|
1329 |
// 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
|
1330 |
// 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
|
1331 |
// an illegal cycle. |
4c4709e8b7ee
6712835: Server compiler fails with assertion (loop_count < K,"infinite loop in PhaseIterGVN::transform")
never
parents:
190
diff
changeset
|
1332 |
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
|
1333 |
|
1 | 1334 |
// phi->region->if_proj->ifnode->bool->cmp |
1335 |
BoolNode *bol2 = phi->in(0)->in(1)->in(0)->in(1)->as_Bool(); |
|
1336 |
||
1337 |
// Now get the 'sense' of the test correct so we can plug in |
|
1338 |
// either iff2->in(1) or its complement. |
|
1339 |
int flip = 0; |
|
1340 |
if( bol->_test._test == BoolTest::ne ) flip = 1-flip; |
|
1341 |
else if( bol->_test._test != BoolTest::eq ) return NULL; |
|
1342 |
if( cmp2_t == TypeInt::ZERO ) flip = 1-flip; |
|
1343 |
||
1344 |
const Type *phi1_t = phase->type( phi->in(1) ); |
|
1345 |
const Type *phi2_t = phase->type( phi->in(2) ); |
|
1346 |
// Check for Phi(0,1) and flip |
|
1347 |
if( phi1_t == TypeInt::ZERO ) { |
|
1348 |
if( phi2_t != TypeInt::ONE ) return NULL; |
|
1349 |
flip = 1-flip; |
|
1350 |
} else { |
|
1351 |
// Check for Phi(1,0) |
|
1352 |
if( phi1_t != TypeInt::ONE ) return NULL; |
|
1353 |
if( phi2_t != TypeInt::ZERO ) return NULL; |
|
1354 |
} |
|
1355 |
if( true_path == 2 ) { |
|
1356 |
flip = 1-flip; |
|
1357 |
} |
|
1358 |
||
1359 |
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
|
1360 |
assert(new_bol != iff->in(1), "must make progress"); |
1 | 1361 |
iff->set_req(1, new_bol); |
1362 |
// Intervening diamond probably goes dead |
|
1363 |
phase->C->set_major_progress(); |
|
1364 |
return iff; |
|
1365 |
} |
|
1366 |
||
1367 |
static IfNode* idealize_test(PhaseGVN* phase, IfNode* iff); |
|
1368 |
||
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1369 |
struct RangeCheck { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1370 |
Node* ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1371 |
jint off; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1372 |
}; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1373 |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1374 |
Node* IfNode::Ideal_common(PhaseGVN *phase, bool can_reshape) { |
1 | 1375 |
if (remove_dead_region(phase, can_reshape)) return this; |
1376 |
// No Def-Use info? |
|
1377 |
if (!can_reshape) return NULL; |
|
1378 |
||
1379 |
// Don't bother trying to transform a dead if |
|
1380 |
if (in(0)->is_top()) return NULL; |
|
1381 |
// Don't bother trying to transform an if with a dead test |
|
1382 |
if (in(1)->is_top()) return NULL; |
|
1383 |
// Another variation of a dead test |
|
1384 |
if (in(1)->is_Con()) return NULL; |
|
1385 |
// Another variation of a dead if |
|
1386 |
if (outcnt() < 2) return NULL; |
|
1387 |
||
1388 |
// Canonicalize the test. |
|
1389 |
Node* idt_if = idealize_test(phase, this); |
|
1390 |
if (idt_if != NULL) return idt_if; |
|
1391 |
||
1392 |
// Try to split the IF |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1393 |
PhaseIterGVN *igvn = phase->is_IterGVN(); |
1 | 1394 |
Node *s = split_if(this, igvn); |
1395 |
if (s != NULL) return s; |
|
1396 |
||
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1397 |
return NodeSentinel; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1398 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1399 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1400 |
//------------------------------Ideal------------------------------------------ |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1401 |
// Return a node which is more "ideal" than the current node. Strip out |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1402 |
// control copies |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1403 |
Node* IfNode::Ideal(PhaseGVN *phase, bool can_reshape) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1404 |
Node* res = Ideal_common(phase, can_reshape); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1405 |
if (res != NodeSentinel) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1406 |
return res; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1407 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1408 |
|
1 | 1409 |
// Check for people making a useless boolean: things like |
1410 |
// if( (x < y ? true : false) ) { ... } |
|
1411 |
// Replace with if( x < y ) { ... } |
|
1412 |
Node *bol2 = remove_useless_bool(this, phase); |
|
1413 |
if( bol2 ) return bol2; |
|
1414 |
||
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1415 |
if (in(0) == NULL) return NULL; // Dead loop? |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1416 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1417 |
PhaseIterGVN *igvn = phase->is_IterGVN(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1418 |
Node* result = fold_compares(igvn); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1419 |
if (result != NULL) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1420 |
return result; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1421 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1422 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1423 |
// Scan for an equivalent test |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1424 |
Node *cmp; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1425 |
int dist = 0; // Cutoff limit for search |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1426 |
int op = Opcode(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1427 |
if( op == Op_If && |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1428 |
(cmp=in(1)->in(1))->Opcode() == Op_CmpP ) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1429 |
if( cmp->in(2) != NULL && // make sure cmp is not already dead |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1430 |
cmp->in(2)->bottom_type() == TypePtr::NULL_PTR ) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1431 |
dist = 64; // Limit for null-pointer scans |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1432 |
} else { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1433 |
dist = 4; // Do not bother for random pointer tests |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1434 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1435 |
} else { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1436 |
dist = 4; // Limit for random junky scans |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1437 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1438 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1439 |
Node* prev_dom = search_identical(dist); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1440 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1441 |
if (prev_dom == NULL) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1442 |
return NULL; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1443 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1444 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1445 |
// Replace dominated IfNode |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1446 |
return dominated_by(prev_dom, igvn); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1447 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1448 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1449 |
//------------------------------dominated_by----------------------------------- |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1450 |
Node* IfNode::dominated_by(Node* prev_dom, PhaseIterGVN *igvn) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1451 |
#ifndef PRODUCT |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1452 |
if (TraceIterativeGVN) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1453 |
tty->print(" Removing IfNode: "); this->dump(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1454 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1455 |
if (VerifyOpto && !igvn->allow_progress()) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1456 |
// Found an equivalent dominating test, |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1457 |
// we can not guarantee reaching a fix-point for these during iterativeGVN |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1458 |
// since intervening nodes may not change. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1459 |
return NULL; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1460 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1461 |
#endif |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1462 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1463 |
igvn->hash_delete(this); // Remove self to prevent spurious V-N |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1464 |
Node *idom = in(0); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1465 |
// Need opcode to decide which way 'this' test goes |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1466 |
int prev_op = prev_dom->Opcode(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1467 |
Node *top = igvn->C->top(); // Shortcut to top |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1468 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1469 |
// Loop predicates may have depending checks which should not |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1470 |
// be skipped. For example, range check predicate has two checks |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1471 |
// for lower and upper bounds. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1472 |
ProjNode* unc_proj = proj_out(1 - prev_dom->as_Proj()->_con)->as_Proj(); |
44314
30ae899b9eca
8175345: Reported null pointer dereference defect groups
rraghavan
parents:
44241
diff
changeset
|
1473 |
if ((unc_proj != NULL) && (unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_predicate) != NULL)) { |
30ae899b9eca
8175345: Reported null pointer dereference defect groups
rraghavan
parents:
44241
diff
changeset
|
1474 |
prev_dom = idom; |
30ae899b9eca
8175345: Reported null pointer dereference defect groups
rraghavan
parents:
44241
diff
changeset
|
1475 |
} |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1476 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1477 |
// Now walk the current IfNode's projections. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1478 |
// Loop ends when 'this' has no more uses. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1479 |
for (DUIterator_Last imin, i = last_outs(imin); i >= imin; --i) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1480 |
Node *ifp = last_out(i); // Get IfTrue/IfFalse |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1481 |
igvn->add_users_to_worklist(ifp); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1482 |
// Check which projection it is and set target. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1483 |
// Data-target is either the dominating projection of the same type |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1484 |
// or TOP if the dominating projection is of opposite type. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1485 |
// Data-target will be used as the new control edge for the non-CFG |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1486 |
// nodes like Casts and Loads. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1487 |
Node *data_target = (ifp->Opcode() == prev_op) ? prev_dom : top; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1488 |
// Control-target is just the If's immediate dominator or TOP. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1489 |
Node *ctrl_target = (ifp->Opcode() == prev_op) ? idom : top; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1490 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1491 |
// For each child of an IfTrue/IfFalse projection, reroute. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1492 |
// Loop ends when projection has no more uses. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1493 |
for (DUIterator_Last jmin, j = ifp->last_outs(jmin); j >= jmin; --j) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1494 |
Node* s = ifp->last_out(j); // Get child of IfTrue/IfFalse |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1495 |
if( !s->depends_only_on_test() ) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1496 |
// Find the control input matching this def-use edge. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1497 |
// For Regions it may not be in slot 0. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1498 |
uint l; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1499 |
for( l = 0; s->in(l) != ifp; l++ ) { } |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1500 |
igvn->replace_input_of(s, l, ctrl_target); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1501 |
} else { // Else, for control producers, |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1502 |
igvn->replace_input_of(s, 0, data_target); // Move child to data-target |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1503 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1504 |
} // End for each child of a projection |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1505 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1506 |
igvn->remove_dead_node(ifp); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1507 |
} // End for each IfTrue/IfFalse child of If |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1508 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1509 |
// Kill the IfNode |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1510 |
igvn->remove_dead_node(this); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1511 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1512 |
// Must return either the original node (now dead) or a new node |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1513 |
// (Do not return a top here, since that would break the uniqueness of top.) |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1514 |
return new ConINode(TypeInt::ZERO); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1515 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1516 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1517 |
Node* IfNode::search_identical(int dist) { |
1 | 1518 |
// Setup to scan up the CFG looking for a dominating test |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1519 |
Node* dom = in(0); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1520 |
Node* prev_dom = this; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1521 |
int op = Opcode(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1522 |
// Search up the dominator tree for an If with an identical test |
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1523 |
while (dom->Opcode() != op || // Not same opcode? |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1524 |
dom->in(1) != in(1) || // Not same input 1? |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1525 |
(req() == 3 && dom->in(2) != in(2)) || // Not same input 2? |
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1526 |
prev_dom->in(0) != dom) { // One path of test does not dominate? |
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1527 |
if (dist < 0) return NULL; |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1528 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1529 |
dist--; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1530 |
prev_dom = dom; |
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1531 |
dom = up_one_dom(dom); |
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1532 |
if (!dom) return NULL; |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1533 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1534 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1535 |
// Check that we did not follow a loop back to ourselves |
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1536 |
if (this == dom) { |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1537 |
return NULL; |
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1538 |
} |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1539 |
|
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1540 |
#ifndef PRODUCT |
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1541 |
if (dist > 2) { // Add to count of NULL checks elided |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1542 |
explicit_null_checks_elided++; |
36336
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1543 |
} |
7006dd73b206
8150720: Cleanup code around PrintOptoStatistics
redestad
parents:
35574
diff
changeset
|
1544 |
#endif |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1545 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1546 |
return prev_dom; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1547 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1548 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1549 |
//------------------------------Identity--------------------------------------- |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1550 |
// If the test is constant & we match, then we are the input Control |
35551
36ef3841fb34
8146629: Make phase->is_IterGVN() accessible from Node::Identity and Node::Value
thartmann
parents:
34181
diff
changeset
|
1551 |
Node* IfProjNode::Identity(PhaseGVN* phase) { |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1552 |
// Can only optimize if cannot go the other way |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1553 |
const TypeTuple *t = phase->type(in(0))->is_tuple(); |
35552
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1554 |
if (t == TypeTuple::IFNEITHER || (always_taken(t) && |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1555 |
// During parsing (GVN) we don't remove dead code aggressively. |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1556 |
// Cut off dead branch and let PhaseRemoveUseless take care of it. |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1557 |
(!phase->is_IterGVN() || |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1558 |
// During IGVN, first wait for the dead branch to be killed. |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1559 |
// Otherwise, the IfNode's control will have two control uses (the IfNode |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1560 |
// that doesn't go away because it still has uses and this branch of the |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1561 |
// If) which breaks other optimizations. Node::has_special_unique_user() |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1562 |
// will cause this node to be reprocessed once the dead branch is killed. |
be1bff8945dc
8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes
thartmann
parents:
35551
diff
changeset
|
1563 |
in(0)->outcnt() == 1))) { |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1564 |
// IfNode control |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1565 |
return in(0)->in(0); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1566 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1567 |
// no progress |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1568 |
return this; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1569 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1570 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1571 |
#ifndef PRODUCT |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1572 |
//-------------------------------related--------------------------------------- |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1573 |
// An IfProjNode's related node set consists of its input (an IfNode) including |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1574 |
// the IfNode's condition, plus all of its outputs at level 1. In compact mode, |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1575 |
// the restrictions for IfNode apply (see IfNode::rel). |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1576 |
void IfProjNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1577 |
Node* ifNode = this->in(0); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1578 |
in_rel->append(ifNode); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1579 |
if (compact) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1580 |
ifNode->collect_nodes(in_rel, 3, false, true); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1581 |
} else { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1582 |
ifNode->collect_nodes_in_all_data(in_rel, false); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1583 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1584 |
this->collect_nodes(out_rel, -1, false, false); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1585 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1586 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1587 |
//------------------------------dump_spec-------------------------------------- |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1588 |
void IfNode::dump_spec(outputStream *st) const { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1589 |
st->print("P=%f, C=%f",_prob,_fcnt); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1590 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1591 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1592 |
//-------------------------------related--------------------------------------- |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1593 |
// For an IfNode, the set of related output nodes is just the output nodes till |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1594 |
// depth 2, i.e, the IfTrue/IfFalse projection nodes plus the nodes they refer. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1595 |
// The related input nodes contain no control nodes, but all data nodes |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1596 |
// pertaining to the condition. In compact mode, the input nodes are collected |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1597 |
// up to a depth of 3. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1598 |
void IfNode::related(GrowableArray <Node *> *in_rel, GrowableArray <Node *> *out_rel, bool compact) const { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1599 |
if (compact) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1600 |
this->collect_nodes(in_rel, 3, false, true); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1601 |
} else { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1602 |
this->collect_nodes_in_all_data(in_rel, false); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1603 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1604 |
this->collect_nodes(out_rel, -2, false, false); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1605 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1606 |
#endif |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1607 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1608 |
//------------------------------idealize_test---------------------------------- |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1609 |
// Try to canonicalize tests better. Peek at the Cmp/Bool/If sequence and |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1610 |
// come up with a canonical sequence. Bools getting 'eq', 'gt' and 'ge' forms |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1611 |
// converted to 'ne', 'le' and 'lt' forms. IfTrue/IfFalse get swapped as |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1612 |
// needed. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1613 |
static IfNode* idealize_test(PhaseGVN* phase, IfNode* iff) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1614 |
assert(iff->in(0) != NULL, "If must be live"); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1615 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1616 |
if (iff->outcnt() != 2) return NULL; // Malformed projections. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1617 |
Node* old_if_f = iff->proj_out(false); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1618 |
Node* old_if_t = iff->proj_out(true); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1619 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1620 |
// CountedLoopEnds want the back-control test to be TRUE, irregardless of |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1621 |
// whether they are testing a 'gt' or 'lt' condition. The 'gt' condition |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1622 |
// happens in count-down loops |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1623 |
if (iff->is_CountedLoopEnd()) return NULL; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1624 |
if (!iff->in(1)->is_Bool()) return NULL; // Happens for partially optimized IF tests |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1625 |
BoolNode *b = iff->in(1)->as_Bool(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1626 |
BoolTest bt = b->_test; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1627 |
// Test already in good order? |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1628 |
if( bt.is_canonical() ) |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1629 |
return NULL; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1630 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1631 |
// Flip test to be canonical. Requires flipping the IfFalse/IfTrue and |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1632 |
// cloning the IfNode. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1633 |
Node* new_b = phase->transform( new BoolNode(b->in(1), bt.negate()) ); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1634 |
if( !new_b->is_Bool() ) return NULL; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1635 |
b = new_b->as_Bool(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1636 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1637 |
PhaseIterGVN *igvn = phase->is_IterGVN(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1638 |
assert( igvn, "Test is not canonical in parser?" ); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1639 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1640 |
// The IF node never really changes, but it needs to be cloned |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1641 |
iff = iff->clone()->as_If(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1642 |
iff->set_req(1, b); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1643 |
iff->_prob = 1.0-iff->_prob; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1644 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1645 |
Node *prior = igvn->hash_find_insert(iff); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1646 |
if( prior ) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1647 |
igvn->remove_dead_node(iff); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1648 |
iff = (IfNode*)prior; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1649 |
} else { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1650 |
// Cannot call transform on it just yet |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1651 |
igvn->set_type_bottom(iff); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1652 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1653 |
igvn->_worklist.push(iff); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1654 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1655 |
// Now handle projections. Cloning not required. |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1656 |
Node* new_if_f = (Node*)(new IfFalseNode( iff )); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1657 |
Node* new_if_t = (Node*)(new IfTrueNode ( iff )); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1658 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1659 |
igvn->register_new_node_with_optimizer(new_if_f); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1660 |
igvn->register_new_node_with_optimizer(new_if_t); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1661 |
// Flip test, so flip trailing control |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1662 |
igvn->replace_node(old_if_f, new_if_t); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1663 |
igvn->replace_node(old_if_t, new_if_f); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1664 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1665 |
// Progress |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1666 |
return iff; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1667 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1668 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1669 |
Node* RangeCheckNode::Ideal(PhaseGVN *phase, bool can_reshape) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1670 |
Node* res = Ideal_common(phase, can_reshape); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1671 |
if (res != NodeSentinel) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1672 |
return res; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1673 |
} |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1674 |
|
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1675 |
PhaseIterGVN *igvn = phase->is_IterGVN(); |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1676 |
// Setup to scan up the CFG looking for a dominating test |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1677 |
Node* prev_dom = this; |
1 | 1678 |
|
1679 |
// Check for range-check vs other kinds of tests |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1680 |
Node* index1; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1681 |
Node* range1; |
1 | 1682 |
jint offset1; |
1683 |
int flip1 = is_range_check(range1, index1, offset1); |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1684 |
if (flip1) { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1685 |
Node* dom = in(0); |
1 | 1686 |
// Try to remove extra range checks. All 'up_one_dom' gives up at merges |
1687 |
// so all checks we inspect post-dominate the top-most check we find. |
|
1688 |
// If we are going to fail the current check and we reach the top check |
|
2131 | 1689 |
// 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
|
1690 |
// We 'expand' the top 3 range checks to include all post-dominating |
1 | 1691 |
// checks. |
1692 |
||
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1693 |
// The top 3 range checks seen |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1694 |
const int NRC =3; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1695 |
RangeCheck prev_checks[NRC]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1696 |
int nb_checks = 0; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1697 |
|
1 | 1698 |
// Low and high offsets seen so far |
1699 |
jint off_lo = offset1; |
|
1700 |
jint off_hi = offset1; |
|
1701 |
||
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1702 |
bool found_immediate_dominator = false; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1703 |
|
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1704 |
// 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
|
1705 |
for (int dist = 0; dist < 999; dist++) { // Range-Check scan limit |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1706 |
if (dom->Opcode() == Op_RangeCheck && // Not same opcode? |
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1707 |
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
|
1708 |
if (dom == this) return NULL; // dead loop |
1 | 1709 |
// See if this is a range check |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1710 |
Node* index2; |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1711 |
Node* range2; |
1 | 1712 |
jint offset2; |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1713 |
int flip2 = dom->as_RangeCheck()->is_range_check(range2, index2, offset2); |
1 | 1714 |
// See if this is a _matching_ range check, checking against |
1715 |
// the same array bounds. |
|
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1716 |
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
|
1717 |
dom->outcnt() == 2) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1718 |
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
|
1719 |
// 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
|
1720 |
// 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
|
1721 |
// 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
|
1722 |
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
|
1723 |
found_immediate_dominator = true; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1724 |
break; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1725 |
} |
1 | 1726 |
// Gather expanded bounds |
1727 |
off_lo = MIN2(off_lo,offset2); |
|
1728 |
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
|
1729 |
// Record top NRC range checks |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1730 |
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
|
1731 |
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
|
1732 |
nb_checks++; |
1 | 1733 |
} |
1734 |
} |
|
1735 |
prev_dom = dom; |
|
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1736 |
dom = up_one_dom(dom); |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1737 |
if (!dom) break; |
1 | 1738 |
} |
1739 |
||
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1740 |
if (!found_immediate_dominator) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1741 |
// 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
|
1742 |
// 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
|
1743 |
// 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
|
1744 |
// 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
|
1745 |
if (!phase->C->allow_range_check_smearing()) return NULL; |
1 | 1746 |
|
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1747 |
// 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
|
1748 |
if (nb_checks == 0) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1749 |
return NULL; |
1 | 1750 |
} |
28044
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1751 |
// 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
|
1752 |
// 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
|
1753 |
int chk0 = (nb_checks - 1) % NRC; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1754 |
if (index1) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1755 |
if (nb_checks == 1) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1756 |
return NULL; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1757 |
} else { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1758 |
// 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
|
1759 |
// 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
|
1760 |
// range of constants. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1761 |
RangeCheck rc0 = prev_checks[chk0]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1762 |
int chk1 = (nb_checks - 2) % NRC; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1763 |
RangeCheck rc1 = prev_checks[chk1]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1764 |
if (rc0.off == off_lo) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1765 |
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
|
1766 |
prev_dom = rc1.ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1767 |
} else if (rc0.off == off_hi) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1768 |
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
|
1769 |
prev_dom = rc1.ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1770 |
} else { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1771 |
// 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
|
1772 |
// 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
|
1773 |
// 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
|
1774 |
// 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
|
1775 |
// bounds. |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1776 |
if (nb_checks == 2) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1777 |
return NULL; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1778 |
} |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1779 |
int chk2 = (nb_checks - 3) % NRC; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1780 |
RangeCheck rc2 = prev_checks[chk2]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1781 |
// 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
|
1782 |
// 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
|
1783 |
if (rc1.off <= rc0.off) { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1784 |
// 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
|
1785 |
// -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
|
1786 |
// 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
|
1787 |
// -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
|
1788 |
// 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
|
1789 |
// -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
|
1790 |
// 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
|
1791 |
// -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
|
1792 |
// 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
|
1793 |
// -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
|
1794 |
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
|
1795 |
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
|
1796 |
} else { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1797 |
// 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
|
1798 |
// -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
|
1799 |
// 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
|
1800 |
// -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
|
1801 |
// 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
|
1802 |
// -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
|
1803 |
// 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
|
1804 |
// -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
|
1805 |
// 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
|
1806 |
// -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
|
1807 |
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
|
1808 |
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
|
1809 |
} |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1810 |
prev_dom = rc2.ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1811 |
} |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1812 |
} |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1813 |
} else { |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1814 |
RangeCheck rc0 = prev_checks[chk0]; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1815 |
// '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
|
1816 |
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
|
1817 |
// 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
|
1818 |
prev_dom = rc0.ctl; |
ede40159fd3b
8066103: C2's range check smearing allows out of bound array accesses
roland
parents:
26173
diff
changeset
|
1819 |
} |
1 | 1820 |
} |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1821 |
} else { |
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1822 |
prev_dom = search_identical(4); |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1823 |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1824 |
if (prev_dom == NULL) { |
1 | 1825 |
return NULL; |
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1826 |
} |
1 | 1827 |
} |
1828 |
||
1829 |
// Replace dominated IfNode |
|
34164
a9e6034d7707
8137168: Replace IfNode with a new RangeCheckNode for range checks
roland
parents:
34151
diff
changeset
|
1830 |
return dominated_by(prev_dom, igvn); |
1 | 1831 |
} |