re PR rtl-optimization/8423 (CSE1 not propagating __builtin_constant_p enough)

[gcc.git] / gcc / toplev.c

diff --git a/gcc/toplev.c b/gcc/toplev.c
index b860500a87182f9cef882ae1fdff7abf7805d429..b24da96cba3914838e9ef90e8247d02070bc3ed5 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -621,10 +621,6 @@ int flag_volatile_static;
 
 int flag_syntax_only = 0;
 
-/* Nonzero means perform global cse.  */
-
-static int flag_gcse;
-
 /* Nonzero means perform loop optimizer.  */
 
 static int flag_loop_optimize;
@@ -646,6 +642,10 @@ static int flag_if_conversion2;
 
 static int flag_delete_null_pointer_checks;
 
+/* Nonzero means perform global CSE.  */
+
+int flag_gcse = 0;
+
 /* Nonzero means to do the enhanced load motion during gcse, which trys
    to hoist loads by not killing them when a store to the same location
    is seen.  */
@@ -2921,6 +2921,9 @@ rest_of_compilation (decl)
 #endif
     }
 
+  /* Instantiate any remaining CONSTANT_P_RTX nodes.  */
+  purge_builtin_constant_p ();
+
   /* Move constant computations out of loops.  */
 
   if (optimize > 0 && flag_loop_optimize)
@@ -3150,7 +3153,7 @@ rest_of_compilation (decl)
        = combine_instructions (insns, max_reg_num ());
 
       /* Combining insns may have turned an indirect jump into a
-        direct jump.  Rebuid the JUMP_LABEL fields of jumping
+        direct jump.  Rebuild the JUMP_LABEL fields of jumping
         instructions.  */
       if (rebuild_jump_labels_after_combine)
        {