From: Simon Martin <simartin@users.sourceforge.net>
Date: Mon, 10 Dec 2007 22:54:26 +0000 (+0000)
Subject: re PR c++/34059 (ICE with invalid base type for class member)
X-Git-Tag: prereleases/gcc-4.2.3-rc1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=483a586f0dcebe2ede6c6c0452827d5ec028dd32;p=thirdparty%2Fgcc.git

re PR c++/34059 (ICE with invalid base type for class member)

gcc/cp/

2007-12-10  Simon Martin  <simartin@users.sourceforge.net>

	PR c++/34059
	* typeck.c (build_class_member_access_expr): Compute MEMBER_SCOPE from
	MEMBER's BASELINK_ACCESS_BINFO instead of its BASELINK_BINFO.

gcc/testsuite/

2007-12-10  Simon Martin  <simartin@users.sourceforge.net>

	PR c++/34059
	* g++.dg/parse/crash40.C: New test.

From-SVN: r130756
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d42dfe0c3d7f..08525af70462 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-10  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c++/34059
+	* typeck.c (build_class_member_access_expr): Compute MEMBER_SCOPE from
+	MEMBER's BASELINK_ACCESS_BINFO instead of its BASELINK_BINFO.
+
 2007-10-26  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/33744
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index c98775eeff87..9e8ca6eabe14 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1795,7 +1795,7 @@ build_class_member_access_expr (tree object, tree member,
 	warn_deprecated_use (member);
     }
   else
-    member_scope = BINFO_TYPE (BASELINK_BINFO (member));
+    member_scope = BINFO_TYPE (BASELINK_ACCESS_BINFO (member));
   /* If MEMBER is from an anonymous aggregate, MEMBER_SCOPE will
      presently be the anonymous union.  Go outwards until we find a
      type related to OBJECT_TYPE.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1be5494c0247..f8a31aae8a93 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c++/34059
+	* g++.dg/parse/crash40.C: New test.
+
 2007-11-28  Rask Ingemann Lambertsen  <rask@sygehus.dk>
 
 	Backport from mainline:
diff --git a/gcc/testsuite/g++.dg/parse/crash40.C b/gcc/testsuite/g++.dg/parse/crash40.C
new file mode 100644
index 000000000000..af44fdb695ca
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash40.C
@@ -0,0 +1,42 @@
+/* PR c++/34059 */
+/* { dg-do "compile" } */
+
+struct A
+{
+  template<int> void foo();
+};
+struct B : A {};
+struct C : A {};
+
+class AA
+{
+  template<int> void foo(); /* { dg-error "is private" } */
+};
+struct BB : AA {};
+
+class AAA {
+  int get() const {}
+};
+struct BBB {
+  static BBB *foo();
+private:
+  int get() const {} /* { dg-error "is private" } */
+};
+template<bool> struct S {
+  S(unsigned int = BBB::foo()->AAA::get()); /* { dg-error "is not a base of" } */
+};
+template<bool> struct SS {
+  SS(unsigned int = BBB::foo()->get());
+};
+
+void bar()
+{
+  B().C::foo<0>(); /* { dg-error "is not a member of" } */
+  BB().AA::foo<0>(); /* { dg-error "within this context" } */
+
+  int i;
+  i.C::foo<0>(); /* { dg-error "which is of non-class type" } */
+
+  S<false> s;
+  SS<false> ss; /* { dg-error "within this context" } */
+}