2000-07-02 Benjamin Chelf <chelf@codesourcery.com>

	* c-common.h (genrtl_begin_compound_stmt): Remove declaration.
	(genrtl_finish_compound_stmt): Likewise.
	(genrtl_compound_stmt): Change to return void.

	* c-semantics.c (genrtl_begin_compound_stmt): Remove function and
	move code from here to ...
	(genrtl_compound_stmt): ... here.
	(genrtl_finish_compound_stmt): Remove.
	(expand_stmt): Add comment.

	* cp/cp-tree.h (genrtl_goto_stmt): Remove declaration.
	(genrtl_expr_stmt): Likewise.
	(genrtl_decl_stmt): Likewise.
	(genrtl_if_stmt): Likewise.
	(genrtl_while_stmt): Likewise.
	(genrtl_do_stmt): Likewise.
	(genrtl_return_stmt): Likewise.
	(genrtl_for_stmt): Likewise.
	(genrtl_break_stmt): Likewise.
	(genrtl_continue_stmt): Likewise.
	(genrtl_scope_stmt): Likewise.
	(genrtl_switch_stmt): Likewise.
	(genrtl_case_label): Likewise.
	(genrtl_begin_compound_stmt): Likewise.
	(genrtl_finish_compound_stmt): Likewise.
	(genrtl_compound_stmt): Likewise.
	(genrtl_asm_stmt): Likewise.

	* cp/init.c (begin_init_stmts): Remove call to
	genrtl_begin_compound_stmt.
	(finish_init_stmts): Remove call to genrtl_finish_compound_stmt.

	* cp/semantics.c (lang_expand_stmt): Changed call to
	genrtl_compound_stmt to ignore return value.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34837 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 25 deletions

diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c
index 42cdf08eb47..4e5e3ffe8dc 100644
--- a/gcc/c-semantics.c
+++ b/gcc/c-semantics.c
@@ -398,42 +398,23 @@ genrtl_case_label (low_value, high_value)
   do_case (low_value, high_value);
 }
 
-/* Generate the RTL for the start of a COMPOUND_STMT. */
+/* Generate the RTL for T, which is a COMPOUND_STMT. */
 
-tree 
-genrtl_begin_compound_stmt (has_no_scope)
-     int has_no_scope;
+void
+genrtl_compound_stmt (t)
+    tree t;
 {
   /* If this is the outermost block of the function, declare the
      variables __FUNCTION__, __PRETTY_FUNCTION__, and so forth.  */
   if (cfun
       && !current_function_name_declared () 
-      && !has_no_scope)
+      && !COMPOUND_STMT_NO_SCOPE (t))
     {
       set_current_function_name_declared (1);
       declare_function_name ();
-    }
-
-  return NULL_TREE;
-}
-
-/* Generate the RTL for the end of a COMPOUND_STMT. */
-
-tree genrtl_finish_compound_stmt (has_no_scope)
-     int has_no_scope;
-{
-  return NULL_TREE;
-}
+    } 
 
-/* Generate the RTL for T, which is a COMPOUND_STMT. */
-
-tree 
-genrtl_compound_stmt (t)
-    tree t;
-{
-  genrtl_begin_compound_stmt (COMPOUND_STMT_NO_SCOPE (t));
   expand_stmt (COMPOUND_BODY (t));
-  return (genrtl_finish_compound_stmt (COMPOUND_STMT_NO_SCOPE (t)));
 }
 
 /* Generate the RTL for an ASM_STMT. */
@@ -481,6 +462,9 @@ genrtl_decl_cleanup (decl, cleanup)
     expand_decl_cleanup (decl, cleanup);
 }
 
+/* Generate the RTL for the statement T, its substatements, and any
+   other statements at its nesting level. */
+
 tree
 expand_stmt (t)
      tree t;
@@ -489,3 +473,4 @@ expand_stmt (t)
   rval = lang_expand_stmt (t);
   return rval;
 }
+