* final.c (insn_default_length, insn_min_length): In !HAVE_ATTR_length

[pf3gnuchains/gcc-fork.git] / gcc / c-semantics.c

diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c
index f011cb9..1e307d9 100644 (file)
--- a/gcc/c-semantics.c
+++ b/gcc/c-semantics.c
@@ -1,7 +1,8 @@
 /* This file contains the definitions and documentation for the common
    tree codes used in the GNU C and C++ compilers (see c-common.def
    for the standard codes).
-   Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
    Written by Benjamin Chelf (chelf@codesourcery.com).
 
 This file is part of GCC.
@@ -18,8 +19,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 #include "config.h"
 #include "system.h"
@@ -58,29 +59,6 @@ push_stmt_list (void)
   return t;
 }
 
-/* Similarly, except that T may have already been pushed/popped, and
-   thus may already contain statement(s).  Arrage for new statements
-   to be appended.  */
-
-tree
-re_push_stmt_list (tree t)
-{
-  if (t)
-    {
-      if (TREE_CODE (t) != STATEMENT_LIST)
-       {
-         tree u = alloc_stmt_list ();
-         append_to_statement_list_force (t, &u);
-         t = u;
-       }
-    }
-  else
-    t = alloc_stmt_list ();
-  TREE_CHAIN (t) = cur_stmt_list;
-  cur_stmt_list = t;
-  return t;
-}
-
 /* Finish the statement tree rooted at T.  */
 
 tree
@@ -123,33 +101,6 @@ pop_stmt_list (tree t)
   return t;
 }
 
-/* T is a statement.  Add it to the statement-tree.  */
-
-tree
-add_stmt (tree t)
-{
-  enum tree_code code = TREE_CODE (t);
-
-  if ((EXPR_P (t) || STATEMENT_CODE_P (code)) && code != LABEL_EXPR)
-    {
-      if (!EXPR_HAS_LOCATION (t))
-       SET_EXPR_LOCATION (t, input_location);
-
-      /* When we expand a statement-tree, we must know whether or not the
-        statements are full-expressions.  We record that fact here.  */
-      STMT_IS_FULL_EXPR_P (t) = stmts_are_full_exprs_p ();
-    }
-
-  if (code == LABEL_EXPR || code == CASE_LABEL_EXPR)
-    STATEMENT_LIST_HAS_LABEL (cur_stmt_list) = 1;
-
-  /* Add T to the statement-tree.  Non-side-effect statements need to be
-     recorded during statement expressions.  */
-  append_to_statement_list_force (t, &cur_stmt_list);
-
-  return t;
-}
-
 /* Build a generic statement based on the given type of node and
    arguments. Similar to `build_nt', except that we set
    EXPR_LOCATION to be the current source location.  */
@@ -171,28 +122,21 @@ build_stmt (enum tree_code code, ...)
   length = TREE_CODE_LENGTH (code);
   SET_EXPR_LOCATION (ret, input_location);
 
-  /* Most statements have implicit side effects all on their own, 
-     such as control transfer.  For those that do, we'll compute
-     the real value of TREE_SIDE_EFFECTS from its arguments.  */
-  switch (code)
-    {
-    case EXPR_STMT:
-      side_effects = false;
-      break;
-    default:
-      side_effects = true;
-      break;
-    }
+  /* TREE_SIDE_EFFECTS will already be set for statements with
+     implicit side effects.  Here we make sure it is set for other
+     expressions by checking whether the parameters have side
+     effects.  */
 
+  side_effects = false;
   for (i = 0; i < length; i++)
     {
       tree t = va_arg (p, tree);
-      if (t && IS_NON_TYPE_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (t))))
+      if (t && !TYPE_P (t))
         side_effects |= TREE_SIDE_EFFECTS (t);
       TREE_OPERAND (ret, i) = t;
     }
 
-  TREE_SIDE_EFFECTS (ret) = side_effects;
+  TREE_SIDE_EFFECTS (ret) |= side_effects;
 
   va_end (p);
   return ret;
@@ -215,22 +159,6 @@ emit_local_var (tree decl)
     }
 }
 
-/* Build a break statement node and return it.  */
-
-tree
-build_break_stmt (void)
-{
-  return (build_stmt (BREAK_STMT));
-}
-
-/* Build a continue statement node and return it.  */
-
-tree
-build_continue_stmt (void)
-{
-  return (build_stmt (CONTINUE_STMT));
-}
-
 /* Create a CASE_LABEL_EXPR tree node and return it.  */
 
 tree