re PR target/4828 (can't install gcc for h8300-hms target)

	PR bootstrap/4828
	Revert:
	2011-03-24  Nathan Froyd  <froydnj@codesourcery.com>

	* function.c (instantiate_virtual_regs): Use FOR_EACH_BB and
	FOR_BB_INSNS_SAFE to iterate through insns.  Re-indent.
	(pass_instantiate_virtual_regs): Require PROP_cfglayout.
	* passes.c (init_optimization_passes): Move
	pass_instantiate_virtual_regs after pass_into_cfg_layout_mode.

From-SVN: r171447

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ee9130e663b170e721d5ba1fe278a1e67591fe44..78a7e01e1871ccb63f3146d7664a9030b53e1552 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-25  Nathan Froyd  <froydnj@codesourcery.com>
+
+       PR bootstrap/4828
+       Revert:
+       2011-03-24  Nathan Froyd  <froydnj@codesourcery.com>
+
+       * function.c (instantiate_virtual_regs): Use FOR_EACH_BB and
+       FOR_BB_INSNS_SAFE to iterate through insns.  Re-indent.
+       (pass_instantiate_virtual_regs): Require PROP_cfglayout.
+       * passes.c (init_optimization_passes): Move
+       pass_instantiate_virtual_regs after pass_into_cfg_layout_mode.
+
 2011-03-25  Kai Tietz  <ktietz@redhat.com>
 
        * c-typeck.c (comptypes_internal): Replace target

diff --git a/gcc/function.c b/gcc/function.c
index 49404c873ff45ebe6bd70c35a639538628e5e032..a1ea482acad636a6dbc4ab96e565d33772be141f 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -1883,7 +1883,7 @@ instantiate_decls (tree fndecl)
 static unsigned int
 instantiate_virtual_regs (void)
 {
-  basic_block bb;
+  rtx insn;
 
   /* Compute the offsets to use for this function.  */
   in_arg_offset = FIRST_PARM_OFFSET (current_function_decl);
@@ -1901,40 +1901,33 @@ instantiate_virtual_regs (void)
 
   /* Scan through all the insns, instantiating every virtual register still
      present.  */
-  FOR_EACH_BB (bb)
-    {
-      rtx insn, curr;
-
-      FOR_BB_INSNS_SAFE (bb, insn, curr)
-       {
-         if (INSN_P (insn))
-           {
-             /* These patterns in the instruction stream can never be recognized.
-                Fortunately, they shouldn't contain virtual registers either.  */
-             if (GET_CODE (PATTERN (insn)) == USE
-                 || GET_CODE (PATTERN (insn)) == CLOBBER
-                 || GET_CODE (PATTERN (insn)) == ADDR_VEC
-                 || GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC
-                 || GET_CODE (PATTERN (insn)) == ASM_INPUT)
-               continue;
-             else if (DEBUG_INSN_P (insn))
-               for_each_rtx (&INSN_VAR_LOCATION (insn),
-                             instantiate_virtual_regs_in_rtx, NULL);
-             else
-               instantiate_virtual_regs_in_insn (insn);
+  for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
+    if (INSN_P (insn))
+      {
+       /* These patterns in the instruction stream can never be recognized.
+          Fortunately, they shouldn't contain virtual registers either.  */
+       if (GET_CODE (PATTERN (insn)) == USE
+           || GET_CODE (PATTERN (insn)) == CLOBBER
+           || GET_CODE (PATTERN (insn)) == ADDR_VEC
+           || GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC
+           || GET_CODE (PATTERN (insn)) == ASM_INPUT)
+         continue;
+       else if (DEBUG_INSN_P (insn))
+         for_each_rtx (&INSN_VAR_LOCATION (insn),
+                       instantiate_virtual_regs_in_rtx, NULL);
+       else
+         instantiate_virtual_regs_in_insn (insn);
 
-             if (INSN_DELETED_P (insn))
-               continue;
+       if (INSN_DELETED_P (insn))
+         continue;
 
-             for_each_rtx (&REG_NOTES (insn), instantiate_virtual_regs_in_rtx, NULL);
+       for_each_rtx (&REG_NOTES (insn), instantiate_virtual_regs_in_rtx, NULL);
 
-             /* Instantiate any virtual registers in CALL_INSN_FUNCTION_USAGE.  */
-             if (CALL_P (insn))
-               for_each_rtx (&CALL_INSN_FUNCTION_USAGE (insn),
-                             instantiate_virtual_regs_in_rtx, NULL);
-           }
-       }
-    }
+       /* Instantiate any virtual registers in CALL_INSN_FUNCTION_USAGE.  */
+       if (CALL_P (insn))
+         for_each_rtx (&CALL_INSN_FUNCTION_USAGE (insn),
+                       instantiate_virtual_regs_in_rtx, NULL);
+      }
 
   /* Instantiate the virtual registers in the DECLs for debugging purposes.  */
   instantiate_decls (current_function_decl);
@@ -1970,7 +1963,7 @@ struct rtl_opt_pass pass_instantiate_virtual_regs =
   NULL,                                 /* next */
   0,                                    /* static_pass_number */
   TV_NONE,                              /* tv_id */
-  PROP_cfglayout,                       /* properties_required */
+  0,                                    /* properties_required */
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */

diff --git a/gcc/passes.c b/gcc/passes.c
index 3353557ec3cd5b58f7a381355d944a467ffeaa92..42a323981f778c98272ec6680414cfe2814003d6 100644 (file)
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -956,8 +956,8 @@ init_optimization_passes (void)
       NEXT_PASS (pass_rtl_eh);
       NEXT_PASS (pass_initial_value_sets);
       NEXT_PASS (pass_unshare_all_rtl);
-      NEXT_PASS (pass_into_cfg_layout_mode);
       NEXT_PASS (pass_instantiate_virtual_regs);
+      NEXT_PASS (pass_into_cfg_layout_mode);
       NEXT_PASS (pass_jump2);
       NEXT_PASS (pass_lower_subreg);
       NEXT_PASS (pass_df_initialize_opt);