re PR debug/66691 (ICE on valid code at -O3 with -g enabled in simplify_subreg, at...

[gcc.git] / gcc / target-globals.c

diff --git a/gcc/target-globals.c b/gcc/target-globals.c
index ac661623fc69a4fb7c5417c2a3f4313725578a8e..608601edb44569a7343c0696327795854bf70193 100644 (file)
--- a/gcc/target-globals.c
+++ b/gcc/target-globals.c
@@ -1,5 +1,5 @@
 /* Target-dependent globals.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -22,9 +22,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "insn-config.h"
-#include "machmode.h"
+#include "alias.h"
+#include "symtab.h"
 #include "tree.h"
-#include "ggc.h"
 #include "toplev.h"
 #include "target-globals.h"
 #include "flags.h"
@@ -33,7 +33,15 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "reload.h"
 #include "expmed.h"
+#include "function.h"
+#include "dojump.h"
+#include "explow.h"
+#include "calls.h"
+#include "emit-rtl.h"
+#include "varasm.h"
+#include "stmt.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "cfgloop.h"
@@ -67,37 +75,23 @@ struct target_globals default_target_globals = {
 struct target_globals *
 save_target_globals (void)
 {
-  struct target_globals *g;
-  struct target_globals_extra {
-    struct target_globals g;
-    struct target_flag_state flag_state;
-    struct target_optabs optabs;
-    struct target_cfgloop cfgloop;
-    struct target_builtins builtins;
-    struct target_gcse gcse;
-    struct target_bb_reorder bb_reorder;
-    struct target_lower_subreg lower_subreg;
-  } *p;
-  p = (struct target_globals_extra *)
-      ggc_internal_cleared_alloc (sizeof (struct target_globals_extra));
-  g = (struct target_globals *) p;
-  g->flag_state = &p->flag_state;
-  g->regs = ggc_internal_cleared_alloc (sizeof (struct target_regs));
+  struct target_globals *g = ggc_cleared_alloc <target_globals> ();
+  g->flag_state = XCNEW (struct target_flag_state);
+  g->regs = XCNEW (struct target_regs);
   g->rtl = ggc_cleared_alloc<target_rtl> ();
-  g->recog = ggc_internal_cleared_alloc (sizeof (struct target_recog));
-  g->hard_regs
-    = ggc_internal_cleared_alloc (sizeof (struct target_hard_regs));
-  g->reload = ggc_internal_cleared_alloc (sizeof (struct target_reload));
-  g->expmed =  ggc_internal_cleared_alloc (sizeof (struct target_expmed));
-  g->optabs = &p->optabs;
+  g->recog = XCNEW (struct target_recog);
+  g->hard_regs = XCNEW (struct target_hard_regs);
+  g->reload = XCNEW (struct target_reload);
+  g->expmed = XCNEW (struct target_expmed);
+  g->optabs = XCNEW (struct target_optabs);
   g->libfuncs = ggc_cleared_alloc<target_libfuncs> ();
-  g->cfgloop = &p->cfgloop;
-  g->ira = ggc_internal_cleared_alloc (sizeof (struct target_ira));
-  g->ira_int = ggc_internal_cleared_alloc (sizeof (struct target_ira_int));
-  g->builtins = &p->builtins;
-  g->gcse = &p->gcse;
-  g->bb_reorder = &p->bb_reorder;
-  g->lower_subreg = &p->lower_subreg;
+  g->cfgloop = XCNEW (struct target_cfgloop);
+  g->ira = XCNEW (struct target_ira);
+  g->ira_int = XCNEW (struct target_ira_int);
+  g->builtins = XCNEW (struct target_builtins);
+  g->gcse = XCNEW (struct target_gcse);
+  g->bb_reorder = XCNEW (struct target_bb_reorder);
+  g->lower_subreg = XCNEW (struct target_lower_subreg);
   restore_target_globals (g);
   init_reg_sets ();
   target_reinit ();
@@ -133,4 +127,28 @@ save_target_globals_default_opts ()
   return save_target_globals ();
 }
 
+target_globals::~target_globals ()
+{
+  /* default_target_globals points to static data so shouldn't be freed.  */
+  if (this != &default_target_globals)
+    {
+      ira_int->~target_ira_int ();
+      hard_regs->finalize ();
+      XDELETE (flag_state);
+      XDELETE (regs);
+      XDELETE (recog);
+      XDELETE (hard_regs);
+      XDELETE (reload);
+      XDELETE (expmed);
+      XDELETE (optabs);
+      XDELETE (cfgloop);
+      XDELETE (ira);
+      XDELETE (ira_int);
+      XDELETE (builtins);
+      XDELETE (gcse);
+      XDELETE (bb_reorder);
+      XDELETE (lower_subreg);
+    }
+}
+
 #endif