annotate src/share/vm/c1/c1_Optimizer.cpp @ 1899:42a10fc37986

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