integrate.c (copy_insn_list): Properly pace the INSN_SCOPE copies.

	* integrate.c (copy_insn_list): Properly pace the INSN_SCOPE copies.
	* toplev.c: Include cfglahout.h
	* Makefile.in (toplev.c): Add dependnecy.

From-SVN: r54212

gcc/ChangeLog

+Mon Jun  3 11:53:01 CEST 2002  Jan Hubicka  <jh@suse.cz>
+
+	* integrate.c (copy_insn_list): Properly pace the INSN_SCOPE copies.
+	* toplev.c: Include cfglahout.h
+	* Makefile.in (toplev.c): Add dependnecy.
+
 2002-06-03  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* config/i386/i386.h (TARGET_CPU_CPP_BUILTINS): New.

gcc/Makefile.in

@@ -1369,7 +1369,7 @@ toplev.o : toplev.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) function.h \
    dwarf2out.h sdbout.h dbxout.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \
    graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) $(lang_options_files) \
    ssa.h $(PARAMS_H) $(TM_P_H) reload.h dwarf2asm.h $(TARGET_H) halfpic.h \
-   langhooks.h insn-flags.h options.h
+   langhooks.h insn-flags.h options.h cfglayout.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	  -DTARGET_NAME=\"$(target_alias)\" \
 	  -c $(srcdir)/toplev.c $(OUTPUT_OPTION)

gcc/integrate.c

@@ -1334,7 +1334,6 @@ copy_insn_list (insns, map, static_chain_value)
       switch (GET_CODE (insn))
 	{
 	case INSN:
-	  INSN_SCOPE (copy) = INSN_SCOPE (insn);
 	  pattern = PATTERN (insn);
 	  set = single_set (insn);
 	  copy = 0;
@@ -1505,10 +1504,10 @@ copy_insn_list (insns, map, static_chain_value)
 #else
 	  try_constants (copy, map);
 #endif
+	  INSN_SCOPE (copy) = INSN_SCOPE (insn);
 	  break;
 
 	case JUMP_INSN:
-	  INSN_SCOPE (copy) = INSN_SCOPE (insn);
 	  if (map->integrating && returnjump_p (insn))
 	    {
 	      if (map->local_return_label == 0)
@@ -1526,6 +1525,7 @@ copy_insn_list (insns, map, static_chain_value)
 	  cc0_insn = 0;
 #endif
 	  try_constants (copy, map);
+	  INSN_SCOPE (copy) = INSN_SCOPE (insn);
 
 	  /* If this used to be a conditional jump insn but whose branch
 	     direction is now know, we must do something special.  */
@@ -1555,7 +1555,6 @@ copy_insn_list (insns, map, static_chain_value)
 	  /* If this is a CALL_PLACEHOLDER insn then we need to copy the
 	     three attached sequences: normal call, sibling call and tail
 	     recursion.  */
-	  INSN_SCOPE (copy) = INSN_SCOPE (insn);
 	  if (GET_CODE (PATTERN (insn)) == CALL_PLACEHOLDER)
 	    {
 	      rtx sequence[3];
@@ -1594,6 +1593,7 @@ copy_insn_list (insns, map, static_chain_value)
 
 	  SIBLING_CALL_P (copy) = SIBLING_CALL_P (insn);
 	  CONST_OR_PURE_CALL_P (copy) = CONST_OR_PURE_CALL_P (insn);
+	  INSN_SCOPE (copy) = INSN_SCOPE (insn);
 
 	  /* Because the USAGE information potentially contains objects other
 	     than hard registers, we need to copy it.  */

gcc/toplev.c

@@ -70,6 +70,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "debug.h"
 #include "target.h"
 #include "langhooks.h"
+#include "cfglayout.h"
 
 #if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO)
 #include "dwarf2out.h"