From 3d9b2eb64f64c87952dd974a96e2756bdcf2e4b3 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 10 Nov 2007 08:36:09 +0100
Subject: [PATCH] re PR c++/32241 (ICE trying to call x.~X(); in a template)

	PR c++/32241
	* pt.c (tsubst_copy_and_build) <case COMPONENT_REF>: If object_type
	is not scalar type, let finish_class_member_access_expr handle
	diagnostics.  Pass BIT_NOT_EXPR argument to
	finish_pseudo_destructor_expr.  Handle SCOPE_REF properly.

	* g++.dg/template/pseudodtor3.C: New test.

From-SVN: r130066
---
 gcc/cp/ChangeLog                            |  8 ++++++
 gcc/cp/pt.c                                 | 26 +++++++++++------
 gcc/testsuite/ChangeLog                     |  5 ++++
 gcc/testsuite/g++.dg/template/pseudodtor3.C | 43 +++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 9 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/template/pseudodtor3.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 242f4aec4fd..c046bfdbe64 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/32241
+	* pt.c (tsubst_copy_and_build) <case COMPONENT_REF>: If object_type
+	is not scalar type, let finish_class_member_access_expr handle
+	diagnostics.  Pass BIT_NOT_EXPR argument to
+	finish_pseudo_destructor_expr.  Handle SCOPE_REF properly.
+
 2007-11-09  Douglas Gregor  <doug.gregor@gmail.com>
 
 	PR c++/33510
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 0ac7314c72b..4d9f1220344 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -11004,15 +11004,23 @@ tsubst_copy_and_build (tree t,
 
 	if (object_type && !CLASS_TYPE_P (object_type))
 	  {
-	    if (TREE_CODE (member) == BIT_NOT_EXPR)
-	      return finish_pseudo_destructor_expr (object,
-						    NULL_TREE,
-						    object_type);
-	    else if (TREE_CODE (member) == SCOPE_REF
-		     && (TREE_CODE (TREE_OPERAND (member, 1)) == BIT_NOT_EXPR))
-	      return finish_pseudo_destructor_expr (object,
-						    object,
-						    object_type);
+	    if (SCALAR_TYPE_P (object_type))
+	      {
+		tree s = NULL_TREE;
+		tree dtor = member;
+
+		if (TREE_CODE (dtor) == SCOPE_REF)
+		  {
+		    s = TREE_OPERAND (dtor, 0);
+		    dtor = TREE_OPERAND (dtor, 1);
+		  }
+		if (TREE_CODE (dtor) == BIT_NOT_EXPR)
+		  {
+		    dtor = TREE_OPERAND (dtor, 0);
+		    if (TYPE_P (dtor))
+		      return finish_pseudo_destructor_expr (object, s, dtor);
+		  }
+	      }
 	  }
 	else if (TREE_CODE (member) == SCOPE_REF
 		 && TREE_CODE (TREE_OPERAND (member, 1)) == TEMPLATE_ID_EXPR)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8ca5494d2f6..b8c1b2b3f86 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/32241
+	* g++.dg/template/pseudodtor3.C: New test.
+
 2007-11-09  Douglas Gregor  <doug.gregor@gmail.com>
 
 	PR c++/33510
diff --git a/gcc/testsuite/g++.dg/template/pseudodtor3.C b/gcc/testsuite/g++.dg/template/pseudodtor3.C
new file mode 100644
index 00000000000..5f392f4e492
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/pseudodtor3.C
@@ -0,0 +1,43 @@
+// PR c++/32241
+// { dg-do compile }
+
+struct A
+{
+  typedef int T;
+  T &foo ();
+  A () { foo.~T (); }	// { dg-error "does not have class type|expected" }
+};
+
+template <typename T> struct B
+{
+  T &foo ();
+  B () { foo.~T (); }	// { dg-error "invalid use of member" }
+};
+
+B<int> b;
+
+template <typename T, typename S> struct C
+{
+  T t;
+  C () { t.~S (); }	// { dg-error "is not of type" }
+};
+
+C<int, long int> c;
+
+template <typename T> struct D
+{
+  T t;
+  typedef long int U;
+  D () { t.~U (); }	// { dg-error "is not of type" }
+};
+
+D<int> d;
+
+template <typename T> struct E
+{
+  T &foo ();
+  typedef long int U;
+  E () { foo.~U (); }	// { dg-error "is not of type" }
+};
+
+E<int> e;
-- 
2.11.4.GIT