diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2002-11-25 09:25:31 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-11-25 09:25:31 +0000 |
| commit | b82ddab44cda2cbb4b7e0edce2d9d7dff4d97986 (patch) | |
| tree | bbfdaaa82e453add21d85aa34d890ccf7a05c2e9 /gcc/cp/search.c | |
| parent | 7580b910da21de80368a59d2ced427170142cbb3 (diff) | |
| download | gcc-b82ddab44cda2cbb4b7e0edce2d9d7dff4d97986.zip gcc-b82ddab44cda2cbb4b7e0edce2d9d7dff4d97986.tar.gz gcc-b82ddab44cda2cbb4b7e0edce2d9d7dff4d97986.tar.bz2 | |
search.c (is_subobject_of_p_1): Fix thinko.
* search.c (is_subobject_of_p_1): Fix thinko.
(lookup_field_queue_p): Likewise.
From-SVN: r59455
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 4170c16..fefd11b 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1116,7 +1116,7 @@ is_subobject_of_p_1 (parent, binfo, most_derived) binfos = BINFO_BASETYPES (binfo); n_baselinks = binfos ? TREE_VEC_LENGTH (binfos) : 0; - /* Iterate the base types. */ + /* Iterate through the base types. */ for (i = 0; i < n_baselinks; i++) { tree base_binfo = TREE_VEC_ELT (binfos, i); @@ -1132,7 +1132,7 @@ is_subobject_of_p_1 (parent, binfo, most_derived) if (TREE_VIA_VIRTUAL (base_binfo)) { if (CLASSTYPE_MARKED4 (base_type)) - return 0; + continue; SET_CLASSTYPE_MARKED4 (base_type); base_binfo = binfo_for_vbase (base_type, most_derived); } @@ -1202,11 +1202,12 @@ lookup_field_queue_p (binfo, data) /* If this base class is hidden by the best-known value so far, we don't need to look. */ + binfo = CANONICAL_BINFO (binfo, lfi->type); if (!lfi->from_dep_base_p && lfi->rval_binfo && is_subobject_of_p (binfo, lfi->rval_binfo, lfi->type)) return NULL_TREE; - return CANONICAL_BINFO (binfo, lfi->type); + return binfo; } /* Within the scope of a template class, you can refer to the to the |