Makefile.in (INTREGRATE_H): Rename to INTEGRATE_H.

	* Makefile.in (INTREGRATE_H): Rename to INTEGRATE_H.
	* function.c (insert_block_after_note): Remove.
	(retrofit_block): Likewise.
	(identify_blocks): Fix indentation.
	(reorder_blocks): Don't NULL out NOTE_SOURCE_FILE for a
	NOTE_INSN_BLOCK_BEG or NOTE_INSN_BLOCK_END.
	* function.h (insert_block_after_note): Remove prototype.
	(retrofit_block): Likewise.
	* integrate.c (expand_inline_function): Don't call
	find_loop_tree_blocks.  Use expand_start_bindings_and_block, not
	just expand_start_bindings.  Use the block_map to remap old
	NOTE_BLOCKs to new ones.
	(integrate_decl_tree): Keep track of remapped blocks.
	* integrate.h (struct inline_remap): Add block_map.
	* stmt.c (expand_fixup): Don't try to retrofit_blocks.  Just set
	NOTE_BLOCK on the notes.
	(expand_start_bindings): Rename to ...
	(expand_start_bindings_and_block): Add parameter.  Set NOTE_BLOCK.
	(expand_end_bindings): Set NOTE_BLOCK.
	* toplev.c (rest_of_compilation): In function-at-a-time-mode,
	reconstruct the BLOCK tree.
	* tree.h (expand_start_bindings): Macroize.  Call ...
	(expand_start_bindings_and_block): New function.

	* optimize.c (struct inline_data): Remove scope_stmt.
	(remap_block): Don't use insert_block_after_note.  Don't update
	scope_stmt.
	(expand_call_inline): Don't update scope_stmt.
	(optimize_function): Don't initialize scope_stmt.
	* semantics.c (expand_stmt): Set NOTE_BLOCK for newly emitted
	NOTE_INSN_BLOCK_BEG/NOTE_INSN_BLOCK_END notes.

From-SVN: r30982

3 files changed, 28 insertions, 35 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ff70df4..05f1618 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+1999-12-16  Mark Mitchell  <mark@codesourcery.com>
+
+	* optimize.c (struct inline_data): Remove scope_stmt.
+	(remap_block): Don't use insert_block_after_note.  Don't update
+	scope_stmt.
+	(expand_call_inline): Don't update scope_stmt.
+	(optimize_function): Don't initialize scope_stmt.
+	* semantics.c (expand_stmt): Set NOTE_BLOCK for newly emitted
+	NOTE_INSN_BLOCK_BEG/NOTE_INSN_BLOCK_END notes.
+
 1999-12-15  Mark Mitchell  <mark@codesourcery.com>
 
 	* class.c (handle_using_decl): Get TYPE_FIELDS and TYPE_METHODS
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 7eae09d..2dd151c 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -53,8 +53,6 @@ typedef struct inline_data
      inlining the body of `h', the stack will contain, `h', followed
      by `g', followed by `f'.  */
   varray_type fns;
-  /* The last SCOPE_STMT we have encountered.  */
-  tree scope_stmt;
   /* The label to jump to when a return statement is encountered.  */
   tree ret_label;
   /* The map from local declarations in the inlined function to
@@ -146,6 +144,7 @@ remap_block (scope_stmt, decls, id)
       tree old_block;
       tree new_block;
       tree old_var;
+      tree fn;
 
       /* Make the new block.  */
       old_block = SCOPE_STMT_BLOCK (scope_stmt);
@@ -175,13 +174,12 @@ remap_block (scope_stmt, decls, id)
 	}
       /* We put the BLOCK_VARS in reverse order; fix that now.  */
       BLOCK_VARS (new_block) = nreverse (BLOCK_VARS (new_block));
