aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>2002-12-19 14:45:19 +0000
committerKriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org>2002-12-19 14:45:19 +0000
commitcab7a9a3b95c833df6d0175a9a287a9a767879c8 (patch)
tree1ff704a66b54d93a6cd51c9b45cd3b759cc0ba35 /gcc
parent7f60195472c11b56916475902514935fde53fbe3 (diff)
downloadgcc-cab7a9a3b95c833df6d0175a9a287a9a767879c8.zip
gcc-cab7a9a3b95c833df6d0175a9a287a9a767879c8.tar.gz
gcc-cab7a9a3b95c833df6d0175a9a287a9a767879c8.tar.bz2
re PR c++/3663 (G++ doesn't check access control during template instanation)
PR c++/3663 * pt.c (lookup_template_class): Copy TREE_PRIVATE and TREE_PROTECTED to created decl nodes. * g++.dg/template/access7.C: New test. From-SVN: r60307
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/pt.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/template/access7.C18
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dbf0942..042e0c0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
+
+ PR c++/3663
+ * pt.c (lookup_template_class): Copy TREE_PRIVATE and
+ TREE_PROTECTED to created decl nodes.
+
2002-12-18 Mark Mitchell <mark@codesourcery.com>
* class.c (build_base_field): Do not set DECL_PACKED on the
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 275605e..33a84a3 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4235,6 +4235,11 @@ lookup_template_class (d1, arglist, in_decl, context, entering_scope, complain)
else
type_decl = TYPE_NAME (t);
+ TREE_PRIVATE (type_decl)
+ = TREE_PRIVATE (TYPE_STUB_DECL (template_type));
+ TREE_PROTECTED (type_decl)
+ = TREE_PROTECTED (TYPE_STUB_DECL (template_type));
+
/* Set up the template information. We have to figure out which
template is the immediate parent if this is a full
instantiation. */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e4b303c7..a1510c0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
+
+ PR c++/3663
+ * g++.dg/template/access7.C: New test.
+
2002-12-18 Nick Clifton <nickc@redhat.com>
* lib/g++.exp (g++_include_flags): Only invoke testsuite_flags if
diff --git a/gcc/testsuite/g++.dg/template/access7.C b/gcc/testsuite/g++.dg/template/access7.C
new file mode 100644
index 0000000..92d4c68
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/access7.C
@@ -0,0 +1,18 @@
+// { dg-do compile }
+
+// PR c++/3663
+// Enforce access of nested type.
+
+template <typename A>
+class S {
+ class T {}; // { dg-error "private" }
+};
+
+template <typename A>
+typename A::T* f (A) { // { dg-error "this context" }
+ return 0;
+}
+
+void g () {
+ f (S<int> ()); // { dg-error "context|instantiated" }
+}