diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 82f2a5a3b8f..3b1184b9d0e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-10  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/20924
+	* tree.c (walk_type_fields): Recurse into the element type of
+	ARRAY_TYPEs if there is a pointer set.
+
 2007-03-10  Dirk Mueller  <dmueller@suse.de>
 
 	* c-common.c (warn_logical_operator): Fix condition.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2c85175a856..cd7f311e3f6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-10  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/20924
+	* g++.dg/template/array18.C: New test.
+
 2007-03-10  Dirk Mueller  <dmueller@suse.de>
 
 	PR c++/17946
diff --git a/gcc/testsuite/g++.dg/template/array18.C b/gcc/testsuite/g++.dg/template/array18.C
new file mode 100644
index 00000000000..8987bce305f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/array18.C
@@ -0,0 +1,13 @@
+// PR c++/20924
+
+template<typename T>
+struct x {};
+
+template<typename T, unsigned N>
+struct x<T*[N]> {};
+
+int main() {
+  x<int> a;
+  x<int*[10]> b;
+  return 0;
+}
diff --git a/gcc/tree.c b/gcc/tree.c
index 512240c4fdb..53cec8f8647 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -7942,10 +7942,12 @@ walk_type_fields (tree type, walk_tree_fn func, void *data,
       break;
 
     case ARRAY_TYPE:
-      /* Don't follow this nodes's type if a pointer for fear that we'll
-	 have infinite recursion.  Those types are uninteresting anyway.  */
-      if (!POINTER_TYPE_P (TREE_TYPE (type))
-	  && TREE_CODE (TREE_TYPE (type)) != OFFSET_TYPE)
+      /* Don't follow this nodes's type if a pointer for fear that
+	 we'll have infinite recursion.  If we have a PSET, then we
+	 need not fear.  */
+      if (pset
+	  || (!POINTER_TYPE_P (TREE_TYPE (type))
+	      && TREE_CODE (TREE_TYPE (type)) != OFFSET_TYPE))
 	WALK_SUBTREE (TREE_TYPE (type));
       WALK_SUBTREE (TYPE_DOMAIN (type));
       break;