diff options
| author | Gabriel Dos Reis <gdr@integrable-solutions.net> | 2002-12-13 21:58:54 +0000 |
|---|---|---|
| committer | Gabriel Dos Reis <gdr@gcc.gnu.org> | 2002-12-13 21:58:54 +0000 |
| commit | 75c525d71b62065102c3760de9e8015c141cfa3d (patch) | |
| tree | 2199ef403788353883d10b25b9bae81faa2269b7 /gcc | |
| parent | 8c6ae51fa9f2395b9d3e3f6d8734c8c099755922 (diff) | |
| download | gcc-75c525d71b62065102c3760de9e8015c141cfa3d.zip gcc-75c525d71b62065102c3760de9e8015c141cfa3d.tar.gz gcc-75c525d71b62065102c3760de9e8015c141cfa3d.tar.bz2 | |
re PR c++/8031 (ICE in comptypes, at cp/typeck.c:913)
PR C++/8031
* cvt.c (convert_to_pointer_force): Don't try comparing against
erronous type.
From-SVN: r60106
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/conversion/to-virtual-base-1.C | 15 |
3 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c2627ba..096b906 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 7e31045..97d2420 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 0000000..3fa8e41 --- /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 "" } +} |