aboutsummaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2014-06-29 01:30:58 +0200
committerJan Hubicka <hubicka@gcc.gnu.org>2014-06-28 23:30:58 +0000
commitba429440d1ec7e8f1841dfd08fe6976737bbd060 (patch)
treec4567752029a899936443fa1ebb44e45b38355a6 /gcc/objc
parent8910466afbc2208117531c016b79fd864a04ac66 (diff)
downloadgcc-ba429440d1ec7e8f1841dfd08fe6976737bbd060.zip
gcc-ba429440d1ec7e8f1841dfd08fe6976737bbd060.tar.gz
gcc-ba429440d1ec7e8f1841dfd08fe6976737bbd060.tar.bz2
objc-act.c (objc_xref_basetypes): Set TYPE_BINFO of type variants, too.
* objc-act.c (objc_xref_basetypes): Set TYPE_BINFO of type variants, too. From-SVN: r212112
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/ChangeLog5
-rw-r--r--gcc/objc/objc-act.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index dfd8f38..b1f3d9e 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-24 Jan Hubicka <hubicka@ucw.cz>
+
+ * objc-act.c (objc_xref_basetypes): Set TYPE_BINFO of type variants,
+ too.
+
2014-06-24 Trevor Saunders <tsaunders@mozilla.com>
* objc-act.c: Adjust.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index c379a51..ef11052 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -2695,12 +2695,16 @@ objc_copy_binfo (tree binfo)
static void
objc_xref_basetypes (tree ref, tree basetype)
{
+ tree variant;
tree binfo = make_tree_binfo (basetype ? 1 : 0);
-
TYPE_BINFO (ref) = binfo;
BINFO_OFFSET (binfo) = size_zero_node;
BINFO_TYPE (binfo) = ref;
+ gcc_assert (TYPE_MAIN_VARIANT (ref) == ref);
+ for (variant = ref; variant; variant = TYPE_NEXT_VARIANT (variant))
+ TYPE_BINFO (variant) = binfo;
+
if (basetype)
{
tree base_binfo = objc_copy_binfo (TYPE_BINFO (basetype));