diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 22171e4e347a79571479b46687dbec0ebdc4fc48..885af4fd57360ccd13afb2477ab47676e7919113 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-31  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/32158
+	* semantics.c (finish_trait_expr): Complete the types.
+
 2007-05-30  Russell Yanofsky <russ@yanofsky.org>
             Douglas Gregor <doug.gregor@gmail.com>
             Pedro Lamarao <pedro.lamarao@mndfck.org>
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 631f5e8555ff3da8db7ea6a9ed3d027c3b95ec44..4a9ea8c029464279eaaf003d4e7ba2de2e874899 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -4177,11 +4177,15 @@ finish_trait_expr (cp_trait_kind kind, tree type1, tree type2)
       return trait_expr;
     }
 
+  complete_type (type1);
+  if (type2)
+    complete_type (type2);
+
   /* The only required diagnostic.  */
   if (kind == CPTK_IS_BASE_OF
       && NON_UNION_CLASS_TYPE_P (type1) && NON_UNION_CLASS_TYPE_P (type2)
       && !same_type_ignoring_top_level_qualifiers_p (type1, type2)
-      && !COMPLETE_TYPE_P (complete_type (type2)))
+      && !COMPLETE_TYPE_P (type2))
     {
       error ("incomplete type %qT not allowed", type2);
       return error_mark_node;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 045a3369169543e907e1b5ed84dab9169a62c26d..70853cd119bfd1450c2e92af1eda7b1b47774c8f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,9 @@
-2007-05-31  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/32103
	* gfortran.dg/module_equivalence_3.f90: New test.

2007-05-30  Russell Yanofsky <russ@yanofsky.org>
+2007-05-31  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/32158
+	* g++.dg/ext/is_pod_incomplete.C: New.
+
+2007-05-31  Russell Yanofsky <russ@yanofsky.org>
             Douglas Gregor <doug.gregor@gmail.com>
             Pedro Lamarao <pedro.lamarao@mndfck.org>
             Howard Hinnant <howard.hinnant@gmail.com>
diff --git a/gcc/testsuite/g++.dg/ext/is_pod_incomplete.C b/gcc/testsuite/g++.dg/ext/is_pod_incomplete.C
new file mode 100644
index 0000000000000000000000000000000000000000..a30ab1fdd6de0194ce7416b9dee9eb898337ec0a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_pod_incomplete.C
@@ -0,0 +1,8 @@
+// PR c++/32158
+template<typename T>
+  struct A
+  {
+    A() { }
+  };
+
+int t[__is_pod(A<int>)?-1:1];