src/share/vm/opto/loopnode.cpp
Index Unified diffs Context diffs Sdiffs Patch New Old Previous File Next File
*** old/src/share/vm/opto/loopnode.cpp	Mon Feb 22 15:17:21 2016
--- new/src/share/vm/opto/loopnode.cpp	Mon Feb 22 15:17:21 2016

*** 864,876 **** --- 864,873 ---- //------------------------------Ideal------------------------------------------ // Return a node which is more "ideal" than the current node. // Attempt to convert into a counted-loop. Node *LoopNode::Ideal(PhaseGVN *phase, bool can_reshape) { if (!can_be_counted_loop(phase)) { phase->C->set_major_progress(); } return RegionNode::Ideal(phase, can_reshape); } //=============================================================================
*** 2134,2148 **** --- 2131,2145 ---- //============================================================================= //----------------------------build_and_optimize------------------------------- // Create a PhaseLoop. Build the ideal Loop tree. Map each Ideal Node to - // its corresponding LoopNode. If 'optimize' is true, do some loop cleanups. void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts) { ResourceMark rm; ! int old_progress = C->major_progress(); ! bool old_progress = C->major_progress(); uint orig_worklist_size = _igvn._worklist.size(); // Reset major-progress flag for the driver's heuristics C->clear_major_progress();
*** 2291,2303 **** --- 2288,2300 ---- NOT_PRODUCT( C->verify_graph_edges(); ) worklist.push( C->top() ); build_loop_late( visited, worklist, nstack ); if (_verify_only) { // restore major progress flag for (int i = 0; i < old_progress; i++) + if (old_progress) { C->set_major_progress(); + } assert(C->unique() == unique, "verification mode made Nodes? ? ?"); assert(_igvn._worklist.size() == orig_worklist_size, "shouldn't push anything"); return; }
*** 2339,2349 **** --- 2336,2346 ---- } #endif if (skip_loop_opts) { // restore major progress flag ! for (int i = 0; i < old_progress; i++) { ! if (old_progress) { C->set_major_progress(); } // Cleanup any modified bits _igvn.optimize();
*** 2490,2501 **** --- 2487,2499 ---- assert( fail == 0, "verify loops failed" ); // Verify loop structure is the same _ltree_root->verify_tree(loop_verify._ltree_root, NULL); // Reset major-progress. It was cleared by creating a verify version of // PhaseIdealLoop. for( int i=0; i<old_progress; i++ ) + if (old_progress) { C->set_major_progress(); + } } //------------------------------verify_compare--------------------------------- // Make sure me and the given PhaseIdealLoop agree on key data structures void PhaseIdealLoop::verify_compare( Node *n, const PhaseIdealLoop *loop_verify, VectorSet &visited ) const {

src/share/vm/opto/loopnode.cpp
Index Unified diffs Context diffs Sdiffs Patch New Old Previous File Next File