diff options
| author | Giovanni Bajo <giovannibajo@gcc.gnu.org> | 2004-01-10 01:18:08 +0000 |
|---|---|---|
| committer | Giovanni Bajo <giovannibajo@gcc.gnu.org> | 2004-01-10 01:18:08 +0000 |
| commit | cfb91b67b887d59ba1d9fff08fcd38f8b16d766f (patch) | |
| tree | d98dd18782bf56052dc1f01bd9106a533a6c3f95 /gcc | |
| parent | f88e4715761877b42c9459b8c339fa75fbb28103 (diff) | |
| download | gcc-cfb91b67b887d59ba1d9fff08fcd38f8b16d766f.zip gcc-cfb91b67b887d59ba1d9fff08fcd38f8b16d766f.tar.gz gcc-cfb91b67b887d59ba1d9fff08fcd38f8b16d766f.tar.bz2 | |
DR 337 PR c++/9256
DR 337
PR c++/9256
* pt.c (tsubst): Substitution must fail if we are attempting to
create an array with element type that is an abstract class type.
* decl.c (cp_finish_decl): Strip pointers and array types recursively
before calling abstract_virtuals_error.
From-SVN: r75618
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 13 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 10 |
3 files changed, 30 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bdbdd36..3dc569c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2004-01-10 Giovanni Bajo <giovannibajo@gcc.gnu.org> + + DR 337 + PR c++/9256 + * pt.c (tsubst): Substitution must fail if we are attempting to + create an array with element type that is an abstract class type. + * decl.c (cp_finish_decl): Strip pointers and array types recursively + before calling abstract_virtuals_error. + 2004-01-09 Alexandre Oliva <aoliva@redhat.com> * name-lookup.c (qualified_lookup_using_namespace): Consider diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index c7a294d..3ce6d0a 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4879,8 +4879,19 @@ cp_finish_decl (tree decl, tree init, tree asmspec_tree, int flags) || TREE_CODE (type) == METHOD_TYPE) abstract_virtuals_error (decl, strip_array_types (TREE_TYPE (type))); + else if (POINTER_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE) + { + /* If it's either a pointer or an array type, strip through all + of them but the last one. If the last is an array type, issue + an error if the element type is abstract. */ + while (POINTER_TYPE_P (TREE_TYPE (type)) + || TREE_CODE (TREE_TYPE (type)) == ARRAY_TYPE) + type = TREE_TYPE (type); + if (TREE_CODE (type) == ARRAY_TYPE) + abstract_virtuals_error (decl, TREE_TYPE (type)); + } else - abstract_virtuals_error (decl, strip_array_types (type)); + abstract_virtuals_error (decl, type); if (TREE_CODE (decl) == FUNCTION_DECL || TREE_TYPE (decl) == error_mark_node) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 6b099a1..040476c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6975,7 +6975,8 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) The deduction may fail for any of the following reasons: -- Attempting to create an array with an element type that - is void, a function type, or a reference type. */ + is void, a function type, or a reference type, or [DR337] + an abstract class type. */ if (TREE_CODE (type) == VOID_TYPE || TREE_CODE (type) == FUNCTION_TYPE || TREE_CODE (type) == REFERENCE_TYPE) @@ -6984,6 +6985,13 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) error ("creating array of `%T'", type); return error_mark_node; } + if (CLASS_TYPE_P (type) && CLASSTYPE_PURE_VIRTUALS (type)) + { + if (complain & tf_error) + error ("creating array of `%T', which is an abstract class type", + type); + return error_mark_node; + } r = build_cplus_array_type (type, domain); return r; |