diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-08-24 01:23:26 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-08-24 01:23:26 +0200 |
| commit | c6f3d2f4636f58ed99c9d84898c7807c068da925 (patch) | |
| tree | 7aa1eeeedc98754286411c755b0dd57cd6fe2a6a /gcc | |
| parent | ddcd0f6f728225c8adddd71b2b9f4e2293e06bec (diff) | |
| download | gcc-c6f3d2f4636f58ed99c9d84898c7807c068da925.zip gcc-c6f3d2f4636f58ed99c9d84898c7807c068da925.tar.gz gcc-c6f3d2f4636f58ed99c9d84898c7807c068da925.tar.bz2 | |
re PR c++/31941 ("confused by earlier errors" message without earlier error message)
PR c++/31941
* error.c (resolve_virtual_fun_from_obj_type_ref): Handle
TARGET_VTABLE_USES_DESCRIPTORS targets properly.
* g++.dg/parse/crash37.C: New test.
From-SVN: r127747
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/error.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/crash37.C | 15 |
4 files changed, 32 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 62b88dc..19c149d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-08-24 Jakub Jelinek <jakub@redhat.com> + + PR c++/31941 + * error.c (resolve_virtual_fun_from_obj_type_ref): Handle + TARGET_VTABLE_USES_DESCRIPTORS targets properly. + 2007-08-22 Jason Merrill <jason@redhat.com> PR c++/29365 diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 53d8223..16ba95c 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -1438,10 +1438,14 @@ static tree resolve_virtual_fun_from_obj_type_ref (tree ref) { tree obj_type = TREE_TYPE (OBJ_TYPE_REF_OBJECT (ref)); - int index = tree_low_cst (OBJ_TYPE_REF_TOKEN (ref), 1); + HOST_WIDE_INT index = tree_low_cst (OBJ_TYPE_REF_TOKEN (ref), 1); tree fun = BINFO_VIRTUALS (TYPE_BINFO (TREE_TYPE (obj_type))); - while (index--) + while (index) + { fun = TREE_CHAIN (fun); + index -= (TARGET_VTABLE_USES_DESCRIPTORS + ? TARGET_VTABLE_USES_DESCRIPTORS : 1); + } return BV_FN (fun); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 340c95e..ca73666 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-08-23 Jakub Jelinek <jakub@redhat.com> + + PR c++/31941 + * g++.dg/parse/crash37.C: New test. + 2007-08-23 Uros Bizjak <ubizjak@gmail.com> PR target/17390 diff --git a/gcc/testsuite/g++.dg/parse/crash37.C b/gcc/testsuite/g++.dg/parse/crash37.C new file mode 100644 index 0000000..8320dfa --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/crash37.C @@ -0,0 +1,15 @@ +// PR c++/31941 +// { dg-do compile } + +struct S +{ + S() throw () { } + virtual ~S () throw (); + virtual const char* what () const throw (); +}; + +const char * +foo (S &e) +{ + return e.what ().c_str (); // { dg-error "c_str.*S::what.*which is of non-class type" } +} |