diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c2627ba664403b6b61a6861d1046605142693cc1..096b906a6330e65e647c7a5e1ca8e7c03143cb00 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2002-12-13 Gabriel Dos Reis <gdr@integrable-solutions.net> + + PR C++/8031 + * cvt.c (convert_to_pointer_force): Don't try comparing against + erronous type. + 2002-12-13 Geoffrey Keating <geoffk@apple.com> * cp-tree.h: Have the multiple-include guards around diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 7e31045a4854cf6cbd737a44ba6b79429aae1e8a..97d242028504a4ee94af47c2f160e7d89d311f36 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -322,6 +322,8 @@ convert_to_pointer_force (type, expr) if (binfo) { expr = build_base_path (code, expr, binfo, 0); + if (expr == error_mark_node) + return error_mark_node; /* Add any qualifier conversions. */ if (!same_type_p (TREE_TYPE (TREE_TYPE (expr)), TREE_TYPE (type))) diff --git a/gcc/testsuite/g++.dg/conversion/to-virtual-base-1.C b/gcc/testsuite/g++.dg/conversion/to-virtual-base-1.C new file mode 100644 index 0000000000000000000000000000000000000000..3fa8e418e87917f5bc997666935b63fc17ce63c7 --- /dev/null +++ b/gcc/testsuite/g++.dg/conversion/to-virtual-base-1.C @@ -0,0 +1,15 @@ +// Copyright (C) 2002 Free Software Foundation +// Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net> + +struct A { + virtual void f(const A* a) = 0; +}; + +struct B : virtual A { + virtual void f(const A* a); +}; + +void B::f(const A* a) +{ + static_cast<const B&>(*a); // { dg-error "" } +}