c-common.h (RETURN_STMT_EXPR): Rename from RETURN_EXPR.

        * c-common.h (RETURN_STMT_EXPR): Rename from RETURN_EXPR.
        * c-common.def: Adjust.
        * c-dump.c (c_dump_tree): Adjust.
        * c-semantics.c (genrtl_return_stmt): Adjust.
        * c-pretty-print.c (pp_c_statement): Adjust.
        * tree-inline.c (copy_body_r): Adjust.

2002-08-22  Jason Merrill  <jason@redhat.com>

        * pt.c (tsubst_expr): RETURN_EXPR is now RETURN_STMT_EXPR.
        * semantics.c (nullify_returns_r): Likewise.

From-SVN: r56523

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b27072afe7930d75892e329c780a2ff9731c15d4..b7464afe12247981cb67928e55a3107a217b3f5c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-22  Jason Merrill  <jason@redhat.com>
+
+       * c-common.h (RETURN_STMT_EXPR): Rename from RETURN_EXPR.
+       * c-common.def: Adjust.
+       * c-dump.c (c_dump_tree): Adjust.
+       * c-semantics.c (genrtl_return_stmt): Adjust.
+       * c-pretty-print.c (pp_c_statement): Adjust.
+       * tree-inline.c (copy_body_r): Adjust.
+
 2002-08-22  Zack Weinberg  <zack@codesourcery.com>
 
        * ggc-page.c: Avoid division in ggc_set_mark.

diff --git a/gcc/c-common.def b/gcc/c-common.def
index 7ad9e385229a93c37a1705b4bf8b41f7104c74e4..efcd2568cabd781c57b64b2c2482111f6c870e60 100644 (file)
--- a/gcc/c-common.def
+++ b/gcc/c-common.def
@@ -61,7 +61,7 @@ DEFTREECODE (WHILE_STMT, "while_stmt", 'e', 2)
 DEFTREECODE (DO_STMT, "do_stmt", 'e', 2)
 
 /* Used to represent a 'return' statement. The operand is
-   RETURN_EXPR. */
+   RETURN_STMT_EXPR. */
 DEFTREECODE (RETURN_STMT, "return_stmt", 'e', 1)
 
 /* Used to represent a 'break' statement. */

diff --git a/gcc/c-common.h b/gcc/c-common.h
index 6968d70dac9f326ca820183722ad0658db091da4..961d67ef07b7a11e9a0615699a2944f3974f35e0 100644 (file)
--- a/gcc/c-common.h
+++ b/gcc/c-common.h
@@ -945,7 +945,7 @@ extern tree strip_array_types                   PARAMS ((tree));
 /* RETURN_STMT accessors. These give the expression associated with a
    return statement, and whether it should be ignored when expanding
    (as opposed to inlining).  */
-#define RETURN_EXPR(NODE)       TREE_OPERAND (RETURN_STMT_CHECK (NODE), 0)
+#define RETURN_STMT_EXPR(NODE)  TREE_OPERAND (RETURN_STMT_CHECK (NODE), 0)
 
 /* EXPR_STMT accessor. This gives the expression associated with an
    expression statement.  */

diff --git a/gcc/c-dump.c b/gcc/c-dump.c
index 6ca07664fbe51809c26aa2be6bd01ad9af97280a..65407a507d5ce5bd2ff5f7357d21ae5abe788f68 100644 (file)
--- a/gcc/c-dump.c
+++ b/gcc/c-dump.c
@@ -153,7 +153,7 @@ c_dump_tree (dump_info, t)
 
     case RETURN_STMT:
       dump_stmt (di, t);
-      dump_child ("expr", RETURN_EXPR (t));
+      dump_child ("expr", RETURN_STMT_EXPR (t));
       dump_next_stmt (di, t);
       break;
 

diff --git a/gcc/c-pretty-print.c b/gcc/c-pretty-print.c
index a04b92fddd0f313d4280a80cf12f67a4bc85d605..1ab0569b6a4fd7a8c5e00398644797c573226f82 100644 (file)
--- a/gcc/c-pretty-print.c
+++ b/gcc/c-pretty-print.c
@@ -1384,7 +1384,7 @@ pp_c_statement (ppi, stmt)
     case GOTO_STMT:
       {
        tree e = code == RETURN_STMT 
-         ? RETURN_EXPR (stmt)
+         ? RETURN_STMT_EXPR (stmt)
          : GOTO_DESTINATION (stmt);
 
        pp_newline (ppi);

diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c
index 90b3cc141acf652d525992e62b15dba701fd5722..35cb559e6f805348eb7b1e767b685e83e89a8f6f 100644 (file)
--- a/gcc/c-semantics.c
+++ b/gcc/c-semantics.c
@@ -487,7 +487,7 @@ genrtl_return_stmt (stmt)
 {
   tree expr;
 
-  expr = RETURN_EXPR (stmt);
+  expr = RETURN_STMT_EXPR (stmt);
 
   emit_line_note (input_filename, lineno);
   if (!expr)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b6a81715e9d23e11881ffed4a2175b2bf46ea467..2933da88b6b34ac2bfbe39bcbb1509fa69c57c9b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-22  Jason Merrill  <jason@redhat.com>
+
+       * pt.c (tsubst_expr): RETURN_EXPR is now RETURN_STMT_EXPR.
+       * semantics.c (nullify_returns_r): Likewise.
+
 2002-08-17  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        Fix PR/7621

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 42218eb31503aa52b16ba416ec30dcc5f4e3cd03..d4fd2957afa69a3bec4d079da325e93c740fd86b 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -7382,7 +7382,7 @@ tsubst_expr (t, args, complain, in_decl)
 
     case RETURN_STMT:
       prep_stmt (t);
-      finish_return_stmt (tsubst_expr (RETURN_EXPR (t),
+      finish_return_stmt (tsubst_expr (RETURN_STMT_EXPR (t),
                                       args, complain, in_decl));
       break;
 

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 9efc7de8570c87d65da74adb774bd69a171f0f74..2737bbecca8614065299d43af8b73c4cffc31535 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2506,7 +2506,7 @@ nullify_returns_r (tp, walk_subtrees, data)
   if (TYPE_P (*tp))
     *walk_subtrees = 0;
   else if (TREE_CODE (*tp) == RETURN_STMT)
-    RETURN_EXPR (*tp) = NULL_TREE;
+    RETURN_STMT_EXPR (*tp) = NULL_TREE;
   else if (TREE_CODE (*tp) == CLEANUP_STMT
           && CLEANUP_DECL (*tp) == nrv)
     CLEANUP_EH_ONLY (*tp) = 1;

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 866d6251a88bcd6699bdda5c1fb171488aee4919..98bbae29175d2d18edc6cbf4e66832769e6fe27f 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -442,10 +442,10 @@ copy_body_r (tp, walk_subtrees, data)
         assignment into the equivalent of the original
         RESULT_DECL.  */
 #ifndef INLINER_FOR_JAVA
-      if (RETURN_EXPR (return_stmt))
+      if (RETURN_STMT_EXPR (return_stmt))
        {
          *tp = build_stmt (EXPR_STMT,
-                           RETURN_EXPR (return_stmt));
+                           RETURN_STMT_EXPR (return_stmt));
          STMT_IS_FULL_EXPR_P (*tp) = 1;
          /* And then jump to the end of the function.  */
          TREE_CHAIN (*tp) = goto_stmt;