-      /* Graft the new block into the tree.  */
-      insert_block_after_note (new_block,
-			       SCOPE_STMT_BLOCK (id->scope_stmt),
-			       SCOPE_BEGIN_P (id->scope_stmt));
-      /* Remember that this is now the last scope statement with
-	 an associated block.  */
-      id->scope_stmt = scope_stmt;
+      /* Attach this new block after the DECL_INITIAL block for the
+	 function into which this block is being inlined.  In
+	 rest_of_compilation we will straighten out the BLOCK tree.  */
+      fn = VARRAY_TREE (id->fns, 0);
+      BLOCK_CHAIN (new_block) = BLOCK_CHAIN (DECL_INITIAL (fn));
+      BLOCK_CHAIN (DECL_INITIAL (fn)) = new_block;
       /* Remember the remapped block.  */
       splay_tree_insert (id->decl_map,
 			 (splay_tree_key) old_block,
@@ -198,10 +196,6 @@ remap_block (scope_stmt, decls, id)
 			     (splay_tree_key) SCOPE_STMT_BLOCK (scope_stmt));
       my_friendly_assert (n != NULL, 19991203);
       SCOPE_STMT_BLOCK (scope_stmt) = (tree) n->value;
-
-      /* Remember that this is now the last scope statement with an
-	 associated block.  */
-      id->scope_stmt = scope_stmt;
     }
 }
 
@@ -520,14 +514,6 @@ expand_call_inline (tp, walk_subtrees, data)
   id = (inline_data *) data;
   t = *tp;  
 
-  /* Keep track of the last SCOPE_STMT we've seen.  */
-  if (TREE_CODE (t) == SCOPE_STMT)
-    {
-      if (SCOPE_STMT_BLOCK (t) && !id->in_target_cleanup_p)
-	id->scope_stmt = t;
-      return NULL_TREE;
-    }
-
   /* Recurse, but letting recursive invocations know that we are
      inside the body of a TARGET_EXPR.  */
   if (TREE_CODE (*tp) == TARGET_EXPR)
@@ -608,11 +594,9 @@ expand_call_inline (tp, walk_subtrees, data)
   remap_block (scope_stmt, DECL_ARGUMENTS (fn), id);
   TREE_CHAIN (scope_stmt) = STMT_EXPR_STMT (expr);
   STMT_EXPR_STMT (expr) = scope_stmt;
-  id->scope_stmt = scope_stmt;
 
   /* Tell the debugging backends that this block represents the
-     outermost scope of the inlined function.  FIXME what to do for
-     inlines in cleanups?  */
+     outermost scope of the inlined function.  */
   if (SCOPE_STMT_BLOCK (scope_stmt))
     BLOCK_ABSTRACT_ORIGIN (SCOPE_STMT_BLOCK (scope_stmt)) = DECL_ORIGIN (fn);
 
@@ -723,12 +707,6 @@ optimize_function (fn)
 	    prev_fn = s->function_decl;
 	  }
 
-      /* Initialize id->scope_stmt with a fake SCOPE_STMT for the outermost
-	 block of the function (i.e. the BLOCK with __FUNCTION__ et al).  */
-      id.scope_stmt = build_min_nt (SCOPE_STMT,
-				    BLOCK_SUBBLOCKS (DECL_INITIAL (fn)));
-      SCOPE_BEGIN_P (id.scope_stmt) = 1;
-
       /* Replace all calls to inline functions with the bodies of those
 	 functions.  */
       expand_calls_inline (&DECL_SAVED_TREE (fn), &id);
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 339726f..5ac7bdb 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2514,16 +2514,21 @@ expand_stmt (t)
 	  if (!SCOPE_NO_CLEANUPS_P (t))
 	    {
 	      if (SCOPE_BEGIN_P (t))
-		expand_start_bindings (2 * SCOPE_NULLIFIED_P (t));
+		expand_start_bindings_and_block (2 * SCOPE_NULLIFIED_P (t),
+						 SCOPE_STMT_BLOCK (t));
 	      else if (SCOPE_END_P (t))
 		expand_end_bindings (NULL_TREE, !SCOPE_NULLIFIED_P (t), 
 				     SCOPE_PARTIAL_P (t));
 	    }
 	  else if (!SCOPE_NULLIFIED_P (t))
-	    emit_note (NULL,
-		       (SCOPE_BEGIN_P (t) 
-			? NOTE_INSN_BLOCK_BEG
-			: NOTE_INSN_BLOCK_END));
+	    {
+	      rtx note = emit_note (NULL,
+				    (SCOPE_BEGIN_P (t) 
+				     ? NOTE_INSN_BLOCK_BEG
+				     : NOTE_INSN_BLOCK_END));
+	      NOTE_BLOCK (note) = SCOPE_STMT_BLOCK (t);
+	    }
+	      
 	  break;
 
 	case RETURN_INIT: