tree-core.h (struct tree_optimization_option): Make opts a pointer to struct cl_optim...

2015-06-25  Andrew MacLeod  <amacleod@redhat.com>

	* tree-core.h (struct tree_optimization_option): Make opts a pointer to
	struct cl_optimization.
	* tree.h (TREE_OPTIMIZATION): Return the pointer, not the address of it.
	* tree.c (make_node_stat): Allocate cl_optimization struct.
	(copy_node_stat): Allocate and copy cl_optimization struct.

From-SVN: r224952

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a45adfd715f60965e50c7fcaea7d4cbf67f44e26..202c3a71949ef557275a9ab815ab2d4830634ec8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+       * tree-core.h (struct tree_optimization_option): Make opts a pointer to
+       struct cl_optimization.
+       * tree.h (TREE_OPTIMIZATION): Return the pointer, not the address of it.
+       * tree.c (make_node_stat): Allocate cl_optimization struct.
+       (copy_node_stat): Allocate and copy cl_optimization struct.
+
 2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
 
        * function.h (struct incoming_args): Move struct.

diff --git a/gcc/tree-core.h b/gcc/tree-core.h
index 58dc301b99097c1d38407d7d53794e33a81bc4f8..f23abe2bb430a05f512d41eac02001bfb3b5d6c8 100644 (file)
--- a/gcc/tree-core.h
+++ b/gcc/tree-core.h
@@ -1652,7 +1652,7 @@ struct GTY(()) tree_optimization_option {
   struct tree_common common;
 
   /* The optimization options used by the user.  */
-  struct cl_optimization opts;
+  struct cl_optimization *opts;
 
   /* Target optabs for this set of optimization options.  This is of
      type `struct target_optabs *'.  */

diff --git a/gcc/tree.c b/gcc/tree.c
index f6ab441ae03f1eb64fd1033c855a1ad4bcd67137..d44bc180f518d8e2dc9a5adb2477908e15e09602 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1095,9 +1095,20 @@ make_node_stat (enum tree_code code MEM_STAT_DECL)
       break;
 
     case tcc_exceptional:
-      if (code == TARGET_OPTION_NODE)
-       {
-         TREE_TARGET_OPTION(t) = ggc_cleared_alloc<struct cl_target_option> ();
+      switch (code)
+        {
+       case TARGET_OPTION_NODE:
+         TREE_TARGET_OPTION(t)
+                           = ggc_cleared_alloc<struct cl_target_option> ();
+         break;
+
+       case OPTIMIZATION_NODE:
+         TREE_OPTIMIZATION (t)
+                           = ggc_cleared_alloc<struct cl_optimization> ();
+         break;
+
+       default:
+         break;
        }
       break;
 
@@ -1188,6 +1199,12 @@ copy_node_stat (tree node MEM_STAT_DECL)
        memcpy (TREE_TARGET_OPTION (t), TREE_TARGET_OPTION (node),
                sizeof (struct cl_target_option));
       }
+    else if (code == OPTIMIZATION_NODE)
+      {
+       TREE_OPTIMIZATION (t) = ggc_alloc<struct cl_optimization>();
+       memcpy (TREE_OPTIMIZATION (t), TREE_OPTIMIZATION (node),
+               sizeof (struct cl_optimization));
+      }
 
   return t;
 }

diff --git a/gcc/tree.h b/gcc/tree.h
index 34b93681140d179ba3cec1e86c177c33a3b34fcb..e9f0d734a43a39c6eae9e58f64d9919f32d32c31 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2827,7 +2827,7 @@ extern vec<tree, va_gc> **decl_debug_args_insert (tree);
   (STATEMENT_LIST_CHECK (NODE)->stmt_list.tail)
 
 #define TREE_OPTIMIZATION(NODE) \
-  (&OPTIMIZATION_NODE_CHECK (NODE)->optimization.opts)
+  (OPTIMIZATION_NODE_CHECK (NODE)->optimization.opts)
 
 #define TREE_OPTIMIZATION_OPTABS(NODE) \
   (OPTIMIZATION_NODE_CHECK (NODE)->optimization.optabs)