Restore init_ggc_heuristics.

2019-11-19  Martin Liska  <mliska@suse.cz>

	* toplev.c (general_init): Move the call...
	(toplev::main): ... here as we need init_options_struct
	being called.

From-SVN: r278448

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db83c91706523c52fc7463876dda569f498eeb93..7dc1d93f0b77ed93d6380541d1afc6df5fd4e04a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-19  Martin Liska  <mliska@suse.cz>
+
+       * toplev.c (general_init): Move the call...
+       (toplev::main): ... here as we need init_options_struct
+       being called.
+
 2019-11-19  Wilco Dijkstra  <wdijkstr@arm.com>
 
        * config/arm/arm-cpus.in (armv7): Set tune to Cortex-A53.

diff --git a/gcc/toplev.c b/gcc/toplev.c
index d4583bac66cb0663cd8bdd717d1db080137397f3..cfc757d84ba47ecc5ece6470148be4434693bb19 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1240,10 +1240,6 @@ general_init (const char *argv0, bool init_signals)
   /* Initialize register usage now so switches may override.  */
   init_reg_sets ();
 
-  /* This must be done after global_init_params but before argument
-     processing.  */
-  init_ggc_heuristics ();
-
   /* Create the singleton holder for global state.  This creates the
      dump manager.  */
   g = new gcc::context ();
@@ -2377,6 +2373,10 @@ toplev::main (int argc, char **argv)
   init_options_struct (&global_options, &global_options_set);
   lang_hooks.init_options_struct (&global_options);
 
+  /* Init GGC heuristics must be caller after we initialize
+     options.  */
+  init_ggc_heuristics ();
+
   /* Convert the options to an array.  */
   decode_cmdline_options_to_array_default_mask (argc,
                                                CONST_CAST2 (const char **,