diff options
| author | Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> | 2003-05-11 10:06:39 +0000 |
|---|---|---|
| committer | Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org> | 2003-05-11 10:06:39 +0000 |
| commit | 9f01ded6a4ccb23faa18ce19091eb5ea0408b8d9 (patch) | |
| tree | 712300bb0224b77b61f835658679572e5ed34310 /gcc | |
| parent | fcea74011f2d59f310379d393799c353b7c54293 (diff) | |
| download | gcc-9f01ded6a4ccb23faa18ce19091eb5ea0408b8d9.zip gcc-9f01ded6a4ccb23faa18ce19091eb5ea0408b8d9.tar.gz gcc-9f01ded6a4ccb23faa18ce19091eb5ea0408b8d9.tar.bz2 | |
PR c++/10230, c++/10481
PR c++/10230, c++/10481
* semantics.c (finish_non_static_data_member): Handle when the
non-static member is not from a base of the current class type.
* g++.dg/lookup/scoped5.C: New test.
From-SVN: r66683
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/scoped5.C | 19 |
4 files changed, 41 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9aa822b..a11a502 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2003-05-11 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + PR c++/10230, c++/10481 + * semantics.c (finish_non_static_data_member): Handle when the + non-static member is not from a base of the current class type. + +2003-05-11 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + PR c++/10552 * pt.c (tsubst_copy): Handle TEMPLATE_DECL that is a member class template and has dependent context. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 62a900a..ab6a75c 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1276,13 +1276,22 @@ finish_non_static_data_member (tree decl, tree qualifying_scope) tree access_type = current_class_type; tree object = current_class_ref; - while (!DERIVED_FROM_P (context_for_name_lookup (decl), access_type)) + while (access_type + && !DERIVED_FROM_P (context_for_name_lookup (decl), access_type)) { access_type = TYPE_CONTEXT (access_type); - while (DECL_P (access_type)) + while (access_type && DECL_P (access_type)) access_type = DECL_CONTEXT (access_type); } + if (!access_type) + { + cp_error_at ("object missing in reference to `%D'", + decl); + error ("from this location"); + return error_mark_node; + } + perform_or_defer_access_check (access_type, decl); /* If the data member was named `C::M', convert `*this' to `C' diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ade2507..5f37055 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2003-05-11 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + PR c++/10230, c++/10481 + * g++.dg/lookup/scoped5.C: New test. + +2003-05-11 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + PR c++/10552 * g++.dg/template/ttp6.C: New test. diff --git a/gcc/testsuite/g++.dg/lookup/scoped5.C b/gcc/testsuite/g++.dg/lookup/scoped5.C new file mode 100644 index 0000000..267bc60 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/scoped5.C @@ -0,0 +1,19 @@ +// { dg-do compile } + +// Origin: pepeaty@yahoo.com + +// PR c++/10230: ICE while determining if refered non-static member +// is from a base type of the current class. + +class A { +public: + class B { + public: + int a; // { dg-error "member of base" } + }; +}; + +class C { +public: + void f(void) { sizeof(A::B::a); } // { dg-error "this location" } +}; |