]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Remove a TODO from verify_type_variant
authorMartin Jambor <mjambor@suse.cz>
Mon, 7 Nov 2016 18:30:26 +0000 (19:30 +0100)
committerMartin Jambor <jamborm@gcc.gnu.org>
Mon, 7 Nov 2016 18:30:26 +0000 (19:30 +0100)
2016-11-07  Martin Jambor  <mjambor@suse.cz>

* tree.c (verify_type_variant): Use pointer comparison to check that
TYPE_SIZE_UNIT match.

From-SVN: r241918

gcc/ChangeLog
gcc/tree.c

index ba5386e0d25c0c54e3dfea0f285f1248a4dc0610..86f59118327c4846eac9d1e3414261bf676abfe2 100644 (file)
@@ -1,3 +1,8 @@
+2016-11-07  Martin Jambor  <mjambor@suse.cz>
+
+       * tree.c (verify_type_variant): Use pointer comparison to check that
+       TYPE_SIZE_UNIT match.
+
 2016-11-07  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/77834
index 434aff1c4eea24b586b9cc6c08fb007c113690b5..c155d56d2c53fab3395f39698b81463715575f9e 100644 (file)
@@ -13289,12 +13289,10 @@ verify_type_variant (const_tree t, tree tv)
        verify_variant_match (TYPE_SIZE);
       if (TREE_CODE (TYPE_SIZE_UNIT (t)) != PLACEHOLDER_EXPR
          && TREE_CODE (TYPE_SIZE_UNIT (tv)) != PLACEHOLDER_EXPR
-         && TYPE_SIZE_UNIT (t) != TYPE_SIZE_UNIT (tv)
-         /* FIXME: ideally we should compare pointer equality, but java FE
-            produce variants where size is INTEGER_CST of different type (int
-            wrt size_type) during libjava biuld.  */
-         && !operand_equal_p (TYPE_SIZE_UNIT (t), TYPE_SIZE_UNIT (tv), 0))
+         && TYPE_SIZE_UNIT (t) != TYPE_SIZE_UNIT (tv))
        {
+         gcc_assert (!operand_equal_p (TYPE_SIZE_UNIT (t),
+                                       TYPE_SIZE_UNIT (tv), 0));
          error ("type variant has different TYPE_SIZE_UNIT");
          debug_tree (tv);
          error ("type variant's TYPE_SIZE_UNIT");