* ipa.c (cgraph_postorder): Cast according to the coding conventions.

	(cgraph_remove_unreachable_nodes): Likewise.
	* ipa-cp.c (ipcp_propagate_stage): Use BOTTOM instead of integer 0.
	* ipa-inline.c (update_caller_keys): Cast according to the coding
	conventions.
	(cgraph_decide_recursive_inlining): Likewise.
	(cgraph_decide_inlining_of_small_function): Likewise.
	(try_inline): Likewise.
	(cgraph_decide_inlining_incrementally): Likewise.
	* ipa-pure-const.c (get_function_state): Likewise.
	(scan_function): Likewise.
	(analyze_function): Likewise.
 	(static_execute): Likewise.
	* gcc/ipa-reference.c (scan_for_static_refs): Likewise.
	(merge_callee_local_info): Likewise.
	(analyze_function): Use type safe memory macros.
	(static_execute): Likewise. Cast according to the coding conventions.
	* ipa-type-escape.c (scan_for_regs): Cast according to the coding
	conventions.
	* ipa-utils.c (searchc): Likewise. Avoid using C++ keywords as variable
	names.
	(ipa_utils_reduced_inorder): Likewise. Use type safe memory macros.
	* ipa-utils.h (struct ipa_dfa_info): Avoid using C++ keywords as
	variable names.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126140 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 8 deletions

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 1aacce466c5..cd7d2aff562 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -583,7 +583,7 @@ update_caller_keys (fibheap_t heap, struct cgraph_node *node,
       for (edge = node->callers; edge; edge = edge->next_caller)
 	if (edge->aux)
 	  {
-	    fibheap_delete_node (heap, edge->aux);
+	    fibheap_delete_node (heap, (fibnode_t) edge->aux);
 	    edge->aux = NULL;
 	    if (edge->inline_failed)
 	      edge->inline_failed = failed_reason;
@@ -597,7 +597,7 @@ update_caller_keys (fibheap_t heap, struct cgraph_node *node,
 	int badness = cgraph_edge_badness (edge);
 	if (edge->aux)
 	  {
-	    fibnode_t n = edge->aux;
+	    fibnode_t n = (fibnode_t) edge->aux;
 	    gcc_assert (n->data == edge);
 	    if (n->key == badness)
 	      continue;
@@ -605,7 +605,7 @@ update_caller_keys (fibheap_t heap, struct cgraph_node *node,
 	    /* fibheap_replace_key only increase the keys.  */
 	    if (fibheap_replace_key (heap, n, badness))
 	      continue;
-	    fibheap_delete_node (heap, edge->aux);
+	    fibheap_delete_node (heap, (fibnode_t) edge->aux);
 	  }
 	edge->aux = fibheap_insert (heap, badness, edge);
       }
@@ -705,7 +705,8 @@ cgraph_decide_recursive_inlining (struct cgraph_node *node)
 	 && (cgraph_estimate_size_after_inlining (1, node, master_clone)
 	     <= limit))
     {
-      struct cgraph_edge *curr = fibheap_extract_min (heap);
+      struct cgraph_edge *curr
+	= (struct cgraph_edge *) fibheap_extract_min (heap);
       struct cgraph_node *cnode;
 
       depth = 1;
@@ -856,7 +857,8 @@ cgraph_decide_inlining_of_small_functions (void)
   max_insns = compute_max_insns (overall_insns);
   min_insns = overall_insns;
 
-  while (overall_insns <= max_insns && (edge = fibheap_extract_min (heap)))
+  while (overall_insns <= max_insns
+	 && (edge = (struct cgraph_edge *) fibheap_extract_min (heap)))
     {
       int old_insns = overall_insns;
       struct cgraph_node *where;
@@ -994,7 +996,7 @@ cgraph_decide_inlining_of_small_functions (void)
 	    fprintf (dump_file, "New minimal insns reached: %i\n", min_insns);
 	}
     }
-  while ((edge = fibheap_extract_min (heap)) != NULL)
+  while ((edge = (struct cgraph_edge *) fibheap_extract_min (heap)) != NULL)
     {
       gcc_assert (edge->aux);
       edge->aux = NULL;
@@ -1182,7 +1184,7 @@ static bool
 try_inline (struct cgraph_edge *e, enum inlining_mode mode, int depth)
 {
   struct cgraph_node *callee = e->callee;
-  enum inlining_mode callee_mode = (size_t) callee->aux;
+  enum inlining_mode callee_mode = (enum inlining_mode) (size_t) callee->aux;
   bool always_inline = e->callee->local.disregard_inline_limits;
 
   /* We've hit cycle?  */
@@ -1259,7 +1261,7 @@ cgraph_decide_inlining_incrementally (struct cgraph_node *node,
   verify_cgraph_node (node);
 #endif
 
-  old_mode = (size_t)node->aux;
+  old_mode = (enum inlining_mode) (size_t)node->aux;
 
   if (mode != INLINE_ALWAYS_INLINE
       && lookup_attribute ("flatten", DECL_ATTRIBUTES (node->decl)) != NULL)