comparison src/share/vm/opto/macro.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 2aff40cb4703
children b30b3c2a0cf2
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
2260 // disconnect fall-through projection from call and create a new one 2260 // disconnect fall-through projection from call and create a new one
2261 // hook up users of fall-through projection to region 2261 // hook up users of fall-through projection to region
2262 Node *slow_ctrl = _fallthroughproj->clone(); 2262 Node *slow_ctrl = _fallthroughproj->clone();
2263 transform_later(slow_ctrl); 2263 transform_later(slow_ctrl);
2264 _igvn.hash_delete(_fallthroughproj); 2264 _igvn.hash_delete(_fallthroughproj);
2265 _fallthroughproj->disconnect_inputs(NULL); 2265 _fallthroughproj->disconnect_inputs(NULL, C);
2266 region->init_req(1, slow_ctrl); 2266 region->init_req(1, slow_ctrl);
2267 // region inputs are now complete 2267 // region inputs are now complete
2268 transform_later(region); 2268 transform_later(region);
2269 _igvn.replace_node(_fallthroughproj, region); 2269 _igvn.replace_node(_fallthroughproj, region);
2270 2270
2325 // disconnect fall-through projection from call and create a new one 2325 // disconnect fall-through projection from call and create a new one
2326 // hook up users of fall-through projection to region 2326 // hook up users of fall-through projection to region
2327 Node *slow_ctrl = _fallthroughproj->clone(); 2327 Node *slow_ctrl = _fallthroughproj->clone();
2328 transform_later(slow_ctrl); 2328 transform_later(slow_ctrl);
2329 _igvn.hash_delete(_fallthroughproj); 2329 _igvn.hash_delete(_fallthroughproj);
2330 _fallthroughproj->disconnect_inputs(NULL); 2330 _fallthroughproj->disconnect_inputs(NULL, C);
2331 region->init_req(1, slow_ctrl); 2331 region->init_req(1, slow_ctrl);
2332 // region inputs are now complete 2332 // region inputs are now complete
2333 transform_later(region); 2333 transform_later(region);
2334 _igvn.replace_node(_fallthroughproj, region); 2334 _igvn.replace_node(_fallthroughproj, region);
2335 2335