From f2f044864a655b46be09310f389a1e9f11517484 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Sun, 26 Dec 2010 22:01:11 +0100 Subject: [PATCH] tree.c (get_binfo_at_offset): Use BINFO_TYPE instead of TREE_TYPE, compare TYPE_MAIN_VARIANTs of types. 2010-12-26 Martin Jambor * tree.c (get_binfo_at_offset): Use BINFO_TYPE instead of TREE_TYPE, compare TYPE_MAIN_VARIANTs of types. From-SVN: r168255 --- gcc/ChangeLog | 5 +++++ gcc/tree.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1c8293f5ac2..137ce3b30d4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-12-26 Martin Jambor + + * tree.c (get_binfo_at_offset): Use BINFO_TYPE instead of TREE_TYPE, + compare TYPE_MAIN_VARIANTs of types. + 2010-12-26 Andreas Schwab * config/m68k/t-linux (M68K_MLIB_CPU): Only include 680x0 CPUs. diff --git a/gcc/tree.c b/gcc/tree.c index 26622789bf6..cc95d70bee0 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -10939,7 +10939,7 @@ lhd_gcc_personality (void) tree get_binfo_at_offset (tree binfo, HOST_WIDE_INT offset, tree expected_type) { - tree type = TREE_TYPE (binfo); + tree type = BINFO_TYPE (binfo); while (true) { @@ -10947,7 +10947,7 @@ get_binfo_at_offset (tree binfo, HOST_WIDE_INT offset, tree expected_type) tree fld; int i; - if (type == expected_type) + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (expected_type)) return binfo; if (offset < 0) return NULL_TREE;