annotate src/share/vm/c1/c1_Optimizer.cpp @ 1972:f95d63e2154a

6989984: Use standard include model for Hospot Summary: Replaced MakeDeps and the includeDB files with more standardized solutions. Reviewed-by: coleenp, kvn, kamg
author stefank
date Tue, 23 Nov 2010 13:22:55 -0800
parents 42a10fc37986
children 403dc4c1d7f5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1 /*
1783
d5d065957597 6953144: Tiered compilation
iveresov
parents: 1584
diff changeset
2 * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a61af66fc99e Initial load
duke
parents:
diff changeset
4 *
a61af66fc99e Initial load
duke
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
a61af66fc99e Initial load
duke
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
a61af66fc99e Initial load
duke
parents:
diff changeset
7 * published by the Free Software Foundation.
a61af66fc99e Initial load
duke
parents:
diff changeset
8 *
a61af66fc99e Initial load
duke
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
a61af66fc99e Initial load
duke
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a61af66fc99e Initial load
duke
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a61af66fc99e Initial load
duke
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
a61af66fc99e Initial load
duke
parents:
diff changeset
13 * accompanied this code).
a61af66fc99e Initial load
duke
parents:
diff changeset
14 *
a61af66fc99e Initial load
duke
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
a61af66fc99e Initial load
duke
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
a61af66fc99e Initial load
duke
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a61af66fc99e Initial load
duke
parents:
diff changeset
18 *
1552
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 579
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 579
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 579
diff changeset
21 * questions.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
22 *
a61af66fc99e Initial load
duke
parents:
diff changeset
23 */
a61af66fc99e Initial load
duke
parents:
diff changeset
24
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1899
diff changeset
25 #include "precompiled.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1899
diff changeset
26 #include "c1/c1_Canonicalizer.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1899
diff changeset
27 #include "c1/c1_Optimizer.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1899
diff changeset
28 #include "c1/c1_ValueMap.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1899
diff changeset
29 #include "c1/c1_ValueSet.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1899
diff changeset
30 #include "c1/c1_ValueStack.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1899
diff changeset
31 #include "utilities/bitMap.inline.hpp"
0
a61af66fc99e Initial load
duke
parents:
diff changeset
32
a61af66fc99e Initial load
duke
parents:
diff changeset
33 define_array(ValueSetArray, ValueSet*);
a61af66fc99e Initial load
duke
parents:
diff changeset
34 define_stack(ValueSetList, ValueSetArray);
a61af66fc99e Initial load
duke
parents:
diff changeset
35
a61af66fc99e Initial load
duke
parents:
diff changeset
36
a61af66fc99e Initial load
duke
parents:
diff changeset
37 Optimizer::Optimizer(IR* ir) {
a61af66fc99e Initial load
duke
parents:
diff changeset
38 assert(ir->is_valid(), "IR must be valid");
a61af66fc99e Initial load
duke
parents:
diff changeset
39 _ir = ir;
a61af66fc99e Initial load
duke
parents:
diff changeset
40 }
a61af66fc99e Initial load
duke
parents:
diff changeset
41
a61af66fc99e Initial load
duke
parents:
diff changeset
42 class CE_Eliminator: public BlockClosure {
a61af66fc99e Initial load
duke
parents:
diff changeset
43 private:
a61af66fc99e Initial load
duke
parents:
diff changeset
44 IR* _hir;
a61af66fc99e Initial load
duke
parents:
diff changeset
45 int _cee_count; // the number of CEs successfully eliminated
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
46 int _ifop_count; // the number of IfOps successfully simplified
0
a61af66fc99e Initial load
duke
parents:
diff changeset
47 int _has_substitution;
a61af66fc99e Initial load
duke
parents:
diff changeset
48
a61af66fc99e Initial load
duke
parents:
diff changeset
49 public:
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
50 CE_Eliminator(IR* hir) : _cee_count(0), _ifop_count(0), _hir(hir) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
51 _has_substitution = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
52 _hir->iterate_preorder(this);
a61af66fc99e Initial load
duke
parents:
diff changeset
53 if (_has_substitution) {
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
54 // substituted some ifops/phis, so resolve the substitution
0
a61af66fc99e Initial load
duke
parents:
diff changeset
55 SubstitutionResolver sr(_hir);
a61af66fc99e Initial load
duke
parents:
diff changeset
56 }
a61af66fc99e Initial load
duke
parents:
diff changeset
57 }
a61af66fc99e Initial load
duke
parents:
diff changeset
58 int cee_count() const { return _cee_count; }
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
59 int ifop_count() const { return _ifop_count; }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
60
a61af66fc99e Initial load
duke
parents:
diff changeset
61 void adjust_exception_edges(BlockBegin* block, BlockBegin* sux) {
a61af66fc99e Initial load
duke
parents:
diff changeset
62 int e = sux->number_of_exception_handlers();
a61af66fc99e Initial load
duke
parents:
diff changeset
63 for (int i = 0; i < e; i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
64 BlockBegin* xhandler = sux->exception_handler_at(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
65 block->add_exception_handler(xhandler);
a61af66fc99e Initial load
duke
parents:
diff changeset
66
a61af66fc99e Initial load
duke
parents:
diff changeset
67 assert(xhandler->is_predecessor(sux), "missing predecessor");
a61af66fc99e Initial load
duke
parents:
diff changeset
68 if (sux->number_of_preds() == 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
69 // sux is disconnected from graph so disconnect from exception handlers
a61af66fc99e Initial load
duke
parents:
diff changeset
70 xhandler->remove_predecessor(sux);
a61af66fc99e Initial load
duke
parents:
diff changeset
71 }
a61af66fc99e Initial load
duke
parents:
diff changeset
72 if (!xhandler->is_predecessor(block)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
73 xhandler->add_predecessor(block);
a61af66fc99e Initial load
duke
parents:
diff changeset
74 }
a61af66fc99e Initial load
duke
parents:
diff changeset
75 }
a61af66fc99e Initial load
duke
parents:
diff changeset
76 }
a61af66fc99e Initial load
duke
parents:
diff changeset
77
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
78 virtual void block_do(BlockBegin* block);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
79
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
80 private:
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
81 Value make_ifop(Value x, Instruction::Condition cond, Value y, Value tval, Value fval);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
82 };
0
a61af66fc99e Initial load
duke
parents:
diff changeset
83
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
84 void CE_Eliminator::block_do(BlockBegin* block) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
85 // 1) find conditional expression
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
86 // check if block ends with an If
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
87 If* if_ = block->end()->as_If();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
88 if (if_ == NULL) return;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
89
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
90 // check if If works on int or object types
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
91 // (we cannot handle If's working on long, float or doubles yet,
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
92 // since IfOp doesn't support them - these If's show up if cmp
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
93 // operations followed by If's are eliminated)
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
94 ValueType* if_type = if_->x()->type();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
95 if (!if_type->is_int() && !if_type->is_object()) return;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
96
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
97 BlockBegin* t_block = if_->tsux();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
98 BlockBegin* f_block = if_->fsux();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
99 Instruction* t_cur = t_block->next();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
100 Instruction* f_cur = f_block->next();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
101
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
102 // one Constant may be present between BlockBegin and BlockEnd
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
103 Value t_const = NULL;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
104 Value f_const = NULL;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
105 if (t_cur->as_Constant() != NULL && !t_cur->can_trap()) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
106 t_const = t_cur;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
107 t_cur = t_cur->next();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
108 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
109 if (f_cur->as_Constant() != NULL && !f_cur->can_trap()) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
110 f_const = f_cur;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
111 f_cur = f_cur->next();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
112 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
113
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
114 // check if both branches end with a goto
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
115 Goto* t_goto = t_cur->as_Goto();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
116 if (t_goto == NULL) return;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
117 Goto* f_goto = f_cur->as_Goto();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
118 if (f_goto == NULL) return;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
119
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
120 // check if both gotos merge into the same block
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
121 BlockBegin* sux = t_goto->default_sux();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
122 if (sux != f_goto->default_sux()) return;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
123
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
124 // check if at least one word was pushed on sux_state
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
125 ValueStack* sux_state = sux->state();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
126 if (sux_state->stack_size() <= if_->state()->stack_size()) return;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
127
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
128 // check if phi function is present at end of successor stack and that
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
129 // only this phi was pushed on the stack
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
130 Value sux_phi = sux_state->stack_at(if_->state()->stack_size());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
131 if (sux_phi == NULL || sux_phi->as_Phi() == NULL || sux_phi->as_Phi()->block() != sux) return;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
132 if (sux_phi->type()->size() != sux_state->stack_size() - if_->state()->stack_size()) return;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
133
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
134 // get the values that were pushed in the true- and false-branch
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
135 Value t_value = t_goto->state()->stack_at(if_->state()->stack_size());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
136 Value f_value = f_goto->state()->stack_at(if_->state()->stack_size());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
137
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
138 // backend does not support floats
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
139 assert(t_value->type()->base() == f_value->type()->base(), "incompatible types");
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
140 if (t_value->type()->is_float_kind()) return;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
141
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
142 // check that successor has no other phi functions but sux_phi
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
143 // this can happen when t_block or f_block contained additonal stores to local variables
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
144 // that are no longer represented by explicit instructions
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
145 for_each_phi_fun(sux, phi,
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
146 if (phi != sux_phi) return;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
147 );
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
148 // true and false blocks can't have phis
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
149 for_each_phi_fun(t_block, phi, return; );
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
150 for_each_phi_fun(f_block, phi, return; );
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
151
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
152 // 2) substitute conditional expression
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
153 // with an IfOp followed by a Goto
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
154 // cut if_ away and get node before
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
155 Instruction* cur_end = if_->prev(block);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
156
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
157 // append constants of true- and false-block if necessary
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
158 // clone constants because original block must not be destroyed
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
159 assert((t_value != f_const && f_value != t_const) || t_const == f_const, "mismatch");
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
160 if (t_value == t_const) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
161 t_value = new Constant(t_const->type());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
162 NOT_PRODUCT(t_value->set_printable_bci(if_->printable_bci()));
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
163 cur_end = cur_end->set_next(t_value);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
164 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
165 if (f_value == f_const) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
166 f_value = new Constant(f_const->type());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
167 NOT_PRODUCT(f_value->set_printable_bci(if_->printable_bci()));
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
168 cur_end = cur_end->set_next(f_value);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
169 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
170
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
171 Value result = make_ifop(if_->x(), if_->cond(), if_->y(), t_value, f_value);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
172 assert(result != NULL, "make_ifop must return a non-null instruction");
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
173 if (!result->is_linked() && result->can_be_linked()) {
1819
f02a8bbe6ed4 6986046: C1 valuestack cleanup
roland
parents: 1783
diff changeset
174 NOT_PRODUCT(result->set_printable_bci(if_->printable_bci()));
f02a8bbe6ed4 6986046: C1 valuestack cleanup
roland
parents: 1783
diff changeset
175 cur_end = cur_end->set_next(result);
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
176 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
177
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
178 // append Goto to successor
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
179 ValueStack* state_before = if_->is_safepoint() ? if_->state_before() : NULL;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
180 Goto* goto_ = new Goto(sux, state_before, if_->is_safepoint() || t_goto->is_safepoint() || f_goto->is_safepoint());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
181
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
182 // prepare state for Goto
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
183 ValueStack* goto_state = if_->state();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
184 while (sux_state->scope() != goto_state->scope()) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
185 goto_state = goto_state->caller_state();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
186 assert(goto_state != NULL, "states do not match up");
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
187 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
188 goto_state = goto_state->copy(ValueStack::StateAfter, goto_state->bci());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
189 goto_state->push(result->type(), result);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
190 assert(goto_state->is_same(sux_state), "states must match now");
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
191 goto_->set_state(goto_state);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
192
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
193 cur_end = cur_end->set_next(goto_, goto_state->bci());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
194
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
195 // Adjust control flow graph
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
196 BlockBegin::disconnect_edge(block, t_block);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
197 BlockBegin::disconnect_edge(block, f_block);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
198 if (t_block->number_of_preds() == 0) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
199 BlockBegin::disconnect_edge(t_block, sux);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
200 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
201 adjust_exception_edges(block, t_block);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
202 if (f_block->number_of_preds() == 0) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
203 BlockBegin::disconnect_edge(f_block, sux);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
204 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
205 adjust_exception_edges(block, f_block);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
206
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
207 // update block end
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
208 block->set_end(goto_);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
209
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
210 // substitute the phi if possible
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
211 if (sux_phi->as_Phi()->operand_count() == 1) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
212 assert(sux_phi->as_Phi()->operand_at(0) == result, "screwed up phi");
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
213 sux_phi->set_subst(result);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
214 _has_substitution = true;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
215 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
216
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
217 // 3) successfully eliminated a conditional expression
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
218 _cee_count++;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
219 if (PrintCEE) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
220 tty->print_cr("%d. CEE in B%d (B%d B%d)", cee_count(), block->block_id(), t_block->block_id(), f_block->block_id());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
221 tty->print_cr("%d. IfOp in B%d", ifop_count(), block->block_id());
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
222 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
223
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
224 _hir->verify();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
225 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
226
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
227 Value CE_Eliminator::make_ifop(Value x, Instruction::Condition cond, Value y, Value tval, Value fval) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
228 if (!OptimizeIfOps) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
229 return new IfOp(x, cond, y, tval, fval);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
230 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
231
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
232 tval = tval->subst();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
233 fval = fval->subst();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
234 if (tval == fval) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
235 _ifop_count++;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
236 return tval;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
237 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
238
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
239 x = x->subst();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
240 y = y->subst();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
241
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
242 Constant* y_const = y->as_Constant();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
243 if (y_const != NULL) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
244 IfOp* x_ifop = x->as_IfOp();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
245 if (x_ifop != NULL) { // x is an ifop, y is a constant
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
246 Constant* x_tval_const = x_ifop->tval()->subst()->as_Constant();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
247 Constant* x_fval_const = x_ifop->fval()->subst()->as_Constant();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
248
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
249 if (x_tval_const != NULL && x_fval_const != NULL) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
250 Instruction::Condition x_ifop_cond = x_ifop->cond();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
251
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
252 Constant::CompareResult t_compare_res = x_tval_const->compare(cond, y_const);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
253 Constant::CompareResult f_compare_res = x_fval_const->compare(cond, y_const);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
254
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
255 guarantee(t_compare_res != Constant::not_comparable && f_compare_res != Constant::not_comparable, "incomparable constants in IfOp");
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
256
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
257 Value new_tval = t_compare_res == Constant::cond_true ? tval : fval;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
258 Value new_fval = f_compare_res == Constant::cond_true ? tval : fval;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
259
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
260 _ifop_count++;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
261 if (new_tval == new_fval) {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
262 return new_tval;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
263 } else {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
264 return new IfOp(x_ifop->x(), x_ifop_cond, x_ifop->y(), new_tval, new_fval);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
265 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
266 }
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
267 } else {
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
268 Constant* x_const = x->as_Constant();
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
269 if (x_const != NULL) { // x and y are constants
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
270 Constant::CompareResult x_compare_res = x_const->compare(cond, y_const);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
271 guarantee(x_compare_res != Constant::not_comparable, "incomparable constants in IfOp");
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
272
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
273 _ifop_count++;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
274 return x_compare_res == Constant::cond_true ? tval : fval;
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
275 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
276 }
a61af66fc99e Initial load
duke
parents:
diff changeset
277 }
1899
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
278 return new IfOp(x, cond, y, tval, fval);
42a10fc37986 6991577: add IfOp optimization to C1
roland
parents: 1819
diff changeset
279 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
280
a61af66fc99e Initial load
duke
parents:
diff changeset
281 void Optimizer::eliminate_conditional_expressions() {
a61af66fc99e Initial load
duke
parents:
diff changeset
282 // find conditional expressions & replace them with IfOps
a61af66fc99e Initial load
duke
parents:
diff changeset
283 CE_Eliminator ce(ir());
a61af66fc99e Initial load
duke
parents:
diff changeset
284 }
a61af66fc99e Initial load
duke
parents:
diff changeset
285
a61af66fc99e Initial load
duke
parents:
diff changeset
286 class BlockMerger: public BlockClosure {
a61af66fc99e Initial load
duke
parents:
diff changeset
287 private:
a61af66fc99e Initial load
duke
parents:
diff changeset
288 IR* _hir;
a61af66fc99e Initial load
duke
parents:
diff changeset
289 int _merge_count; // the number of block pairs successfully merged
a61af66fc99e Initial load
duke
parents:
diff changeset
290
a61af66fc99e Initial load
duke
parents:
diff changeset
291 public:
a61af66fc99e Initial load
duke
parents:
diff changeset
292 BlockMerger(IR* hir)
a61af66fc99e Initial load
duke
parents:
diff changeset
293 : _hir(hir)
a61af66fc99e Initial load
duke
parents:
diff changeset
294 , _merge_count(0)
a61af66fc99e Initial load
duke
parents:
diff changeset
295 {
a61af66fc99e Initial load
duke
parents:
diff changeset
296 _hir->iterate_preorder(this);
a61af66fc99e Initial load
duke
parents:
diff changeset
297 }
a61af66fc99e Initial load
duke
parents:
diff changeset
298
a61af66fc99e Initial load
duke
parents:
diff changeset
299 bool try_merge(BlockBegin* block) {
a61af66fc99e Initial load
duke
parents:
diff changeset
300 BlockEnd* end = block->end();
a61af66fc99e Initial load
duke
parents:
diff changeset
301 if (end->as_Goto() != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
302 assert(end->number_of_sux() == 1, "end must have exactly one successor");
a61af66fc99e Initial load
duke
parents:
diff changeset
303 // Note: It would be sufficient to check for the number of successors (= 1)
a61af66fc99e Initial load
duke
parents:
diff changeset
304 // in order to decide if this block can be merged potentially. That
a61af66fc99e Initial load
duke
parents:
diff changeset
305 // would then also include switch statements w/ only a default case.
a61af66fc99e Initial load
duke
parents:
diff changeset
306 // However, in that case we would need to make sure the switch tag
a61af66fc99e Initial load
duke
parents:
diff changeset
307 // expression is executed if it can produce observable side effects.
a61af66fc99e Initial load
duke
parents:
diff changeset
308 // We should probably have the canonicalizer simplifying such switch
a61af66fc99e Initial load
duke
parents:
diff changeset
309 // statements and then we are sure we don't miss these merge opportunities
a61af66fc99e Initial load
duke
parents:
diff changeset
310 // here (was bug - gri 7/7/99).
a61af66fc99e Initial load
duke
parents:
diff changeset
311 BlockBegin* sux = end->default_sux();
a61af66fc99e Initial load
duke
parents:
diff changeset
312 if (sux->number_of_preds() == 1 && !sux->is_entry_block() && !end->is_safepoint()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
313 // merge the two blocks
a61af66fc99e Initial load
duke
parents:
diff changeset
314
a61af66fc99e Initial load
duke
parents:
diff changeset
315 #ifdef ASSERT
a61af66fc99e Initial load
duke
parents:
diff changeset
316 // verify that state at the end of block and at the beginning of sux are equal
a61af66fc99e Initial load
duke
parents:
diff changeset
317 // no phi functions must be present at beginning of sux
a61af66fc99e Initial load
duke
parents:
diff changeset
318 ValueStack* sux_state = sux->state();
a61af66fc99e Initial load
duke
parents:
diff changeset
319 ValueStack* end_state = end->state();
1819
f02a8bbe6ed4 6986046: C1 valuestack cleanup
roland
parents: 1783
diff changeset
320
f02a8bbe6ed4 6986046: C1 valuestack cleanup
roland
parents: 1783
diff changeset
321 assert(end_state->scope() == sux_state->scope(), "scopes must match");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
322 assert(end_state->stack_size() == sux_state->stack_size(), "stack not equal");
a61af66fc99e Initial load
duke
parents:
diff changeset
323 assert(end_state->locals_size() == sux_state->locals_size(), "locals not equal");
a61af66fc99e Initial load
duke
parents:
diff changeset
324
a61af66fc99e Initial load
duke
parents:
diff changeset
325 int index;
a61af66fc99e Initial load
duke
parents:
diff changeset
326 Value sux_value;
a61af66fc99e Initial load
duke
parents:
diff changeset
327 for_each_stack_value(sux_state, index, sux_value) {
a61af66fc99e Initial load
duke
parents:
diff changeset
328 assert(sux_value == end_state->stack_at(index), "stack not equal");
a61af66fc99e Initial load
duke
parents:
diff changeset
329 }
a61af66fc99e Initial load
duke
parents:
diff changeset
330 for_each_local_value(sux_state, index, sux_value) {
a61af66fc99e Initial load
duke
parents:
diff changeset
331 assert(sux_value == end_state->local_at(index), "locals not equal");
a61af66fc99e Initial load
duke
parents:
diff changeset
332 }
a61af66fc99e Initial load
duke
parents:
diff changeset
333 assert(sux_state->caller_state() == end_state->caller_state(), "caller not equal");
a61af66fc99e Initial load
duke
parents:
diff changeset
334 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
335
a61af66fc99e Initial load
duke
parents:
diff changeset
336 // find instruction before end & append first instruction of sux block
a61af66fc99e Initial load
duke
parents:
diff changeset
337 Instruction* prev = end->prev(block);
a61af66fc99e Initial load
duke
parents:
diff changeset
338 Instruction* next = sux->next();
a61af66fc99e Initial load
duke
parents:
diff changeset
339 assert(prev->as_BlockEnd() == NULL, "must not be a BlockEnd");
1819
f02a8bbe6ed4 6986046: C1 valuestack cleanup
roland
parents: 1783
diff changeset
340 prev->set_next(next);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
341 sux->disconnect_from_graph();
a61af66fc99e Initial load
duke
parents:
diff changeset
342 block->set_end(sux->end());
a61af66fc99e Initial load
duke
parents:
diff changeset
343 // add exception handlers of deleted block, if any
a61af66fc99e Initial load
duke
parents:
diff changeset
344 for (int k = 0; k < sux->number_of_exception_handlers(); k++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
345 BlockBegin* xhandler = sux->exception_handler_at(k);
a61af66fc99e Initial load
duke
parents:
diff changeset
346 block->add_exception_handler(xhandler);
a61af66fc99e Initial load
duke
parents:
diff changeset
347
a61af66fc99e Initial load
duke
parents:
diff changeset
348 // also substitute predecessor of exception handler
a61af66fc99e Initial load
duke
parents:
diff changeset
349 assert(xhandler->is_predecessor(sux), "missing predecessor");
a61af66fc99e Initial load
duke
parents:
diff changeset
350 xhandler->remove_predecessor(sux);
a61af66fc99e Initial load
duke
parents:
diff changeset
351 if (!xhandler->is_predecessor(block)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
352 xhandler->add_predecessor(block);
a61af66fc99e Initial load
duke
parents:
diff changeset
353 }
a61af66fc99e Initial load
duke
parents:
diff changeset
354 }
a61af66fc99e Initial load
duke
parents:
diff changeset
355
a61af66fc99e Initial load
duke
parents:
diff changeset
356 // debugging output
a61af66fc99e Initial load
duke
parents:
diff changeset
357 _merge_count++;
a61af66fc99e Initial load
duke
parents:
diff changeset
358 if (PrintBlockElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
359 tty->print_cr("%d. merged B%d & B%d (stack size = %d)",
a61af66fc99e Initial load
duke
parents:
diff changeset
360 _merge_count, block->block_id(), sux->block_id(), sux->state()->stack_size());
a61af66fc99e Initial load
duke
parents:
diff changeset
361 }
a61af66fc99e Initial load
duke
parents:
diff changeset
362
a61af66fc99e Initial load
duke
parents:
diff changeset
363 _hir->verify();
a61af66fc99e Initial load
duke
parents:
diff changeset
364
a61af66fc99e Initial load
duke
parents:
diff changeset
365 If* if_ = block->end()->as_If();
a61af66fc99e Initial load
duke
parents:
diff changeset
366 if (if_) {
a61af66fc99e Initial load
duke
parents:
diff changeset
367 IfOp* ifop = if_->x()->as_IfOp();
a61af66fc99e Initial load
duke
parents:
diff changeset
368 Constant* con = if_->y()->as_Constant();
a61af66fc99e Initial load
duke
parents:
diff changeset
369 bool swapped = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
370 if (!con || !ifop) {
a61af66fc99e Initial load
duke
parents:
diff changeset
371 ifop = if_->y()->as_IfOp();
a61af66fc99e Initial load
duke
parents:
diff changeset
372 con = if_->x()->as_Constant();
a61af66fc99e Initial load
duke
parents:
diff changeset
373 swapped = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
374 }
a61af66fc99e Initial load
duke
parents:
diff changeset
375 if (con && ifop) {
a61af66fc99e Initial load
duke
parents:
diff changeset
376 Constant* tval = ifop->tval()->as_Constant();
a61af66fc99e Initial load
duke
parents:
diff changeset
377 Constant* fval = ifop->fval()->as_Constant();
a61af66fc99e Initial load
duke
parents:
diff changeset
378 if (tval && fval) {
a61af66fc99e Initial load
duke
parents:
diff changeset
379 // Find the instruction before if_, starting with ifop.
a61af66fc99e Initial load
duke
parents:
diff changeset
380 // When if_ and ifop are not in the same block, prev
a61af66fc99e Initial load
duke
parents:
diff changeset
381 // becomes NULL In such (rare) cases it is not
a61af66fc99e Initial load
duke
parents:
diff changeset
382 // profitable to perform the optimization.
a61af66fc99e Initial load
duke
parents:
diff changeset
383 Value prev = ifop;
a61af66fc99e Initial load
duke
parents:
diff changeset
384 while (prev != NULL && prev->next() != if_) {
a61af66fc99e Initial load
duke
parents:
diff changeset
385 prev = prev->next();
a61af66fc99e Initial load
duke
parents:
diff changeset
386 }
a61af66fc99e Initial load
duke
parents:
diff changeset
387
a61af66fc99e Initial load
duke
parents:
diff changeset
388 if (prev != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
389 Instruction::Condition cond = if_->cond();
a61af66fc99e Initial load
duke
parents:
diff changeset
390 BlockBegin* tsux = if_->tsux();
a61af66fc99e Initial load
duke
parents:
diff changeset
391 BlockBegin* fsux = if_->fsux();
a61af66fc99e Initial load
duke
parents:
diff changeset
392 if (swapped) {
a61af66fc99e Initial load
duke
parents:
diff changeset
393 cond = Instruction::mirror(cond);
a61af66fc99e Initial load
duke
parents:
diff changeset
394 }
a61af66fc99e Initial load
duke
parents:
diff changeset
395
a61af66fc99e Initial load
duke
parents:
diff changeset
396 BlockBegin* tblock = tval->compare(cond, con, tsux, fsux);
a61af66fc99e Initial load
duke
parents:
diff changeset
397 BlockBegin* fblock = fval->compare(cond, con, tsux, fsux);
a61af66fc99e Initial load
duke
parents:
diff changeset
398 if (tblock != fblock && !if_->is_safepoint()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
399 If* newif = new If(ifop->x(), ifop->cond(), false, ifop->y(),
a61af66fc99e Initial load
duke
parents:
diff changeset
400 tblock, fblock, if_->state_before(), if_->is_safepoint());
a61af66fc99e Initial load
duke
parents:
diff changeset
401 newif->set_state(if_->state()->copy());
a61af66fc99e Initial load
duke
parents:
diff changeset
402
a61af66fc99e Initial load
duke
parents:
diff changeset
403 assert(prev->next() == if_, "must be guaranteed by above search");
1819
f02a8bbe6ed4 6986046: C1 valuestack cleanup
roland
parents: 1783
diff changeset
404 NOT_PRODUCT(newif->set_printable_bci(if_->printable_bci()));
f02a8bbe6ed4 6986046: C1 valuestack cleanup
roland
parents: 1783
diff changeset
405 prev->set_next(newif);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
406 block->set_end(newif);
a61af66fc99e Initial load
duke
parents:
diff changeset
407
a61af66fc99e Initial load
duke
parents:
diff changeset
408 _merge_count++;
a61af66fc99e Initial load
duke
parents:
diff changeset
409 if (PrintBlockElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
410 tty->print_cr("%d. replaced If and IfOp at end of B%d with single If", _merge_count, block->block_id());
a61af66fc99e Initial load
duke
parents:
diff changeset
411 }
a61af66fc99e Initial load
duke
parents:
diff changeset
412
a61af66fc99e Initial load
duke
parents:
diff changeset
413 _hir->verify();
a61af66fc99e Initial load
duke
parents:
diff changeset
414 }
a61af66fc99e Initial load
duke
parents:
diff changeset
415 }
a61af66fc99e Initial load
duke
parents:
diff changeset
416 }
a61af66fc99e Initial load
duke
parents:
diff changeset
417 }
a61af66fc99e Initial load
duke
parents:
diff changeset
418 }
a61af66fc99e Initial load
duke
parents:
diff changeset
419
a61af66fc99e Initial load
duke
parents:
diff changeset
420 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
421 }
a61af66fc99e Initial load
duke
parents:
diff changeset
422 }
a61af66fc99e Initial load
duke
parents:
diff changeset
423 return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
424 }
a61af66fc99e Initial load
duke
parents:
diff changeset
425
a61af66fc99e Initial load
duke
parents:
diff changeset
426 virtual void block_do(BlockBegin* block) {
a61af66fc99e Initial load
duke
parents:
diff changeset
427 _hir->verify();
a61af66fc99e Initial load
duke
parents:
diff changeset
428 // repeat since the same block may merge again
a61af66fc99e Initial load
duke
parents:
diff changeset
429 while (try_merge(block)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
430 _hir->verify();
a61af66fc99e Initial load
duke
parents:
diff changeset
431 }
a61af66fc99e Initial load
duke
parents:
diff changeset
432 }
a61af66fc99e Initial load
duke
parents:
diff changeset
433 };
a61af66fc99e Initial load
duke
parents:
diff changeset
434
a61af66fc99e Initial load
duke
parents:
diff changeset
435
a61af66fc99e Initial load
duke
parents:
diff changeset
436 void Optimizer::eliminate_blocks() {
a61af66fc99e Initial load
duke
parents:
diff changeset
437 // merge blocks if possible
a61af66fc99e Initial load
duke
parents:
diff changeset
438 BlockMerger bm(ir());
a61af66fc99e Initial load
duke
parents:
diff changeset
439 }
a61af66fc99e Initial load
duke
parents:
diff changeset
440
a61af66fc99e Initial load
duke
parents:
diff changeset
441
a61af66fc99e Initial load
duke
parents:
diff changeset
442 class NullCheckEliminator;
a61af66fc99e Initial load
duke
parents:
diff changeset
443 class NullCheckVisitor: public InstructionVisitor {
a61af66fc99e Initial load
duke
parents:
diff changeset
444 private:
a61af66fc99e Initial load
duke
parents:
diff changeset
445 NullCheckEliminator* _nce;
a61af66fc99e Initial load
duke
parents:
diff changeset
446 NullCheckEliminator* nce() { return _nce; }
a61af66fc99e Initial load
duke
parents:
diff changeset
447
a61af66fc99e Initial load
duke
parents:
diff changeset
448 public:
a61af66fc99e Initial load
duke
parents:
diff changeset
449 NullCheckVisitor() {}
a61af66fc99e Initial load
duke
parents:
diff changeset
450
a61af66fc99e Initial load
duke
parents:
diff changeset
451 void set_eliminator(NullCheckEliminator* nce) { _nce = nce; }
a61af66fc99e Initial load
duke
parents:
diff changeset
452
a61af66fc99e Initial load
duke
parents:
diff changeset
453 void do_Phi (Phi* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
454 void do_Local (Local* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
455 void do_Constant (Constant* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
456 void do_LoadField (LoadField* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
457 void do_StoreField (StoreField* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
458 void do_ArrayLength (ArrayLength* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
459 void do_LoadIndexed (LoadIndexed* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
460 void do_StoreIndexed (StoreIndexed* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
461 void do_NegateOp (NegateOp* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
462 void do_ArithmeticOp (ArithmeticOp* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
463 void do_ShiftOp (ShiftOp* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
464 void do_LogicOp (LogicOp* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
465 void do_CompareOp (CompareOp* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
466 void do_IfOp (IfOp* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
467 void do_Convert (Convert* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
468 void do_NullCheck (NullCheck* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
469 void do_Invoke (Invoke* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
470 void do_NewInstance (NewInstance* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
471 void do_NewTypeArray (NewTypeArray* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
472 void do_NewObjectArray (NewObjectArray* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
473 void do_NewMultiArray (NewMultiArray* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
474 void do_CheckCast (CheckCast* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
475 void do_InstanceOf (InstanceOf* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
476 void do_MonitorEnter (MonitorEnter* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
477 void do_MonitorExit (MonitorExit* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
478 void do_Intrinsic (Intrinsic* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
479 void do_BlockBegin (BlockBegin* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
480 void do_Goto (Goto* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
481 void do_If (If* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
482 void do_IfInstanceOf (IfInstanceOf* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
483 void do_TableSwitch (TableSwitch* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
484 void do_LookupSwitch (LookupSwitch* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
485 void do_Return (Return* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
486 void do_Throw (Throw* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
487 void do_Base (Base* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
488 void do_OsrEntry (OsrEntry* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
489 void do_ExceptionObject(ExceptionObject* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
490 void do_RoundFP (RoundFP* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
491 void do_UnsafeGetRaw (UnsafeGetRaw* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
492 void do_UnsafePutRaw (UnsafePutRaw* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
493 void do_UnsafeGetObject(UnsafeGetObject* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
494 void do_UnsafePutObject(UnsafePutObject* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
495 void do_UnsafePrefetchRead (UnsafePrefetchRead* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
496 void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
497 void do_ProfileCall (ProfileCall* x);
1783
d5d065957597 6953144: Tiered compilation
iveresov
parents: 1584
diff changeset
498 void do_ProfileInvoke (ProfileInvoke* x);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
499 };
a61af66fc99e Initial load
duke
parents:
diff changeset
500
a61af66fc99e Initial load
duke
parents:
diff changeset
501
a61af66fc99e Initial load
duke
parents:
diff changeset
502 // Because of a static contained within (for the purpose of iteration
a61af66fc99e Initial load
duke
parents:
diff changeset
503 // over instructions), it is only valid to have one of these active at
a61af66fc99e Initial load
duke
parents:
diff changeset
504 // a time
1584
b812ff5abc73 6958292: C1: Enable parallel compilation
iveresov
parents: 1552
diff changeset
505 class NullCheckEliminator: public ValueVisitor {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
506 private:
a61af66fc99e Initial load
duke
parents:
diff changeset
507 Optimizer* _opt;
a61af66fc99e Initial load
duke
parents:
diff changeset
508
a61af66fc99e Initial load
duke
parents:
diff changeset
509 ValueSet* _visitable_instructions; // Visit each instruction only once per basic block
a61af66fc99e Initial load
duke
parents:
diff changeset
510 BlockList* _work_list; // Basic blocks to visit
a61af66fc99e Initial load
duke
parents:
diff changeset
511
a61af66fc99e Initial load
duke
parents:
diff changeset
512 bool visitable(Value x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
513 assert(_visitable_instructions != NULL, "check");
a61af66fc99e Initial load
duke
parents:
diff changeset
514 return _visitable_instructions->contains(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
515 }
a61af66fc99e Initial load
duke
parents:
diff changeset
516 void mark_visited(Value x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
517 assert(_visitable_instructions != NULL, "check");
a61af66fc99e Initial load
duke
parents:
diff changeset
518 _visitable_instructions->remove(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
519 }
a61af66fc99e Initial load
duke
parents:
diff changeset
520 void mark_visitable(Value x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
521 assert(_visitable_instructions != NULL, "check");
a61af66fc99e Initial load
duke
parents:
diff changeset
522 _visitable_instructions->put(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
523 }
a61af66fc99e Initial load
duke
parents:
diff changeset
524 void clear_visitable_state() {
a61af66fc99e Initial load
duke
parents:
diff changeset
525 assert(_visitable_instructions != NULL, "check");
a61af66fc99e Initial load
duke
parents:
diff changeset
526 _visitable_instructions->clear();
a61af66fc99e Initial load
duke
parents:
diff changeset
527 }
a61af66fc99e Initial load
duke
parents:
diff changeset
528
a61af66fc99e Initial load
duke
parents:
diff changeset
529 ValueSet* _set; // current state, propagated to subsequent BlockBegins
a61af66fc99e Initial load
duke
parents:
diff changeset
530 ValueSetList _block_states; // BlockBegin null-check states for all processed blocks
a61af66fc99e Initial load
duke
parents:
diff changeset
531 NullCheckVisitor _visitor;
a61af66fc99e Initial load
duke
parents:
diff changeset
532 NullCheck* _last_explicit_null_check;
a61af66fc99e Initial load
duke
parents:
diff changeset
533
a61af66fc99e Initial load
duke
parents:
diff changeset
534 bool set_contains(Value x) { assert(_set != NULL, "check"); return _set->contains(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
535 void set_put (Value x) { assert(_set != NULL, "check"); _set->put(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
536 void set_remove (Value x) { assert(_set != NULL, "check"); _set->remove(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
537
a61af66fc99e Initial load
duke
parents:
diff changeset
538 BlockList* work_list() { return _work_list; }
a61af66fc99e Initial load
duke
parents:
diff changeset
539
a61af66fc99e Initial load
duke
parents:
diff changeset
540 void iterate_all();
a61af66fc99e Initial load
duke
parents:
diff changeset
541 void iterate_one(BlockBegin* block);
a61af66fc99e Initial load
duke
parents:
diff changeset
542
a61af66fc99e Initial load
duke
parents:
diff changeset
543 ValueSet* state() { return _set; }
a61af66fc99e Initial load
duke
parents:
diff changeset
544 void set_state_from (ValueSet* state) { _set->set_from(state); }
a61af66fc99e Initial load
duke
parents:
diff changeset
545 ValueSet* state_for (BlockBegin* block) { return _block_states[block->block_id()]; }
a61af66fc99e Initial load
duke
parents:
diff changeset
546 void set_state_for (BlockBegin* block, ValueSet* stack) { _block_states[block->block_id()] = stack; }
a61af66fc99e Initial load
duke
parents:
diff changeset
547 // Returns true if caused a change in the block's state.
a61af66fc99e Initial load
duke
parents:
diff changeset
548 bool merge_state_for(BlockBegin* block,
a61af66fc99e Initial load
duke
parents:
diff changeset
549 ValueSet* incoming_state);
a61af66fc99e Initial load
duke
parents:
diff changeset
550
a61af66fc99e Initial load
duke
parents:
diff changeset
551 public:
a61af66fc99e Initial load
duke
parents:
diff changeset
552 // constructor
a61af66fc99e Initial load
duke
parents:
diff changeset
553 NullCheckEliminator(Optimizer* opt)
a61af66fc99e Initial load
duke
parents:
diff changeset
554 : _opt(opt)
a61af66fc99e Initial load
duke
parents:
diff changeset
555 , _set(new ValueSet())
a61af66fc99e Initial load
duke
parents:
diff changeset
556 , _last_explicit_null_check(NULL)
a61af66fc99e Initial load
duke
parents:
diff changeset
557 , _block_states(BlockBegin::number_of_blocks(), NULL)
a61af66fc99e Initial load
duke
parents:
diff changeset
558 , _work_list(new BlockList()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
559 _visitable_instructions = new ValueSet();
a61af66fc99e Initial load
duke
parents:
diff changeset
560 _visitor.set_eliminator(this);
a61af66fc99e Initial load
duke
parents:
diff changeset
561 }
a61af66fc99e Initial load
duke
parents:
diff changeset
562
a61af66fc99e Initial load
duke
parents:
diff changeset
563 Optimizer* opt() { return _opt; }
a61af66fc99e Initial load
duke
parents:
diff changeset
564 IR* ir () { return opt()->ir(); }
a61af66fc99e Initial load
duke
parents:
diff changeset
565
a61af66fc99e Initial load
duke
parents:
diff changeset
566 // Process a graph
a61af66fc99e Initial load
duke
parents:
diff changeset
567 void iterate(BlockBegin* root);
a61af66fc99e Initial load
duke
parents:
diff changeset
568
1584
b812ff5abc73 6958292: C1: Enable parallel compilation
iveresov
parents: 1552
diff changeset
569 void visit(Value* f);
b812ff5abc73 6958292: C1: Enable parallel compilation
iveresov
parents: 1552
diff changeset
570
0
a61af66fc99e Initial load
duke
parents:
diff changeset
571 // In some situations (like NullCheck(x); getfield(x)) the debug
a61af66fc99e Initial load
duke
parents:
diff changeset
572 // information from the explicit NullCheck can be used to populate
a61af66fc99e Initial load
duke
parents:
diff changeset
573 // the getfield, even if the two instructions are in different
a61af66fc99e Initial load
duke
parents:
diff changeset
574 // scopes; this allows implicit null checks to be used but the
a61af66fc99e Initial load
duke
parents:
diff changeset
575 // correct exception information to be generated. We must clear the
a61af66fc99e Initial load
duke
parents:
diff changeset
576 // last-traversed NullCheck when we reach a potentially-exception-
a61af66fc99e Initial load
duke
parents:
diff changeset
577 // throwing instruction, as well as in some other cases.
a61af66fc99e Initial load
duke
parents:
diff changeset
578 void set_last_explicit_null_check(NullCheck* check) { _last_explicit_null_check = check; }
a61af66fc99e Initial load
duke
parents:
diff changeset
579 NullCheck* last_explicit_null_check() { return _last_explicit_null_check; }
a61af66fc99e Initial load
duke
parents:
diff changeset
580 Value last_explicit_null_check_obj() { return (_last_explicit_null_check
a61af66fc99e Initial load
duke
parents:
diff changeset
581 ? _last_explicit_null_check->obj()
a61af66fc99e Initial load
duke
parents:
diff changeset
582 : NULL); }
a61af66fc99e Initial load
duke
parents:
diff changeset
583 NullCheck* consume_last_explicit_null_check() {
a61af66fc99e Initial load
duke
parents:
diff changeset
584 _last_explicit_null_check->unpin(Instruction::PinExplicitNullCheck);
a61af66fc99e Initial load
duke
parents:
diff changeset
585 _last_explicit_null_check->set_can_trap(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
586 return _last_explicit_null_check;
a61af66fc99e Initial load
duke
parents:
diff changeset
587 }
a61af66fc99e Initial load
duke
parents:
diff changeset
588 void clear_last_explicit_null_check() { _last_explicit_null_check = NULL; }
a61af66fc99e Initial load
duke
parents:
diff changeset
589
a61af66fc99e Initial load
duke
parents:
diff changeset
590 // Handlers for relevant instructions
a61af66fc99e Initial load
duke
parents:
diff changeset
591 // (separated out from NullCheckVisitor for clarity)
a61af66fc99e Initial load
duke
parents:
diff changeset
592
a61af66fc99e Initial load
duke
parents:
diff changeset
593 // The basic contract is that these must leave the instruction in
a61af66fc99e Initial load
duke
parents:
diff changeset
594 // the desired state; must not assume anything about the state of
a61af66fc99e Initial load
duke
parents:
diff changeset
595 // the instruction. We make multiple passes over some basic blocks
a61af66fc99e Initial load
duke
parents:
diff changeset
596 // and the last pass is the only one whose result is valid.
a61af66fc99e Initial load
duke
parents:
diff changeset
597 void handle_AccessField (AccessField* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
598 void handle_ArrayLength (ArrayLength* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
599 void handle_LoadIndexed (LoadIndexed* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
600 void handle_StoreIndexed (StoreIndexed* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
601 void handle_NullCheck (NullCheck* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
602 void handle_Invoke (Invoke* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
603 void handle_NewInstance (NewInstance* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
604 void handle_NewArray (NewArray* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
605 void handle_AccessMonitor (AccessMonitor* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
606 void handle_Intrinsic (Intrinsic* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
607 void handle_ExceptionObject (ExceptionObject* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
608 void handle_Phi (Phi* x);
a61af66fc99e Initial load
duke
parents:
diff changeset
609 };
a61af66fc99e Initial load
duke
parents:
diff changeset
610
a61af66fc99e Initial load
duke
parents:
diff changeset
611
a61af66fc99e Initial load
duke
parents:
diff changeset
612 // NEEDS_CLEANUP
a61af66fc99e Initial load
duke
parents:
diff changeset
613 // There may be other instructions which need to clear the last
a61af66fc99e Initial load
duke
parents:
diff changeset
614 // explicit null check. Anything across which we can not hoist the
a61af66fc99e Initial load
duke
parents:
diff changeset
615 // debug information for a NullCheck instruction must clear it. It
a61af66fc99e Initial load
duke
parents:
diff changeset
616 // might be safer to pattern match "NullCheck ; {AccessField,
a61af66fc99e Initial load
duke
parents:
diff changeset
617 // ArrayLength, LoadIndexed}" but it is more easily structured this way.
a61af66fc99e Initial load
duke
parents:
diff changeset
618 // Should test to see performance hit of clearing it for all handlers
a61af66fc99e Initial load
duke
parents:
diff changeset
619 // with empty bodies below. If it is negligible then we should leave
a61af66fc99e Initial load
duke
parents:
diff changeset
620 // that in for safety, otherwise should think more about it.
a61af66fc99e Initial load
duke
parents:
diff changeset
621 void NullCheckVisitor::do_Phi (Phi* x) { nce()->handle_Phi(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
622 void NullCheckVisitor::do_Local (Local* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
623 void NullCheckVisitor::do_Constant (Constant* x) { /* FIXME: handle object constants */ }
a61af66fc99e Initial load
duke
parents:
diff changeset
624 void NullCheckVisitor::do_LoadField (LoadField* x) { nce()->handle_AccessField(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
625 void NullCheckVisitor::do_StoreField (StoreField* x) { nce()->handle_AccessField(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
626 void NullCheckVisitor::do_ArrayLength (ArrayLength* x) { nce()->handle_ArrayLength(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
627 void NullCheckVisitor::do_LoadIndexed (LoadIndexed* x) { nce()->handle_LoadIndexed(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
628 void NullCheckVisitor::do_StoreIndexed (StoreIndexed* x) { nce()->handle_StoreIndexed(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
629 void NullCheckVisitor::do_NegateOp (NegateOp* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
630 void NullCheckVisitor::do_ArithmeticOp (ArithmeticOp* x) { if (x->can_trap()) nce()->clear_last_explicit_null_check(); }
a61af66fc99e Initial load
duke
parents:
diff changeset
631 void NullCheckVisitor::do_ShiftOp (ShiftOp* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
632 void NullCheckVisitor::do_LogicOp (LogicOp* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
633 void NullCheckVisitor::do_CompareOp (CompareOp* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
634 void NullCheckVisitor::do_IfOp (IfOp* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
635 void NullCheckVisitor::do_Convert (Convert* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
636 void NullCheckVisitor::do_NullCheck (NullCheck* x) { nce()->handle_NullCheck(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
637 void NullCheckVisitor::do_Invoke (Invoke* x) { nce()->handle_Invoke(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
638 void NullCheckVisitor::do_NewInstance (NewInstance* x) { nce()->handle_NewInstance(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
639 void NullCheckVisitor::do_NewTypeArray (NewTypeArray* x) { nce()->handle_NewArray(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
640 void NullCheckVisitor::do_NewObjectArray (NewObjectArray* x) { nce()->handle_NewArray(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
641 void NullCheckVisitor::do_NewMultiArray (NewMultiArray* x) { nce()->handle_NewArray(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
642 void NullCheckVisitor::do_CheckCast (CheckCast* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
643 void NullCheckVisitor::do_InstanceOf (InstanceOf* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
644 void NullCheckVisitor::do_MonitorEnter (MonitorEnter* x) { nce()->handle_AccessMonitor(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
645 void NullCheckVisitor::do_MonitorExit (MonitorExit* x) { nce()->handle_AccessMonitor(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
646 void NullCheckVisitor::do_Intrinsic (Intrinsic* x) { nce()->clear_last_explicit_null_check(); }
a61af66fc99e Initial load
duke
parents:
diff changeset
647 void NullCheckVisitor::do_BlockBegin (BlockBegin* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
648 void NullCheckVisitor::do_Goto (Goto* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
649 void NullCheckVisitor::do_If (If* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
650 void NullCheckVisitor::do_IfInstanceOf (IfInstanceOf* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
651 void NullCheckVisitor::do_TableSwitch (TableSwitch* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
652 void NullCheckVisitor::do_LookupSwitch (LookupSwitch* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
653 void NullCheckVisitor::do_Return (Return* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
654 void NullCheckVisitor::do_Throw (Throw* x) { nce()->clear_last_explicit_null_check(); }
a61af66fc99e Initial load
duke
parents:
diff changeset
655 void NullCheckVisitor::do_Base (Base* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
656 void NullCheckVisitor::do_OsrEntry (OsrEntry* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
657 void NullCheckVisitor::do_ExceptionObject(ExceptionObject* x) { nce()->handle_ExceptionObject(x); }
a61af66fc99e Initial load
duke
parents:
diff changeset
658 void NullCheckVisitor::do_RoundFP (RoundFP* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
659 void NullCheckVisitor::do_UnsafeGetRaw (UnsafeGetRaw* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
660 void NullCheckVisitor::do_UnsafePutRaw (UnsafePutRaw* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
661 void NullCheckVisitor::do_UnsafeGetObject(UnsafeGetObject* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
662 void NullCheckVisitor::do_UnsafePutObject(UnsafePutObject* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
663 void NullCheckVisitor::do_UnsafePrefetchRead (UnsafePrefetchRead* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
664 void NullCheckVisitor::do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) {}
a61af66fc99e Initial load
duke
parents:
diff changeset
665 void NullCheckVisitor::do_ProfileCall (ProfileCall* x) { nce()->clear_last_explicit_null_check(); }
1783
d5d065957597 6953144: Tiered compilation
iveresov
parents: 1584
diff changeset
666 void NullCheckVisitor::do_ProfileInvoke (ProfileInvoke* x) {}
0
a61af66fc99e Initial load
duke
parents:
diff changeset
667
a61af66fc99e Initial load
duke
parents:
diff changeset
668
1584
b812ff5abc73 6958292: C1: Enable parallel compilation
iveresov
parents: 1552
diff changeset
669 void NullCheckEliminator::visit(Value* p) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
670 assert(*p != NULL, "should not find NULL instructions");
1584
b812ff5abc73 6958292: C1: Enable parallel compilation
iveresov
parents: 1552
diff changeset
671 if (visitable(*p)) {
b812ff5abc73 6958292: C1: Enable parallel compilation
iveresov
parents: 1552
diff changeset
672 mark_visited(*p);
b812ff5abc73 6958292: C1: Enable parallel compilation
iveresov
parents: 1552
diff changeset
673 (*p)->visit(&_visitor);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
674 }
a61af66fc99e Initial load
duke
parents:
diff changeset
675 }
a61af66fc99e Initial load
duke
parents:
diff changeset
676
a61af66fc99e Initial load
duke
parents:
diff changeset
677 bool NullCheckEliminator::merge_state_for(BlockBegin* block, ValueSet* incoming_state) {
a61af66fc99e Initial load
duke
parents:
diff changeset
678 ValueSet* state = state_for(block);
a61af66fc99e Initial load
duke
parents:
diff changeset
679 if (state == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
680 state = incoming_state->copy();
a61af66fc99e Initial load
duke
parents:
diff changeset
681 set_state_for(block, state);
a61af66fc99e Initial load
duke
parents:
diff changeset
682 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
683 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
684 bool changed = state->set_intersect(incoming_state);
a61af66fc99e Initial load
duke
parents:
diff changeset
685 if (PrintNullCheckElimination && changed) {
a61af66fc99e Initial load
duke
parents:
diff changeset
686 tty->print_cr("Block %d's null check state changed", block->block_id());
a61af66fc99e Initial load
duke
parents:
diff changeset
687 }
a61af66fc99e Initial load
duke
parents:
diff changeset
688 return changed;
a61af66fc99e Initial load
duke
parents:
diff changeset
689 }
a61af66fc99e Initial load
duke
parents:
diff changeset
690 }
a61af66fc99e Initial load
duke
parents:
diff changeset
691
a61af66fc99e Initial load
duke
parents:
diff changeset
692
a61af66fc99e Initial load
duke
parents:
diff changeset
693 void NullCheckEliminator::iterate_all() {
a61af66fc99e Initial load
duke
parents:
diff changeset
694 while (work_list()->length() > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
695 iterate_one(work_list()->pop());
a61af66fc99e Initial load
duke
parents:
diff changeset
696 }
a61af66fc99e Initial load
duke
parents:
diff changeset
697 }
a61af66fc99e Initial load
duke
parents:
diff changeset
698
a61af66fc99e Initial load
duke
parents:
diff changeset
699
a61af66fc99e Initial load
duke
parents:
diff changeset
700 void NullCheckEliminator::iterate_one(BlockBegin* block) {
a61af66fc99e Initial load
duke
parents:
diff changeset
701 clear_visitable_state();
a61af66fc99e Initial load
duke
parents:
diff changeset
702 // clear out an old explicit null checks
a61af66fc99e Initial load
duke
parents:
diff changeset
703 set_last_explicit_null_check(NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
704
a61af66fc99e Initial load
duke
parents:
diff changeset
705 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
706 tty->print_cr(" ...iterating block %d in null check elimination for %s::%s%s",
a61af66fc99e Initial load
duke
parents:
diff changeset
707 block->block_id(),
a61af66fc99e Initial load
duke
parents:
diff changeset
708 ir()->method()->holder()->name()->as_utf8(),
a61af66fc99e Initial load
duke
parents:
diff changeset
709 ir()->method()->name()->as_utf8(),
a61af66fc99e Initial load
duke
parents:
diff changeset
710 ir()->method()->signature()->as_symbol()->as_utf8());
a61af66fc99e Initial load
duke
parents:
diff changeset
711 }
a61af66fc99e Initial load
duke
parents:
diff changeset
712
a61af66fc99e Initial load
duke
parents:
diff changeset
713 // Create new state if none present (only happens at root)
a61af66fc99e Initial load
duke
parents:
diff changeset
714 if (state_for(block) == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
715 ValueSet* tmp_state = new ValueSet();
a61af66fc99e Initial load
duke
parents:
diff changeset
716 set_state_for(block, tmp_state);
a61af66fc99e Initial load
duke
parents:
diff changeset
717 // Initial state is that local 0 (receiver) is non-null for
a61af66fc99e Initial load
duke
parents:
diff changeset
718 // non-static methods
a61af66fc99e Initial load
duke
parents:
diff changeset
719 ValueStack* stack = block->state();
a61af66fc99e Initial load
duke
parents:
diff changeset
720 IRScope* scope = stack->scope();
a61af66fc99e Initial load
duke
parents:
diff changeset
721 ciMethod* method = scope->method();
a61af66fc99e Initial load
duke
parents:
diff changeset
722 if (!method->is_static()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
723 Local* local0 = stack->local_at(0)->as_Local();
a61af66fc99e Initial load
duke
parents:
diff changeset
724 assert(local0 != NULL, "must be");
a61af66fc99e Initial load
duke
parents:
diff changeset
725 assert(local0->type() == objectType, "invalid type of receiver");
a61af66fc99e Initial load
duke
parents:
diff changeset
726
a61af66fc99e Initial load
duke
parents:
diff changeset
727 if (local0 != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
728 // Local 0 is used in this scope
a61af66fc99e Initial load
duke
parents:
diff changeset
729 tmp_state->put(local0);
a61af66fc99e Initial load
duke
parents:
diff changeset
730 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
731 tty->print_cr("Local 0 (value %d) proven non-null upon entry", local0->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
732 }
a61af66fc99e Initial load
duke
parents:
diff changeset
733 }
a61af66fc99e Initial load
duke
parents:
diff changeset
734 }
a61af66fc99e Initial load
duke
parents:
diff changeset
735 }
a61af66fc99e Initial load
duke
parents:
diff changeset
736
a61af66fc99e Initial load
duke
parents:
diff changeset
737 // Must copy block's state to avoid mutating it during iteration
a61af66fc99e Initial load
duke
parents:
diff changeset
738 // through the block -- otherwise "not-null" states can accidentally
a61af66fc99e Initial load
duke
parents:
diff changeset
739 // propagate "up" through the block during processing of backward
a61af66fc99e Initial load
duke
parents:
diff changeset
740 // branches and algorithm is incorrect (and does not converge)
a61af66fc99e Initial load
duke
parents:
diff changeset
741 set_state_from(state_for(block));
a61af66fc99e Initial load
duke
parents:
diff changeset
742
a61af66fc99e Initial load
duke
parents:
diff changeset
743 // allow visiting of Phis belonging to this block
a61af66fc99e Initial load
duke
parents:
diff changeset
744 for_each_phi_fun(block, phi,
a61af66fc99e Initial load
duke
parents:
diff changeset
745 mark_visitable(phi);
a61af66fc99e Initial load
duke
parents:
diff changeset
746 );
a61af66fc99e Initial load
duke
parents:
diff changeset
747
a61af66fc99e Initial load
duke
parents:
diff changeset
748 BlockEnd* e = block->end();
a61af66fc99e Initial load
duke
parents:
diff changeset
749 assert(e != NULL, "incomplete graph");
a61af66fc99e Initial load
duke
parents:
diff changeset
750 int i;
a61af66fc99e Initial load
duke
parents:
diff changeset
751
a61af66fc99e Initial load
duke
parents:
diff changeset
752 // Propagate the state before this block into the exception
a61af66fc99e Initial load
duke
parents:
diff changeset
753 // handlers. They aren't true successors since we aren't guaranteed
a61af66fc99e Initial load
duke
parents:
diff changeset
754 // to execute the whole block before executing them. Also putting
a61af66fc99e Initial load
duke
parents:
diff changeset
755 // them on first seems to help reduce the amount of iteration to
a61af66fc99e Initial load
duke
parents:
diff changeset
756 // reach a fixed point.
a61af66fc99e Initial load
duke
parents:
diff changeset
757 for (i = 0; i < block->number_of_exception_handlers(); i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
758 BlockBegin* next = block->exception_handler_at(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
759 if (merge_state_for(next, state())) {
a61af66fc99e Initial load
duke
parents:
diff changeset
760 if (!work_list()->contains(next)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
761 work_list()->push(next);
a61af66fc99e Initial load
duke
parents:
diff changeset
762 }
a61af66fc99e Initial load
duke
parents:
diff changeset
763 }
a61af66fc99e Initial load
duke
parents:
diff changeset
764 }
a61af66fc99e Initial load
duke
parents:
diff changeset
765
a61af66fc99e Initial load
duke
parents:
diff changeset
766 // Iterate through block, updating state.
a61af66fc99e Initial load
duke
parents:
diff changeset
767 for (Instruction* instr = block; instr != NULL; instr = instr->next()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
768 // Mark instructions in this block as visitable as they are seen
a61af66fc99e Initial load
duke
parents:
diff changeset
769 // in the instruction list. This keeps the iteration from
a61af66fc99e Initial load
duke
parents:
diff changeset
770 // visiting instructions which are references in other blocks or
a61af66fc99e Initial load
duke
parents:
diff changeset
771 // visiting instructions more than once.
a61af66fc99e Initial load
duke
parents:
diff changeset
772 mark_visitable(instr);
1819
f02a8bbe6ed4 6986046: C1 valuestack cleanup
roland
parents: 1783
diff changeset
773 if (instr->is_pinned() || instr->can_trap() || (instr->as_NullCheck() != NULL)) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
774 mark_visited(instr);
1584
b812ff5abc73 6958292: C1: Enable parallel compilation
iveresov
parents: 1552
diff changeset
775 instr->input_values_do(this);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
776 instr->visit(&_visitor);
a61af66fc99e Initial load
duke
parents:
diff changeset
777 }
a61af66fc99e Initial load
duke
parents:
diff changeset
778 }
a61af66fc99e Initial load
duke
parents:
diff changeset
779
a61af66fc99e Initial load
duke
parents:
diff changeset
780 // Propagate state to successors if necessary
a61af66fc99e Initial load
duke
parents:
diff changeset
781 for (i = 0; i < e->number_of_sux(); i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
782 BlockBegin* next = e->sux_at(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
783 if (merge_state_for(next, state())) {
a61af66fc99e Initial load
duke
parents:
diff changeset
784 if (!work_list()->contains(next)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
785 work_list()->push(next);
a61af66fc99e Initial load
duke
parents:
diff changeset
786 }
a61af66fc99e Initial load
duke
parents:
diff changeset
787 }
a61af66fc99e Initial load
duke
parents:
diff changeset
788 }
a61af66fc99e Initial load
duke
parents:
diff changeset
789 }
a61af66fc99e Initial load
duke
parents:
diff changeset
790
a61af66fc99e Initial load
duke
parents:
diff changeset
791
a61af66fc99e Initial load
duke
parents:
diff changeset
792 void NullCheckEliminator::iterate(BlockBegin* block) {
a61af66fc99e Initial load
duke
parents:
diff changeset
793 work_list()->push(block);
a61af66fc99e Initial load
duke
parents:
diff changeset
794 iterate_all();
a61af66fc99e Initial load
duke
parents:
diff changeset
795 }
a61af66fc99e Initial load
duke
parents:
diff changeset
796
a61af66fc99e Initial load
duke
parents:
diff changeset
797 void NullCheckEliminator::handle_AccessField(AccessField* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
798 if (x->is_static()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
799 if (x->as_LoadField() != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
800 // If the field is a non-null static final object field (as is
a61af66fc99e Initial load
duke
parents:
diff changeset
801 // often the case for sun.misc.Unsafe), put this LoadField into
a61af66fc99e Initial load
duke
parents:
diff changeset
802 // the non-null map
a61af66fc99e Initial load
duke
parents:
diff changeset
803 ciField* field = x->field();
a61af66fc99e Initial load
duke
parents:
diff changeset
804 if (field->is_constant()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
805 ciConstant field_val = field->constant_value();
a61af66fc99e Initial load
duke
parents:
diff changeset
806 BasicType field_type = field_val.basic_type();
a61af66fc99e Initial load
duke
parents:
diff changeset
807 if (field_type == T_OBJECT || field_type == T_ARRAY) {
a61af66fc99e Initial load
duke
parents:
diff changeset
808 ciObject* obj_val = field_val.as_object();
a61af66fc99e Initial load
duke
parents:
diff changeset
809 if (!obj_val->is_null_object()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
810 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
811 tty->print_cr("AccessField %d proven non-null by static final non-null oop check",
a61af66fc99e Initial load
duke
parents:
diff changeset
812 x->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
813 }
a61af66fc99e Initial load
duke
parents:
diff changeset
814 set_put(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
815 }
a61af66fc99e Initial load
duke
parents:
diff changeset
816 }
a61af66fc99e Initial load
duke
parents:
diff changeset
817 }
a61af66fc99e Initial load
duke
parents:
diff changeset
818 }
a61af66fc99e Initial load
duke
parents:
diff changeset
819 // Be conservative
a61af66fc99e Initial load
duke
parents:
diff changeset
820 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
821 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
822 }
a61af66fc99e Initial load
duke
parents:
diff changeset
823
a61af66fc99e Initial load
duke
parents:
diff changeset
824 Value obj = x->obj();
a61af66fc99e Initial load
duke
parents:
diff changeset
825 if (set_contains(obj)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
826 // Value is non-null => update AccessField
a61af66fc99e Initial load
duke
parents:
diff changeset
827 if (last_explicit_null_check_obj() == obj && !x->needs_patching()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
828 x->set_explicit_null_check(consume_last_explicit_null_check());
a61af66fc99e Initial load
duke
parents:
diff changeset
829 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
830 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
831 tty->print_cr("Folded NullCheck %d into AccessField %d's null check for value %d",
a61af66fc99e Initial load
duke
parents:
diff changeset
832 x->explicit_null_check()->id(), x->id(), obj->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
833 }
a61af66fc99e Initial load
duke
parents:
diff changeset
834 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
835 x->set_explicit_null_check(NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
836 x->set_needs_null_check(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
837 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
838 tty->print_cr("Eliminated AccessField %d's null check for value %d", x->id(), obj->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
839 }
a61af66fc99e Initial load
duke
parents:
diff changeset
840 }
a61af66fc99e Initial load
duke
parents:
diff changeset
841 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
842 set_put(obj);
a61af66fc99e Initial load
duke
parents:
diff changeset
843 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
844 tty->print_cr("AccessField %d of value %d proves value to be non-null", x->id(), obj->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
845 }
a61af66fc99e Initial load
duke
parents:
diff changeset
846 // Ensure previous passes do not cause wrong state
a61af66fc99e Initial load
duke
parents:
diff changeset
847 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
848 x->set_explicit_null_check(NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
849 }
a61af66fc99e Initial load
duke
parents:
diff changeset
850 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
851 }
a61af66fc99e Initial load
duke
parents:
diff changeset
852
a61af66fc99e Initial load
duke
parents:
diff changeset
853
a61af66fc99e Initial load
duke
parents:
diff changeset
854 void NullCheckEliminator::handle_ArrayLength(ArrayLength* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
855 Value array = x->array();
a61af66fc99e Initial load
duke
parents:
diff changeset
856 if (set_contains(array)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
857 // Value is non-null => update AccessArray
a61af66fc99e Initial load
duke
parents:
diff changeset
858 if (last_explicit_null_check_obj() == array) {
a61af66fc99e Initial load
duke
parents:
diff changeset
859 x->set_explicit_null_check(consume_last_explicit_null_check());
a61af66fc99e Initial load
duke
parents:
diff changeset
860 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
861 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
862 tty->print_cr("Folded NullCheck %d into ArrayLength %d's null check for value %d",
a61af66fc99e Initial load
duke
parents:
diff changeset
863 x->explicit_null_check()->id(), x->id(), array->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
864 }
a61af66fc99e Initial load
duke
parents:
diff changeset
865 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
866 x->set_explicit_null_check(NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
867 x->set_needs_null_check(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
868 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
869 tty->print_cr("Eliminated ArrayLength %d's null check for value %d", x->id(), array->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
870 }
a61af66fc99e Initial load
duke
parents:
diff changeset
871 }
a61af66fc99e Initial load
duke
parents:
diff changeset
872 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
873 set_put(array);
a61af66fc99e Initial load
duke
parents:
diff changeset
874 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
875 tty->print_cr("ArrayLength %d of value %d proves value to be non-null", x->id(), array->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
876 }
a61af66fc99e Initial load
duke
parents:
diff changeset
877 // Ensure previous passes do not cause wrong state
a61af66fc99e Initial load
duke
parents:
diff changeset
878 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
879 x->set_explicit_null_check(NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
880 }
a61af66fc99e Initial load
duke
parents:
diff changeset
881 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
882 }
a61af66fc99e Initial load
duke
parents:
diff changeset
883
a61af66fc99e Initial load
duke
parents:
diff changeset
884
a61af66fc99e Initial load
duke
parents:
diff changeset
885 void NullCheckEliminator::handle_LoadIndexed(LoadIndexed* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
886 Value array = x->array();
a61af66fc99e Initial load
duke
parents:
diff changeset
887 if (set_contains(array)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
888 // Value is non-null => update AccessArray
a61af66fc99e Initial load
duke
parents:
diff changeset
889 if (last_explicit_null_check_obj() == array) {
a61af66fc99e Initial load
duke
parents:
diff changeset
890 x->set_explicit_null_check(consume_last_explicit_null_check());
a61af66fc99e Initial load
duke
parents:
diff changeset
891 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
892 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
893 tty->print_cr("Folded NullCheck %d into LoadIndexed %d's null check for value %d",
a61af66fc99e Initial load
duke
parents:
diff changeset
894 x->explicit_null_check()->id(), x->id(), array->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
895 }
a61af66fc99e Initial load
duke
parents:
diff changeset
896 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
897 x->set_explicit_null_check(NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
898 x->set_needs_null_check(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
899 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
900 tty->print_cr("Eliminated LoadIndexed %d's null check for value %d", x->id(), array->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
901 }
a61af66fc99e Initial load
duke
parents:
diff changeset
902 }
a61af66fc99e Initial load
duke
parents:
diff changeset
903 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
904 set_put(array);
a61af66fc99e Initial load
duke
parents:
diff changeset
905 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
906 tty->print_cr("LoadIndexed %d of value %d proves value to be non-null", x->id(), array->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
907 }
a61af66fc99e Initial load
duke
parents:
diff changeset
908 // Ensure previous passes do not cause wrong state
a61af66fc99e Initial load
duke
parents:
diff changeset
909 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
910 x->set_explicit_null_check(NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
911 }
a61af66fc99e Initial load
duke
parents:
diff changeset
912 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
913 }
a61af66fc99e Initial load
duke
parents:
diff changeset
914
a61af66fc99e Initial load
duke
parents:
diff changeset
915
a61af66fc99e Initial load
duke
parents:
diff changeset
916 void NullCheckEliminator::handle_StoreIndexed(StoreIndexed* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
917 Value array = x->array();
a61af66fc99e Initial load
duke
parents:
diff changeset
918 if (set_contains(array)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
919 // Value is non-null => update AccessArray
a61af66fc99e Initial load
duke
parents:
diff changeset
920 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
921 tty->print_cr("Eliminated StoreIndexed %d's null check for value %d", x->id(), array->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
922 }
a61af66fc99e Initial load
duke
parents:
diff changeset
923 x->set_needs_null_check(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
924 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
925 set_put(array);
a61af66fc99e Initial load
duke
parents:
diff changeset
926 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
927 tty->print_cr("StoreIndexed %d of value %d proves value to be non-null", x->id(), array->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
928 }
a61af66fc99e Initial load
duke
parents:
diff changeset
929 // Ensure previous passes do not cause wrong state
a61af66fc99e Initial load
duke
parents:
diff changeset
930 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
931 }
a61af66fc99e Initial load
duke
parents:
diff changeset
932 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
933 }
a61af66fc99e Initial load
duke
parents:
diff changeset
934
a61af66fc99e Initial load
duke
parents:
diff changeset
935
a61af66fc99e Initial load
duke
parents:
diff changeset
936 void NullCheckEliminator::handle_NullCheck(NullCheck* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
937 Value obj = x->obj();
a61af66fc99e Initial load
duke
parents:
diff changeset
938 if (set_contains(obj)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
939 // Already proven to be non-null => this NullCheck is useless
a61af66fc99e Initial load
duke
parents:
diff changeset
940 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
941 tty->print_cr("Eliminated NullCheck %d for value %d", x->id(), obj->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
942 }
a61af66fc99e Initial load
duke
parents:
diff changeset
943 // Don't unpin since that may shrink obj's live range and make it unavailable for debug info.
a61af66fc99e Initial load
duke
parents:
diff changeset
944 // The code generator won't emit LIR for a NullCheck that cannot trap.
a61af66fc99e Initial load
duke
parents:
diff changeset
945 x->set_can_trap(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
946 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
947 // May be null => add to map and set last explicit NullCheck
a61af66fc99e Initial load
duke
parents:
diff changeset
948 x->set_can_trap(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
949 // make sure it's pinned if it can trap
a61af66fc99e Initial load
duke
parents:
diff changeset
950 x->pin(Instruction::PinExplicitNullCheck);
a61af66fc99e Initial load
duke
parents:
diff changeset
951 set_put(obj);
a61af66fc99e Initial load
duke
parents:
diff changeset
952 set_last_explicit_null_check(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
953 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
954 tty->print_cr("NullCheck %d of value %d proves value to be non-null", x->id(), obj->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
955 }
a61af66fc99e Initial load
duke
parents:
diff changeset
956 }
a61af66fc99e Initial load
duke
parents:
diff changeset
957 }
a61af66fc99e Initial load
duke
parents:
diff changeset
958
a61af66fc99e Initial load
duke
parents:
diff changeset
959
a61af66fc99e Initial load
duke
parents:
diff changeset
960 void NullCheckEliminator::handle_Invoke(Invoke* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
961 if (!x->has_receiver()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
962 // Be conservative
a61af66fc99e Initial load
duke
parents:
diff changeset
963 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
964 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
965 }
a61af66fc99e Initial load
duke
parents:
diff changeset
966
a61af66fc99e Initial load
duke
parents:
diff changeset
967 Value recv = x->receiver();
a61af66fc99e Initial load
duke
parents:
diff changeset
968 if (!set_contains(recv)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
969 set_put(recv);
a61af66fc99e Initial load
duke
parents:
diff changeset
970 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
971 tty->print_cr("Invoke %d of value %d proves value to be non-null", x->id(), recv->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
972 }
a61af66fc99e Initial load
duke
parents:
diff changeset
973 }
a61af66fc99e Initial load
duke
parents:
diff changeset
974 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
975 }
a61af66fc99e Initial load
duke
parents:
diff changeset
976
a61af66fc99e Initial load
duke
parents:
diff changeset
977
a61af66fc99e Initial load
duke
parents:
diff changeset
978 void NullCheckEliminator::handle_NewInstance(NewInstance* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
979 set_put(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
980 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
981 tty->print_cr("NewInstance %d is non-null", x->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
982 }
a61af66fc99e Initial load
duke
parents:
diff changeset
983 }
a61af66fc99e Initial load
duke
parents:
diff changeset
984
a61af66fc99e Initial load
duke
parents:
diff changeset
985
a61af66fc99e Initial load
duke
parents:
diff changeset
986 void NullCheckEliminator::handle_NewArray(NewArray* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
987 set_put(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
988 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
989 tty->print_cr("NewArray %d is non-null", x->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
990 }
a61af66fc99e Initial load
duke
parents:
diff changeset
991 }
a61af66fc99e Initial load
duke
parents:
diff changeset
992
a61af66fc99e Initial load
duke
parents:
diff changeset
993
a61af66fc99e Initial load
duke
parents:
diff changeset
994 void NullCheckEliminator::handle_ExceptionObject(ExceptionObject* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
995 set_put(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
996 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
997 tty->print_cr("ExceptionObject %d is non-null", x->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
998 }
a61af66fc99e Initial load
duke
parents:
diff changeset
999 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1000
a61af66fc99e Initial load
duke
parents:
diff changeset
1001
a61af66fc99e Initial load
duke
parents:
diff changeset
1002 void NullCheckEliminator::handle_AccessMonitor(AccessMonitor* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1003 Value obj = x->obj();
a61af66fc99e Initial load
duke
parents:
diff changeset
1004 if (set_contains(obj)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1005 // Value is non-null => update AccessMonitor
a61af66fc99e Initial load
duke
parents:
diff changeset
1006 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1007 tty->print_cr("Eliminated AccessMonitor %d's null check for value %d", x->id(), obj->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
1008 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1009 x->set_needs_null_check(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
1010 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
1011 set_put(obj);
a61af66fc99e Initial load
duke
parents:
diff changeset
1012 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1013 tty->print_cr("AccessMonitor %d of value %d proves value to be non-null", x->id(), obj->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
1014 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1015 // Ensure previous passes do not cause wrong state
a61af66fc99e Initial load
duke
parents:
diff changeset
1016 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
1017 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1018 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
1019 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1020
a61af66fc99e Initial load
duke
parents:
diff changeset
1021
a61af66fc99e Initial load
duke
parents:
diff changeset
1022 void NullCheckEliminator::handle_Intrinsic(Intrinsic* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1023 if (!x->has_receiver()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1024 // Be conservative
a61af66fc99e Initial load
duke
parents:
diff changeset
1025 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
1026 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
1027 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1028
a61af66fc99e Initial load
duke
parents:
diff changeset
1029 Value recv = x->receiver();
a61af66fc99e Initial load
duke
parents:
diff changeset
1030 if (set_contains(recv)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1031 // Value is non-null => update Intrinsic
a61af66fc99e Initial load
duke
parents:
diff changeset
1032 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1033 tty->print_cr("Eliminated Intrinsic %d's null check for value %d", x->id(), recv->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
1034 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1035 x->set_needs_null_check(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
1036 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
1037 set_put(recv);
a61af66fc99e Initial load
duke
parents:
diff changeset
1038 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1039 tty->print_cr("Intrinsic %d of value %d proves value to be non-null", x->id(), recv->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
1040 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1041 // Ensure previous passes do not cause wrong state
a61af66fc99e Initial load
duke
parents:
diff changeset
1042 x->set_needs_null_check(true);
a61af66fc99e Initial load
duke
parents:
diff changeset
1043 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1044 clear_last_explicit_null_check();
a61af66fc99e Initial load
duke
parents:
diff changeset
1045 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1046
a61af66fc99e Initial load
duke
parents:
diff changeset
1047
a61af66fc99e Initial load
duke
parents:
diff changeset
1048 void NullCheckEliminator::handle_Phi(Phi* x) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1049 int i;
a61af66fc99e Initial load
duke
parents:
diff changeset
1050 bool all_non_null = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
1051 if (x->is_illegal()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1052 all_non_null = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
1053 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
1054 for (i = 0; i < x->operand_count(); i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1055 Value input = x->operand_at(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
1056 if (!set_contains(input)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1057 all_non_null = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
1058 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1059 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1060 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1061
a61af66fc99e Initial load
duke
parents:
diff changeset
1062 if (all_non_null) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1063 // Value is non-null => update Phi
a61af66fc99e Initial load
duke
parents:
diff changeset
1064 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1065 tty->print_cr("Eliminated Phi %d's null check for phifun because all inputs are non-null", x->id());
a61af66fc99e Initial load
duke
parents:
diff changeset
1066 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1067 x->set_needs_null_check(false);
a61af66fc99e Initial load
duke
parents:
diff changeset
1068 } else if (set_contains(x)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1069 set_remove(x);
a61af66fc99e Initial load
duke
parents:
diff changeset
1070 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1071 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1072
a61af66fc99e Initial load
duke
parents:
diff changeset
1073
a61af66fc99e Initial load
duke
parents:
diff changeset
1074 void Optimizer::eliminate_null_checks() {
a61af66fc99e Initial load
duke
parents:
diff changeset
1075 ResourceMark rm;
a61af66fc99e Initial load
duke
parents:
diff changeset
1076
a61af66fc99e Initial load
duke
parents:
diff changeset
1077 NullCheckEliminator nce(this);
a61af66fc99e Initial load
duke
parents:
diff changeset
1078
a61af66fc99e Initial load
duke
parents:
diff changeset
1079 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1080 tty->print_cr("Starting null check elimination for method %s::%s%s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1081 ir()->method()->holder()->name()->as_utf8(),
a61af66fc99e Initial load
duke
parents:
diff changeset
1082 ir()->method()->name()->as_utf8(),
a61af66fc99e Initial load
duke
parents:
diff changeset
1083 ir()->method()->signature()->as_symbol()->as_utf8());
a61af66fc99e Initial load
duke
parents:
diff changeset
1084 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1085
a61af66fc99e Initial load
duke
parents:
diff changeset
1086 // Apply to graph
a61af66fc99e Initial load
duke
parents:
diff changeset
1087 nce.iterate(ir()->start());
a61af66fc99e Initial load
duke
parents:
diff changeset
1088
a61af66fc99e Initial load
duke
parents:
diff changeset
1089 // walk over the graph looking for exception
a61af66fc99e Initial load
duke
parents:
diff changeset
1090 // handlers and iterate over them as well
a61af66fc99e Initial load
duke
parents:
diff changeset
1091 int nblocks = BlockBegin::number_of_blocks();
a61af66fc99e Initial load
duke
parents:
diff changeset
1092 BlockList blocks(nblocks);
a61af66fc99e Initial load
duke
parents:
diff changeset
1093 boolArray visited_block(nblocks, false);
a61af66fc99e Initial load
duke
parents:
diff changeset
1094
a61af66fc99e Initial load
duke
parents:
diff changeset
1095 blocks.push(ir()->start());
a61af66fc99e Initial load
duke
parents:
diff changeset
1096 visited_block[ir()->start()->block_id()] = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
1097 for (int i = 0; i < blocks.length(); i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1098 BlockBegin* b = blocks[i];
a61af66fc99e Initial load
duke
parents:
diff changeset
1099 // exception handlers need to be treated as additional roots
a61af66fc99e Initial load
duke
parents:
diff changeset
1100 for (int e = b->number_of_exception_handlers(); e-- > 0; ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1101 BlockBegin* excp = b->exception_handler_at(e);
a61af66fc99e Initial load
duke
parents:
diff changeset
1102 int id = excp->block_id();
a61af66fc99e Initial load
duke
parents:
diff changeset
1103 if (!visited_block[id]) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1104 blocks.push(excp);
a61af66fc99e Initial load
duke
parents:
diff changeset
1105 visited_block[id] = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
1106 nce.iterate(excp);
a61af66fc99e Initial load
duke
parents:
diff changeset
1107 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1108 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1109 // traverse successors
a61af66fc99e Initial load
duke
parents:
diff changeset
1110 BlockEnd *end = b->end();
a61af66fc99e Initial load
duke
parents:
diff changeset
1111 for (int s = end->number_of_sux(); s-- > 0; ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1112 BlockBegin* next = end->sux_at(s);
a61af66fc99e Initial load
duke
parents:
diff changeset
1113 int id = next->block_id();
a61af66fc99e Initial load
duke
parents:
diff changeset
1114 if (!visited_block[id]) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1115 blocks.push(next);
a61af66fc99e Initial load
duke
parents:
diff changeset
1116 visited_block[id] = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
1117 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1118 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1119 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1120
a61af66fc99e Initial load
duke
parents:
diff changeset
1121
a61af66fc99e Initial load
duke
parents:
diff changeset
1122 if (PrintNullCheckElimination) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1123 tty->print_cr("Done with null check elimination for method %s::%s%s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1124 ir()->method()->holder()->name()->as_utf8(),
a61af66fc99e Initial load
duke
parents:
diff changeset
1125 ir()->method()->name()->as_utf8(),
a61af66fc99e Initial load
duke
parents:
diff changeset
1126 ir()->method()->signature()->as_symbol()->as_utf8());
a61af66fc99e Initial load
duke
parents:
diff changeset
1127 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1128 }