diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2002-08-08 10:14:15 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2002-08-08 10:14:15 +0000 |
| commit | 5bfc90dea315f4ec135119a3526741e8fa6deb48 (patch) | |
| tree | e2ccf554468b4379eb1227345d0c6f9dc22dedc6 /gcc | |
| parent | 22aa533ee7d27798b56117436b3d7a5f036c36e1 (diff) | |
| download | gcc-5bfc90dea315f4ec135119a3526741e8fa6deb48.zip gcc-5bfc90dea315f4ec135119a3526741e8fa6deb48.tar.gz gcc-5bfc90dea315f4ec135119a3526741e8fa6deb48.tar.bz2 | |
class.c (convert_to_base): Correct check for error_mark_node.
* class.c (convert_to_base): Correct check for error_mark_node.
(create_vtable_ptr): Remove unused VFUNS_P parm
From-SVN: r56127
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/class.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2f6166b..3d852a1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2002-08-08 Nathan Sidwell <nathan@codesourcery.com> + * class.c (convert_to_base): Correct check for error_mark_node. + (create_vtable_ptr): Remove unused VFUNS_P parm. + +2002-08-08 Nathan Sidwell <nathan@codesourcery.com> + * cp/Make-lang.in (c++.mostlyclean): Remove coverage files. 2002-08-07 Mark Mitchell <mark@codesourcery.com> diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 03f73f2..211305f 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -145,7 +145,7 @@ static void check_methods PARAMS ((tree)); static void remove_zero_width_bit_fields PARAMS ((tree)); static void check_bases PARAMS ((tree, int *, int *, int *)); static void check_bases_and_members PARAMS ((tree, int *)); -static tree create_vtable_ptr PARAMS ((tree, int *, int *, tree *)); +static tree create_vtable_ptr PARAMS ((tree, int *, tree *)); static void layout_class_type PARAMS ((tree, int *, int *, tree *)); static void fixup_pending_inline PARAMS ((tree)); static void fixup_inline_methods PARAMS ((tree)); @@ -370,7 +370,7 @@ convert_to_base (tree object, tree type, bool check_access) binfo = lookup_base (TREE_TYPE (object), type, check_access ? ba_check : ba_ignore, NULL); - if (!binfo || TREE_CODE (binfo) == error_mark_node) + if (!binfo || binfo == error_mark_node) return error_mark_node; return build_base_path (PLUS_EXPR, object, binfo, /*nonnull=*/1); @@ -4342,10 +4342,9 @@ check_bases_and_members (t, empty_p) on VIRTUALS_P. */ static tree -create_vtable_ptr (t, empty_p, vfuns_p, virtuals_p) +create_vtable_ptr (t, empty_p, virtuals_p) tree t; int *empty_p; - int *vfuns_p; tree *virtuals_p; { tree fn; @@ -4789,7 +4788,7 @@ layout_class_type (t, empty_p, vfuns_p, virtuals_p) determine_primary_base (t, vfuns_p); /* Create a pointer to our virtual function table. */ - vptr = create_vtable_ptr (t, empty_p, vfuns_p, virtuals_p); + vptr = create_vtable_ptr (t, empty_p, virtuals_p); /* The vptr is always the first thing in the class. */ if (vptr) |