* config/m32r/m32r.h (RETURN_ADDR_RTX): Define.

[pf3gnuchains/gcc-fork.git] / gcc / tree-flow-inline.h

diff --git a/gcc/tree-flow-inline.h b/gcc/tree-flow-inline.h
index 3505b0c..c8cf12c 100644 (file)
--- a/gcc/tree-flow-inline.h
+++ b/gcc/tree-flow-inline.h
@@ -46,43 +46,63 @@ get_var_ann (tree var)
   return (ann) ? ann : create_var_ann (var);
 }
 
-static inline stmt_ann_t
-stmt_ann (tree t)
+
+static inline cst_ann_t
+cst_ann (tree t)
 {
 #if defined ENABLE_CHECKING
-  if (!is_gimple_stmt (t) && !is_essa_node (t))
+  if (TREE_CODE_CLASS (TREE_CODE (t)) != 'c'
+      || (t->common.ann
+         && t->common.ann->common.type != CST_ANN))
     abort ();
 #endif
 
-  return (stmt_ann_t) t->common.ann;
+  return (cst_ann_t) t->common.ann;
 }
 
-static inline stmt_ann_t
-get_stmt_ann (tree stmt)
+static inline cst_ann_t
+get_cst_ann (tree var)
 {
-  stmt_ann_t ann = stmt_ann (stmt);
-  return (ann) ? ann : create_stmt_ann (stmt);
+  cst_ann_t ann = cst_ann (var);
+  return (ann) ? ann : create_cst_ann (var);
 }
 
-static inline ssa_name_ann_t
-ssa_name_ann (tree t)
+static inline expr_ann_t
+expr_ann (tree t)
 {
 #if defined ENABLE_CHECKING
-  if (t == NULL_TREE
-      || TREE_CODE (t) != SSA_NAME
+  if (!EXPR_P (t)
       || (t->common.ann
-         && t->common.ann->common.type != SSA_NAME_ANN))
+         && t->common.ann->common.type != EXPR_ANN))
     abort ();
 #endif
 
-  return (ssa_name_ann_t) t->common.ann;
+  return (expr_ann_t) t->common.ann;
 }
 
-static inline ssa_name_ann_t
-get_ssa_name_ann (tree var)
+static inline expr_ann_t
+get_expr_ann (tree var)
 {
-  ssa_name_ann_t ann = ssa_name_ann (var);
-  return (ann) ? ann : create_ssa_name_ann (var);
+  expr_ann_t ann = expr_ann (var);
+  return (ann) ? ann : create_expr_ann (var);
+}
+
+static inline stmt_ann_t
+stmt_ann (tree t)
+{
+#if defined ENABLE_CHECKING
+  if (!is_gimple_stmt (t) && !is_essa_node (t))
+    abort ();
+#endif
+
+  return (stmt_ann_t) t->common.ann;
+}
+
+static inline stmt_ann_t
+get_stmt_ann (tree stmt)
+{
+  stmt_ann_t ann = stmt_ann (stmt);
+  return (ann) ? ann : create_stmt_ann (stmt);
 }
 
 
@@ -193,10 +213,10 @@ get_use_ops (stmt_ann_t ann)
   return ann ? ann->use_ops : NULL;
 }
 
-static inline vdef_optype
-get_vdef_ops (stmt_ann_t ann)
+static inline v_may_def_optype
+get_v_may_def_ops (stmt_ann_t ann)
 {
-  return ann ? ann->vdef_ops : NULL;
+  return ann ? ann->v_may_def_ops : NULL;
 }
 
 static inline vuse_optype
@@ -205,6 +225,12 @@ get_vuse_ops (stmt_ann_t ann)
   return ann ? ann->vuse_ops : NULL;
 }
 
+static inline v_must_def_optype
+get_v_must_def_ops (stmt_ann_t ann)
+{
+  return ann ? ann->v_must_def_ops : NULL;
+}
+
 static inline tree *
 get_use_op_ptr (use_optype uses, unsigned int index)
 {
@@ -226,23 +252,23 @@ get_def_op_ptr (def_optype defs, unsigned int index)
 }
 
 static inline tree *
-get_vdef_result_ptr(vdef_optype vdefs, unsigned int index)
+get_v_may_def_result_ptr(v_may_def_optype v_may_defs, unsigned int index)
 {
 #ifdef ENABLE_CHECKING
-  if (index >= vdefs->num_vdefs)
+  if (index >= v_may_defs->num_v_may_defs)
     abort();
 #endif
-  return &(vdefs->vdefs[index * 2]);
+  return &(v_may_defs->v_may_defs[index * 2]);
 }
 
 static inline tree *
-get_vdef_op_ptr(vdef_optype vdefs, unsigned int index)
+get_v_may_def_op_ptr(v_may_def_optype v_may_defs, unsigned int index)
 {
 #ifdef ENABLE_CHECKING
-  if (index >= vdefs->num_vdefs)
+  if (index >= v_may_defs->num_v_may_defs)
     abort();
 #endif
-  return &(vdefs->vdefs[index * 2 + 1]);
+  return &(v_may_defs->v_may_defs[index * 2 + 1]);
 }
 
 static inline tree *
@@ -255,6 +281,16 @@ get_vuse_op_ptr(vuse_optype vuses, unsigned int index)
   return &(vuses->vuses[index]);
 }
 
+static inline tree *
+get_v_must_def_op_ptr (v_must_def_optype v_must_defs, unsigned int index)
+{
+#ifdef ENABLE_CHECKING
+  if (index >= v_must_defs->num_v_must_defs)
+    abort();
+#endif
+  return &(v_must_defs->v_must_defs[index]);
+}
+
 static inline void
 start_ssa_stmt_operands (tree stmt ATTRIBUTE_UNUSED)
 {
@@ -295,6 +331,9 @@ num_immediate_uses (dataflow_t df)
 static inline tree
 immediate_use (dataflow_t df, int num)
 {
+  if (!df)
+    return NULL_TREE;
+
 #ifdef ENABLE_CHECKING
   if (num >= num_immediate_uses (df))
     abort ();