* Check in merge from gcc2. See ChangeLog.11 and ChangeLog.12

        for details.

        * haifa-sched.c: Mirror recent changes from gcc2.

From-SVN: r18984

1 files changed, 5 insertions, 6 deletions

diff --git a/gcc/tree.h b/gcc/tree.h
index c993031..8fee521 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1,5 +1,5 @@
 /* Front-end tree definitions for GNU compiler.
-   Copyright (C) 1989, 93-97, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1989, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -204,7 +204,7 @@ struct tree_common
    static_flag:
 
        TREE_STATIC in
-           VAR_DECL, FUNCTION_DECL, CONSTRUCTOR
+           VAR_DECL, FUNCTION_DECL, CONSTRUCTOR, ADDR_EXPR
        TREE_NO_UNUSED_WARNING in
            CONVERT_EXPR, NOP_EXPR, COMPOUND_EXPR
        TREE_VIA_VIRTUAL in
@@ -253,7 +253,7 @@ struct tree_common
    readonly_flag:
 
        TREE_READONLY in
-           VAR_DECL, PARM_DECL, FIELD_DECL, ..._REF
+           all expressions
        ITERATOR_BOUND_P in
            VAR_DECL if iterator (C)
        TYPE_READONLY in
@@ -1179,8 +1179,7 @@ struct tree_decl
   struct rtx_def *rtl;	/* acts as link to register transfer language
 				   (rtl) info */
   /* For FUNCTION_DECLs: points to insn that constitutes its definition
-     on the permanent obstack.  For any other kind of decl, this is the
-     alignment.  */
+     on the permanent obstack.  For FIELD_DECL, this is DECL_FIELD_SIZE.  */
   union {
     struct rtx_def *r;
     HOST_WIDE_INT i;
@@ -1415,7 +1414,7 @@ extern tree pedantic_non_lvalue		PROTO((tree));
 
 extern tree convert			PROTO((tree, tree));
 extern tree size_in_bytes		PROTO((tree));
-extern int int_size_in_bytes		PROTO((tree));
+extern HOST_WIDE_INT int_size_in_bytes	PROTO((tree));
 extern tree size_binop			PROTO((enum tree_code, tree, tree));
 extern tree size_int_wide		PROTO((unsigned HOST_WIDE_INT,
 					       unsigned HOST_WIDE_INT, int));