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