aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1c8293f..137ce3b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-26 Martin Jambor <mjambor@suse.cz>
+
+ * tree.c (get_binfo_at_offset): Use BINFO_TYPE instead of TREE_TYPE,
+ compare TYPE_MAIN_VARIANTs of types.
+
2010-12-26 Andreas Schwab <schwab@linux-m68k.org>
* config/m68k/t-linux (M68K_MLIB_CPU): Only include 680x0 CPUs.
diff --git a/gcc/tree.c b/gcc/tree.c
index 2662278..cc95d70 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;