diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c046bfdbe64..e41c99028fc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/34068
+	* semantics.c (finish_pseudo_destructor_expr): Handle
+	object == error_mark_node.
+
 2007-11-10  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/32241
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index a27b33e4911..23e13f3230f 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1998,7 +1998,7 @@ finish_this_expr (void)
 tree
 finish_pseudo_destructor_expr (tree object, tree scope, tree destructor)
 {
-  if (destructor == error_mark_node)
+  if (object == error_mark_node || destructor == error_mark_node)
     return error_mark_node;
 
   gcc_assert (TYPE_P (destructor));
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f98b9181cd8..78069d25e0b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/34068
+	* g++.dg/template/pseudodtor4.C: New test.
+
 2007-11-10  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/34018
diff --git a/gcc/testsuite/g++.dg/template/pseudodtor4.C b/gcc/testsuite/g++.dg/template/pseudodtor4.C
new file mode 100644
index 00000000000..40178bf489d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/pseudodtor4.C
@@ -0,0 +1,10 @@
+// PR c++/34068
+// { dg-do compile }
+
+template <typename> struct A
+{
+  typedef int X;
+  A () { T (). ~X (); }	// { dg-error "there are no arguments to|fpermissive|was not declared in this scope" }
+};
+
+A <int> a;