From c6145f2ac6f946ae2613ffbd85ba072cf05d4a3f Mon Sep 17 00:00:00 2001
From: Jan Hubicka <jh@suse.cz>
Date: Thu, 7 Nov 2019 18:06:43 +0100
Subject: [PATCH] optc-save-gen.awk: Generate cl_target_option_free and
 cl_optimization_option_free.

	* optc-save-gen.awk: Generate cl_target_option_free
	and cl_optimization_option_free.
	* opth-en.awk: Declare cl_target_option_free
	and cl_optimization_option_free.
	* tree.c (free_node): Use it.

From-SVN: r277926
---
 gcc/ChangeLog         |  8 ++++++++
 gcc/optc-save-gen.awk | 25 +++++++++++++++++++++++++
 gcc/opth-gen.awk      |  6 ++++++
 gcc/tree.c            |  4 ++++
 4 files changed, 43 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6fb0facd878..bfe0ebcb010 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-11-07  Jan Hubicka  <jh@suse.cz>
+
+	* optc-save-gen.awk: Generate cl_target_option_free
+	and cl_optimization_option_free.
+	* opth-en.awk: Declare cl_target_option_free
+	and cl_optimization_option_free.
+	* tree.c (free_node): Use it.
+
 2019-11-06  Jan Hubicka  <jh@suse.cz>
 
 	* lto-streamer-in.c: Include alloc-pool.h.
diff --git a/gcc/optc-save-gen.awk b/gcc/optc-save-gen.awk
index cf1c3689eff..1c23836c7f1 100644
--- a/gcc/optc-save-gen.awk
+++ b/gcc/optc-save-gen.awk
@@ -802,6 +802,17 @@ for (i = 0; i < n_target_val; i++) {
 
 print "}";
 
+print "/* free heap memory used by target options  */";
+print "void";
+print "cl_target_option_free (struct cl_target_option *ptr ATTRIBUTE_UNUSED)";
+print "{";
+for (i = 0; i < n_target_str; i++) {
+	name = var_target_str[i]
+	print "  if (ptr->" name")";
+	print "    free (const_cast <char *>(ptr->" name"));";
+}
+print "}";
+
 n_opt_val = 4;
 var_opt_val[0] = "x_optimize"
 var_opt_val_type[0] = "char "
@@ -921,4 +932,18 @@ for (i = 0; i < n_opt_val; i++) {
 	      print "  ptr->" name" = (" var_opt_val_type[i] ") bp_unpack_value (bp, 64);";
 }
 print "}";
+print "/* Free heap memory used by optimization options  */";
+print "void";
+print "cl_optimization_option_free (struct cl_optimization *ptr ATTRIBUTE_UNUSED)";
+print "{";
+for (i = 0; i < n_opt_val; i++) {
+	name = var_opt_val[i]
+	otype = var_opt_val_type[i];
+	if (otype ~ "^const char \\**$")
+	{
+	      print "  if (ptr->" name")";
+	      print "    free (const_cast <char *>(ptr->" name"));";
+	}
+}
+print "}";
 }
diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk
index e19626a02df..218e772810e 100644
--- a/gcc/opth-gen.awk
+++ b/gcc/opth-gen.awk
@@ -303,6 +303,9 @@ print "";
 print "/* Compare two target option variables from a structure.  */";
 print "extern bool cl_target_option_eq (const struct cl_target_option *, const struct cl_target_option *);";
 print "";
+print "/* Free heap memory used by target option variables.  */";
+print "extern void cl_target_option_free (struct cl_target_option *);";
+print "";
 print "/* Hash option variables from a structure.  */";
 print "extern hashval_t cl_target_option_hash (const struct cl_target_option *);";
 print "";
@@ -312,6 +315,9 @@ print "";
 print "/* Compare two optimization options.  */";
 print "extern bool cl_optimization_option_eq (cl_optimization const *ptr1, cl_optimization const *ptr2);"
 print "";
+print "/* Free heap memory used by optimization options.  */";
+print "extern void cl_optimization_option_free (cl_optimization *ptr1);"
+print "";
 print "/* Generator files may not have access to location_t, and don't need these.  */"
 print "#if defined(UNKNOWN_LOCATION)"
 print "bool                                                                  "
diff --git a/gcc/tree.c b/gcc/tree.c
index d08141bcfc2..d2c9fe35995 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1170,6 +1170,10 @@ free_node (tree node)
     vec_free (BLOCK_NONLOCALIZED_VARS (node));
   else if (code == TREE_BINFO)
     vec_free (BINFO_BASE_ACCESSES (node));
+  else if (code == OPTIMIZATION_NODE)
+    cl_optimization_option_free (TREE_OPTIMIZATION (node));
+  else if (code == TARGET_OPTION_NODE)
+    cl_target_option_free (TREE_TARGET_OPTION (node));
   ggc_free (node);
 }
 
-- 
2.30.2