* tree.c (staticp, case LABEL_DECL): New case.

From-SVN: r33651

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc96b8522dc2146290826652aaf1b7b254dd5aed..fd3622c9c2f4a026b8eef8e15fd011f440e94e23 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed May  3 13:29:54 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+       * tree.c (staticp, case LABEL_DECL): New case.
+
 2000-05-03  Richard Henderson  <rth@cygnus.com>
 
        * Makefile.in (start.encap): Do not depend on LIBGCC1.
@@ -48,6 +52,7 @@ Wed May  3 12:55:46 2000  Jim Wilson  <wilson@cygnus.com>
        (DECL_POINTER_DEPTH): Add macro.
        (tree_decl): Add pointer_depth member.
 
+>>>>>>> 1.6472
 Wed May  3 22:52:53 2000  Denis Chertykov  <denisc@overta.ru>
 
        * config/avr/avr-protos.h (test_hard_reg_class): Declared.
@@ -160,6 +165,7 @@ Wed May  3 12:40:53 2000  Clinton Popetz  <cpopetz@cygnus.com>
        * rtl.def (define_insn_and_split): New DEF_RTL_EXPR.
        * md.texi (Insn Splitting): Document define_insn_and_split.
 
+>>>>>>> 1.6464
 Tue May  2 00:20:30 2000  Jason Eckhardt  <jle@cygnus.com>
 
        * flow.c (verify_flow_info): Added two more sanity checks. The

diff --git a/gcc/tree.c b/gcc/tree.c
index a71851e6d762e54e97f4826a7d257f59afc09c83..35d1c0aedab8766b1b9f8ee09ea23544c04b0a94 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -2442,16 +2442,17 @@ staticp (arg)
     case FUNCTION_DECL:
       /* Nested functions aren't static, since taking their address
         involves a trampoline.  */
-       return (decl_function_context (arg) == 0 || DECL_NO_STATIC_CHAIN (arg))
-              && ! DECL_NON_ADDR_CONST_P (arg);
+      return (decl_function_context (arg) == 0 || DECL_NO_STATIC_CHAIN (arg))
+       && ! DECL_NON_ADDR_CONST_P (arg);
 
     case VAR_DECL:
       return (TREE_STATIC (arg) || DECL_EXTERNAL (arg))
-             && ! DECL_NON_ADDR_CONST_P (arg);
+       && ! DECL_NON_ADDR_CONST_P (arg);
 
     case CONSTRUCTOR:
       return TREE_STATIC (arg);
 
+    case LABEL_DECL:
     case STRING_CST:
       return 1;