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

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index dfd8f387e06181d22fb0ca862b5d8c8c45432712..b1f3d9e0fe3ee8074a279ef08565703d8e50141e 100644 (file)
--- 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 c379a51ba9a0065c8e5a776b6d9174b17fd1f7b1..ef110523691dbd37cfa9600df42a643ce66c923d 100644 (file)
--- 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));