comparison src/share/vm/opto/loopopts.cpp @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents 3213ba4d3dff
children f675976a61e7
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
236 return; 236 return;
237 237
238 ProjNode* dp_proj = dp->as_Proj(); 238 ProjNode* dp_proj = dp->as_Proj();
239 ProjNode* unc_proj = iff->as_If()->proj_out(1 - dp_proj->_con)->as_Proj(); 239 ProjNode* unc_proj = iff->as_If()->proj_out(1 - dp_proj->_con)->as_Proj();
240 if (exclude_loop_predicate && 240 if (exclude_loop_predicate &&
241 is_uncommon_trap_proj(unc_proj, Deoptimization::Reason_predicate)) 241 unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_predicate))
242 return; // Let IGVN transformation change control dependence. 242 return; // Let IGVN transformation change control dependence.
243 243
244 IdealLoopTree *old_loop = get_loop(dp); 244 IdealLoopTree *old_loop = get_loop(dp);
245 245
246 for (DUIterator_Fast imax, i = dp->fast_outs(imax); i < imax; i++) { 246 for (DUIterator_Fast imax, i = dp->fast_outs(imax); i < imax; i++) {
2353 int opc = n->Opcode(); 2353 int opc = n->Opcode();
2354 if (n->is_Call() || 2354 if (n->is_Call() ||
2355 opc == Op_Catch || 2355 opc == Op_Catch ||
2356 opc == Op_CatchProj || 2356 opc == Op_CatchProj ||
2357 opc == Op_Jump || 2357 opc == Op_Jump ||
2358 opc == Op_JumpProj) { 2358 opc == Op_JumpProj ||
2359 opc == Op_FlagsProj) {
2359 #if !defined(PRODUCT) 2360 #if !defined(PRODUCT)
2360 if (TracePartialPeeling) { 2361 if (TracePartialPeeling) {
2361 tty->print_cr("\nExit control too complex: lp: %d", head->_idx); 2362 tty->print_cr("\nExit control too complex: lp: %d", head->_idx);
2362 } 2363 }
2363 #endif 2364 #endif