diff options
| -rw-r--r-- | gcc/objc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 6 |
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)); |