* decl.c (initialize_local_var): Remove RTL-generating code.

	* semantics.c (genrtl_try_block): Fix formatting.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5f6ea87..7f5b014 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-06  Mark Mitchell  <mark@codesourcery.com>
 
+       * decl.c (initialize_local_var): Remove RTL-generating code.
+       * semantics.c (genrtl_try_block): Fix formatting.
+
        Move statement-tree facilities from C++ to C front-end.
        * cp-tree.h (cp_tree_index): Remove CPTI_VOID_ZERO.
        (void_zero_node): Remove.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 5ca1e55..640deb2 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7957,14 +7957,10 @@ initialize_local_var (decl, init, flags)
        {
          int saved_stmts_are_full_exprs_p;
 
-         emit_line_note (DECL_SOURCE_FILE (decl),
-                         DECL_SOURCE_LINE (decl));
+         my_friendly_assert (building_stmt_tree (), 20000906);
          saved_stmts_are_full_exprs_p = stmts_are_full_exprs_p ();
          current_stmt_tree ()->stmts_are_full_exprs_p = 1;
-         if (building_stmt_tree ())
-           finish_expr_stmt (build_aggr_init (decl, init, flags));
-         else
-           genrtl_expr_stmt (build_aggr_init (decl, init, flags));
+         finish_expr_stmt (build_aggr_init (decl, init, flags));
          current_stmt_tree ()->stmts_are_full_exprs_p = 
            saved_stmts_are_full_exprs_p;
        }

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 0435e2f..643295e 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -603,15 +603,17 @@ void genrtl_try_block (t)
     }
   else
     {
-      if (FN_TRY_BLOCK_P (t)) {
-       if (! current_function_parms_stored)
-         store_parm_decls ();
-       expand_start_early_try_stmts ();
-      }
-      else {
-       emit_line_note (input_filename, lineno);
-       expand_start_try_stmts ();
-      }
+      if (FN_TRY_BLOCK_P (t)) 
+       {
+         if (! current_function_parms_stored)
+           store_parm_decls ();
+         expand_start_early_try_stmts ();
+       } 
+      else 
+       {
+         emit_line_note (input_filename, lineno);
+         expand_start_try_stmts ();
+       }
 
       expand_stmt (TRY_STMTS (t));