tree.c (wide_int_to_tree): Free discarded INTEGER_CST.

2017-11-27  Richard Biener  <rguenther@suse.de>

	* tree.c (wide_int_to_tree): Free discarded INTEGER_CST.
	(type_hash_canon): Also clear int_cst_hash_table entry for
	TYPE_MIN/MAX_VALUE.
	(build_nonstandard_integer_type): Hash all TYPE_MAX_VALUEs.

From-SVN: r255171

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 66d37d0dbb9490b1fbde4c46025e35b84133a0ca..2cf55c8908f4b46f5f790386312f8eb100135b24 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-11-27  Richard Biener  <rguenther@suse.de>
+
+       * tree.c (wide_int_to_tree): Free discarded INTEGER_CST.
+       (type_hash_canon): Also clear int_cst_hash_table entry for
+       TYPE_MIN/MAX_VALUE.
+       (build_nonstandard_integer_type): Hash all TYPE_MAX_VALUEs.
+
 2017-11-27  Tamar Christina  <tamar.christina@arm.com>
 
        * doc/extend.texi: Add -A suffix (ARMv8*-A, ARMv7-A).

diff --git a/gcc/tree.c b/gcc/tree.c
index 7efd644fb2753c7e1333d083b035ae1fcd1e17ee..c328b1345c074e26e02f5b6fc2efa57f47fdcb80 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1576,6 +1576,8 @@ wide_int_to_tree (tree type, const wide_int_ref &pcst)
          t = nt;
          *slot = t;
        }
+      else
+       ggc_free (nt);
     }
 
   return t;
@@ -6496,10 +6498,18 @@ type_hash_canon (unsigned int hashcode, tree type)
        {
          if (TYPE_MIN_VALUE (type)
              && TREE_TYPE (TYPE_MIN_VALUE (type)) == type)
-           ggc_free (TYPE_MIN_VALUE (type));
+           {
+             /* Zero is always in TYPE_CACHED_VALUES.  */
+             if (! TYPE_UNSIGNED (type))
+               int_cst_hash_table->remove_elt (TYPE_MIN_VALUE (type));
+             ggc_free (TYPE_MIN_VALUE (type));
+           }
          if (TYPE_MAX_VALUE (type)
              && TREE_TYPE (TYPE_MAX_VALUE (type)) == type)
-           ggc_free (TYPE_MAX_VALUE (type));
+           {
+             int_cst_hash_table->remove_elt (TYPE_MAX_VALUE (type));
+             ggc_free (TYPE_MAX_VALUE (type));
+           }
          if (TYPE_CACHED_VALUES_P (type))
            ggc_free (TYPE_CACHED_VALUES (type));
        }
@@ -7486,8 +7496,10 @@ build_nonstandard_integer_type (unsigned HOST_WIDE_INT precision,
     fixup_signed_type (itype);
 
   ret = itype;
-  if (tree_fits_uhwi_p (TYPE_MAX_VALUE (itype)))
-    ret = type_hash_canon (tree_to_uhwi (TYPE_MAX_VALUE (itype)), itype);
+
+  inchash::hash hstate;
+  inchash::add_expr (TYPE_MAX_VALUE (itype), hstate);
+  ret = type_hash_canon (hstate.end (), itype);
   if (precision <= MAX_INT_CACHED_PREC)
     nonstandard_integer_type_cache[precision + unsignedp] = ret;