CbC/CbC_gcc: gcc/cfgloop.c comparison

comparison gcc/cfgloop.c @ 132:d34655255c78

update gcc-8.2

author	mir3636
date	Thu, 25 Oct 2018 10:21:07 +0900
parents	84e7813d76e9
children	1830386684a0

comparison

equal deleted inserted replaced

-:e108057fa461
+:d34655255c78
 /* Natural loop discovery code for GNU compiler.
-Copyright (C) 2000-2017 Free Software Foundation, Inc.
+Copyright (C) 2000-2018 Free Software Foundation, Inc.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 establish_preds (ploop, loop);
 }
 /* Add LOOP to the loop hierarchy tree where FATHER is father of the
 added loop.  If LOOP has some children, take care of that their
-pred field will be initialized correctly.  */
+pred field will be initialized correctly.  If AFTER is non-null
+then it's expected it's a pointer into FATHERs inner sibling
+list and LOOP is added behind AFTER, otherwise it's added in front
+of FATHERs siblings.  */
 void
-flow_loop_tree_node_add (struct loop *father, struct loop *loop)
+flow_loop_tree_node_add (struct loop *father, struct loop *loop,
-{
+			 struct loop *after)
-loop->next = father->inner;
+{
-father->inner = loop;
+if (after)
+{
+loop->next = after->next;
+after->next = loop;
+}
+else
+{
+loop->next = father->inner;
+father->inner = loop;
+}
 establish_preds (loop, father);
 }
 /* Remove LOOP from the loop hierarchy tree.  */
 	  mcount = e->count();
 	}
 tcount += e->count();
 }
-if (!tcount.initialized_p () || tcount < HEAVY_EDGE_MIN_SAMPLES
+if (!tcount.initialized_p () || !(tcount.ipa () > HEAVY_EDGE_MIN_SAMPLES)
 || (tcount - mcount).apply_scale (HEAVY_EDGE_RATIO, 1) > tcount)
 return NULL;
 if (dump_file)
 fprintf (dump_file,
 }
 /* Check irreducible loops.  */
 if (loops_state_satisfies_p (LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS))
 {
+auto_edge_flag saved_irr_mask (cfun);
 /* Record old info.  */
 auto_sbitmap irreds (last_basic_block_for_fn (cfun));
 FOR_EACH_BB_FN (bb, cfun)
 	{
 	  edge_iterator ei;
 	    bitmap_set_bit (irreds, bb->index);
 	  else
 	    bitmap_clear_bit (irreds, bb->index);
 	  FOR_EACH_EDGE (e, ei, bb->succs)
 	    if (e->flags & EDGE_IRREDUCIBLE_LOOP)
-	      e->flags |= EDGE_ALL_FLAGS + 1;
+	      e->flags |= saved_irr_mask;
 	}
 /* Recount it.  */
 mark_irreducible_loops ();
 	      err = 1;
 	    }
 	  FOR_EACH_EDGE (e, ei, bb->succs)
 	    {
 	      if ((e->flags & EDGE_IRREDUCIBLE_LOOP)
-		  && !(e->flags & (EDGE_ALL_FLAGS + 1)))
+		  && !(e->flags & saved_irr_mask))
 		{
 		  error ("edge from %d to %d should be marked irreducible",
 			 e->src->index, e->dest->index);
 		  err = 1;
 		}
 	      else if (!(e->flags & EDGE_IRREDUCIBLE_LOOP)
-		       && (e->flags & (EDGE_ALL_FLAGS + 1)))
+		       && (e->flags & saved_irr_mask))
 		{
 		  error ("edge from %d to %d should not be marked irreducible",
 			 e->src->index, e->dest->index);
 		  err = 1;
 		}
-	      e->flags &= ~(EDGE_ALL_FLAGS + 1);
+	      e->flags &= ~saved_irr_mask;
 	    }
 	}
 }
 /* Check the recorded loop exits.  */
 return false;
 }
 /* Return location corresponding to the loop control condition if possible.  */
-location_t
+dump_user_location_t
 get_loop_location (struct loop *loop)
 {
 rtx_insn *insn = NULL;
 struct niter_desc *desc = NULL;
 edge exit;
 if (desc->in_edge)
 {
 FOR_BB_INSNS_REVERSE (desc->in_edge->src, insn)
 {
 if (INSN_P (insn) && INSN_HAS_LOCATION (insn))
-return INSN_LOCATION (insn);
+return insn;
 }
 }
 /* If loop has a single exit, then the loop control branch
 must be at the end of its source.  */
 if ((exit = single_exit (loop)))
 {
 FOR_BB_INSNS_REVERSE (exit->src, insn)
 {
 if (INSN_P (insn) && INSN_HAS_LOCATION (insn))
-return INSN_LOCATION (insn);
+return insn;
 }
 }
 /* Next check the latch, to see if it is non-empty.  */
 FOR_BB_INSNS_REVERSE (loop->latch, insn)
 {
 if (INSN_P (insn) && INSN_HAS_LOCATION (insn))
-return INSN_LOCATION (insn);
+return insn;
 }
 /* Finally, if none of the above identifies the loop control branch,
 return the first location in the loop header.  */
 FOR_BB_INSNS (loop->header, insn)
 {
 if (INSN_P (insn) && INSN_HAS_LOCATION (insn))
-return INSN_LOCATION (insn);
+return insn;
 }
 /* If all else fails, simply return the current function location.  */
-return DECL_SOURCE_LOCATION (current_function_decl);
+return dump_user_location_t::from_function_decl (current_function_decl);
 }
 /* Records that every statement in LOOP is executed I_BOUND times.
 REALISTIC is true if I_BOUND is expected to be close to the real number
 of iterations.  UPPER is true if we are sure the loop iterates at most

Mercurial > hg > CbC > CbC_gcc

comparison gcc/cfgloop.c @ 132:d34655255c78